Fix building with gcc-4.3 #211296.

Package-Manager: portage-2.2_pre5

5 files changed, 34 insertions, 15 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index d7dea2a2ceb7..246bb429a368 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.185 2008/03/28 03:29:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.186 2008/03/29 16:18:45 vapier Exp $
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.42.0-gcc43.patch, netpbm-10.26.52.ebuild,
+  netpbm-10.42.0.ebuild:
+  Fix building with gcc-4.3 #211296.
 
 *netpbm-10.42.0 (28 Mar 2008)
 *netpbm-10.26.52 (28 Mar 2008)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index dfff7c19ea22..6c12b3d7e678 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,12 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX netpbm-10.26.45-headers.patch 5460 RMD160 636e91ef394d294f36ca74655424968cee6e18ae SHA1 676b02337bef6fea34e0f02b5269ac79d8fb6082 SHA256 361eb8206e3dda44d981abaceda0ea7787e77ed35b52eb5fbc79e077a193aa92
 AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124ed SHA1 d14b5144c310c9182c45cefb629f2b4e77be0058 SHA256 aa7c4dcad0fe5aa71cce357236aa859b14c3794c92c5a5b848cc31618194b174
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
-DIST netpbm-10.26.49.tgz 2543652 RMD160 d99cdb34e0734b62fd188c4dd9aea12808a09359 SHA1 851275ae4a077c4e2ef6b0d2b5bc0c540d5f43ce SHA256 b3014a81abd9ff9850012dcda29f27d3e513bafca96e07bf8e4508fd94c7b53e
-DIST netpbm-10.26.50.tgz 2543723 RMD160 2edb0c7d5aed78347bf2431c45dea3dfe00c4623 SHA1 2bca48ba95faa3a76fa10fd5a70d2508347f9edd SHA256 b15cf451277b4868b045f5589332e68d875a25abd3f46515f26dd0a3ecbc0c0d
+AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86
 DIST netpbm-10.26.51.tgz 2543699 RMD160 b6312abb18fc5e572b63c04b65f3aa800a0d1948 SHA1 5091fb90b2c5143b440821b8468546fbe146a3e6 SHA256 4d82999648824fa99919491d569cd105158c42b734dde97beda29bfefb2655c8
 DIST netpbm-10.26.52.tgz 2543975 RMD160 6b34c761fec49d8afaf8c95a95429011517c4757 SHA1 3b2b913789d04acdc6b23eabaf50e764a20db7aa SHA256 e83492bc2a7f5ce88c59f0dd3f81495e4cc6cddee4be444021ff14b665f026ca
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
@@ -15,20 +13,18 @@ DIST netpbm-10.37.0.tar.bz2 2097635 RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6
 DIST netpbm-10.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa0084022b SHA1 2b4c1346e142d7310f266918702121198d10f5dd SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7
 DIST netpbm-10.41.0.tar.lzma 1859778 RMD160 13ce996b6edbcd8602fc830a1796138cfc46cdb5 SHA1 51b1abb41059b342c4a6db2224728aaf5aa20c19 SHA256 88974be8cb7fe2df15e742663855239ab8d9a7476c864b6b6a2d5a8fcf08a92d
 DIST netpbm-10.42.0.tar.lzma 1867436 RMD160 2cbf2122893aa101004aed1551e13514d7da0489 SHA1 40133c85d38e66917c790a7c2fddecd93e5d0303 SHA256 7f48b4892369de75609c15a09b1f186f9e23bf242124901ede41ab07d3883c0a
-EBUILD netpbm-10.26.49.ebuild 2888 RMD160 ece9dbeadc7ac34c8c21b865d2faae7c84b7ff96 SHA1 08aa56d44f2b15168c4158c589a63e4c832ed678 SHA256 229ff0299c0d45350b69b08d7e841dd1e77aced7f2ca09fec0bd3cd20160e338
-EBUILD netpbm-10.26.50.ebuild 2836 RMD160 1a17429330464842bc0af2cd62d66e76d2121aae SHA1 8ef0b73b934217a5d42228f67d17c6ca48251142 SHA256 5359c7dfb0b419e28899108403165536880041f36d5a2e7621b444e5536b44e2
 EBUILD netpbm-10.26.51.ebuild 2836 RMD160 0db5fc4e36d5df80dce225656b433f70fb633720 SHA1 244f4116b0b650df263d740d999d67a44fc6443e SHA256 e15b3d1be4ddda55432f11f7cf9def76785117a4a7be8f77426391399fd1430d
