Fix building with gcc-4.3 #211296.

(Portage version: 2.2_pre5)

4 files changed, 27 insertions, 4 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/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