-EBUILD netpbm-10.26.52.ebuild 2836 RMD160 3a67e56b5cb1ecf3dd997757ebf4f44a8dd03ebd SHA1 96c2876e820e199d3c2d40e274dab3c03c7758f0 SHA256 cb19f0790687c72a87c4bc9f57c4b7ca9fcb6e748bda99bc643492efbd45e5b8
+EBUILD netpbm-10.26.52.ebuild 2894 RMD160 d50fd5377536a56e6923648c4d2455ea53c7c3fb SHA1 9bf540cdbd34d958708e6426adb6cf0cc3ae4765 SHA256 3b0793a783a5f4c64cda4fd9f74049ffa0f882642983ca9f869f88fad8dd3635
 EBUILD netpbm-10.37.0.ebuild 3176 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 SHA1 e5582dce796933d3a4049a07befaf3aeac9628a0 SHA256 5f273a533588bd933701d2e3efabc034701a9c1e01085a7d810646f2f07676b6
 EBUILD netpbm-10.40.0.ebuild 3175 RMD160 77e350a029ed0b406e59614c6aa60bdc0f15e231 SHA1 7b5bc1fc11319ef6309c6d53bad11e8446bb3886 SHA256 ca385bb5fcb3a0d0afc6138e4c47cf8187ba33f309030211a191964c06511def
 EBUILD netpbm-10.41.0.ebuild 3910 RMD160 afb96830be2f4cde04262ad4090c1da24900efea SHA1 30241615209e93cc6e0800921a15b3c9a530a56b SHA256 d8ed0c8ea88e9b41bce0a50fcf6f88f2cd762ff7680aa6fe3423f09a2999f4ae
-EBUILD netpbm-10.42.0.ebuild 3937 RMD160 f3ebf662434d719f4246fcd2dc5d8500a75bc1c7 SHA1 08004347b680a9d8cb52b0b8c3818c1e33780fbd SHA256 e3b7cb1599d54fbd99c31ac9be4e1cbc885de8978f46ded853fe56c2260446f0
-MISC ChangeLog 25135 RMD160 46a770814bd6b697f8c29dfebd19924bac3f56c7 SHA1 d9437f82d9b88f562214d9875a3dd8a81efc9b15 SHA256 b6a8a3577537ed5736f46edd580d9eb6c7dfc4341788e8f0d9625823d79e999e
+EBUILD netpbm-10.42.0.ebuild 3994 RMD160 50a1c101b1b62b82ec0012e2f4985d90e7b36a6a SHA1 416633d607286a574308685bca8ebfad92ab8a4f SHA256 c34a4fa0cd5e2a576d05985262c3cf41779a61683e92953c01d2aefb21757354
+MISC ChangeLog 25309 RMD160 85f5a6c92eaf61322c464ba441905ae2f7038114 SHA1 00158f20a142c0dca6b70a49b02978bb0e3cc03f SHA256 20f03ed7eb617381ca7699fb70b1e181247c7c900b21f77eabb4217933d7b1c4
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH7Gbhj9hvisErhMIRAhfmAKCINnnYEMHS+C8Rn/6s/eMPlKDpPACfeqfa
-nMJV9NjiQazOnMJsb/zXNnk=
-=8O1T
+iD8DBQFH7my3j9hvisErhMIRAsKLAJ9wtFD3VHtpJ1aWs10k9feORT9D/wCgmWUV
+uFMZSacbyM7jhnSkyJo9MN0=
+=wU6K
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch b/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch
new file mode 100644
index 000000000000..1e61de8decb3
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch
@@ -0,0 +1,16 @@
+Index: trunk/lib/libpbm3.c
+===================================================================
+--- trunk/lib/libpbm3.c	(revision 608)
++++ trunk/lib/libpbm3.c	(revision 609)
+@@ -116,7 +116,11 @@ packBitsWithMmxSse(FILE *          const
+             ) ];
+     */
+ 
++#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)
++    typedef char v8qi __attribute__ ((vector_size(8)));
++#else
+     typedef int v8qi __attribute__ ((mode(V8QI)));
++#endif
+     typedef int di __attribute__ ((mode(DI)));
+ 
+     di const zero64 = 0;        /* to clear with PXOR */
diff --git a/media-libs/netpbm/netpbm-10.26.52.ebuild b/media-libs/netpbm/netpbm-10.26.52.ebuild
index f6fce73c1360..617d406408f3 100644
--- a/media-libs/netpbm/netpbm-10.26.52.ebuild
+++ b/media-libs/netpbm/netpbm-10.26.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.52.ebuild,v 1.1 2008/03/28 03:29:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.52.ebuild,v 1.2 2008/03/29 16:18:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -49,6 +49,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/netpbm-10.30-build.patch
+	epatch "${FILESDIR}"/netpbm-10.42.0-gcc43.patch #211296
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config
@@ -87,7 +88,7 @@ src_unpack() {
 }
 
 src_install() {
-	make package pkgdir="${D}"/usr || die "make package failed"
+	emake package pkgdir="${D}"/usr || die "make package failed"
 
 	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 
diff --git a/media-libs/netpbm/netpbm-10.42.0.ebuild b/media-libs/netpbm/netpbm-10.42.0.ebuild
index dc3e78c3a810..d4712c1670a3 100644
--- a/media-libs/netpbm/netpbm-10.42.0.ebuild
+++ b/media-libs/netpbm/netpbm-10.42.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.42.0.ebuild,v 1.1 2008/03/28 03:29:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.42.0.ebuild,v 1.2 2008/03/29 16:18:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -81,6 +81,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 	epatch "${FILESDIR}"/netpbm-10.35.0-xml2.patch #137871
+	epatch "${FILESDIR}"/netpbm-10.42.0-gcc43.patch #211296
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config