clean up a lot of mistakes

8 files changed, 78 insertions, 90 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 8c8890b1f53a..7eee7d8a00e4 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,21 +1,31 @@
-MD5 5134f74c49d96bc434a0a99588fd42c9 netpbm-10.20.ebuild 2201
-MD5 c82b4ab84281409236d36333c667b4bf netpbm-9.12-r4.ebuild 1522
-MD5 5d912e208839f4484f0480590f37d52f netpbm-10.11.14.ebuild 2055
-MD5 459c5e200c5b60653db23c2d84382292 netpbm-10.18.7.ebuild 2055
-MD5 8f6f4c4548bae30885b915d5ba153023 netpbm-10.11.15.ebuild 2055
-MD5 19e2de0606426c1dbeb616bed34a64ac netpbm-10.19.ebuild 1756
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3c274dbf75a06b6944c33b906db14ba5 ChangeLog 6875
-MD5 711d14a3f7331c48808611f13dbc9a02 netpbm-10.11.5-r3.ebuild 1619
+MD5 bd29ae6136ac08f32c6a27cbb4b1d65f netpbm-10.19.ebuild 1745
+MD5 b609eecf67c4b72a6bfbb5c00334a98e netpbm-10.11.14.ebuild 2006
+MD5 1432768a4a532f0f2c0b210c2300921f netpbm-10.11.5-r3.ebuild 1563
+MD5 3d1fe9ba2b1847ffe9bb8a1875bc5260 netpbm-9.12-r4.ebuild 1339
+MD5 bb4bc60722f622a741ec16fa85b6dec8 netpbm-10.11.15.ebuild 2005
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
+MD5 60e164c7482e87c2698316714a2d6043 netpbm-10.18.7.ebuild 2005
+MD5 c27531fe64df542a2b04457af395054f netpbm-10.20.ebuild 2151
 MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
-MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
+MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
+MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
 MD5 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
 MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
+MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
 MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20 62
-MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
-MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
-MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
 MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
-MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
+MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
 MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
+MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
+MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD4DBQFAya8EHTu7gpaalycRAoUHAJ4yLI6/Lt5LZhTaNsQrOodlgA+YVwCXU3k0
+jrsfYGbLZF2VG4l5LmQiJQ==
+=98on
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.11.14.ebuild b/media-libs/netpbm/netpbm-10.11.14.ebuild
index cc7cabece135..033876788d11 100644
--- a/media-libs/netpbm/netpbm-10.11.14.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.14.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.9 2004/06/07 23:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.10 2004/06/11 13:09:14 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic gcc
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ia64"
 IUSE="svga jpeg tiff png zlib"
-RESTRICT="nomirror"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	zlib? ( sys-libs/zlib )
-	x86? ( svga? ( media-libs/svgalib ) )"
+	svga? ( media-libs/svgalib )"
 
 src_unpack() {
 	unpack ${A}
@@ -27,24 +25,24 @@ src_unpack() {
 	cp Makefile.config.in Makefile.config
 
 	if use svga ; then
-	echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
-	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
+		echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+		echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
 	if use jpeg ; then
-	echo "JPEGLIB = libjpeg.so" >> Makefile.config
+		echo "JPEGLIB = libjpeg.so" >> Makefile.config
 	fi
 
 	if use png ; then
-	echo "PNGLIB = libpng.so" >> Makefile.config
+		echo "PNGLIB = libpng.so" >> Makefile.config
 	fi
 
 	if use tiff ; then
-	echo "TIFFLIB = libtiff.so" >> Makefile.config
+		echo "TIFFLIB = libtiff.so" >> Makefile.config
 	fi
 
 	if use zlib ; then
-	echo "ZLIB = libz.so" >> Makefile.config
+		echo "ZLIB = libz.so" >> Makefile.config
 	fi
 
 	# Sparc support ...
@@ -55,8 +53,7 @@ src_unpack() {
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
+	emake -j1 CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/netpbm/netpbm-10.11.15.ebuild b/media-libs/netpbm/netpbm-10.11.15.ebuild
index a04152c8de2b..ba5e99d23360 100644
--- a/media-libs/netpbm/netpbm-10.11.15.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.15.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.15.ebuild,v 1.5 2004/06/07 23:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.15.ebuild,v 1.6 2004/06/11 13:09:14 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic gcc
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa amd64 ~ia64"
 IUSE="svga jpeg tiff png zlib"
-RESTRICT="nomirror"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	zlib? ( sys-libs/zlib )
-	x86? ( svga? ( media-libs/svgalib ) )"
+	svga? ( media-libs/svgalib )"
 
 src_unpack() {
 	unpack ${A}
@@ -27,24 +25,24 @@ src_unpack() {
 	cp Makefile.config.in Makefile.config
 
 	if use svga ; then
-	echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
-	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
+		echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+		echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
 	if use jpeg ; then
-	echo "JPEGLIB = libjpeg.so" >> Makefile.config
+		echo "JPEGLIB = libjpeg.so" >> Makefile.config
 	fi
 
 	if use png ; then
-	echo "PNGLIB = libpng.so" >> Makefile.config
+		echo "PNGLIB = libpng.so" >> Makefile.config
 	fi
 
 	if use tiff ; then
-	echo "TIFFLIB = libtiff.so" >> Makefile.config
+		echo "TIFFLIB = libtiff.so" >> Makefile.config
 	fi
 
 	if use zlib ; then
-	echo "ZLIB = libz.so" >> Makefile.config
+		echo "ZLIB = libz.so" >> Makefile.config
 	fi
 
 	# Sparc support ...
@@ -55,8 +53,7 @@ src_unpack() {
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
+	emake -j1 CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/netpbm/netpbm-10.11.5-r3.ebuild b/media-libs/netpbm/netpbm-10.11.5-r3.ebuild
index 8dd00219f976..f55ebe1630eb 100644
--- a/media-libs/netpbm/netpbm-10.11.5-r3.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.5-r3.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.5-r3.ebuild,v 1.6 2004/06/07 23:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.5-r3.ebuild,v 1.7 2004/06/11 13:09:14 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic gcc
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips alpha ~hppa ~amd64"
 IUSE="svga"
-RESTRICT="nomirror"
 
 DEPEND=">=media-libs/jpeg-6b
 	>=media-libs/tiff-3.5.5
 	>=media-libs/libpng-1.2.1
-	x86? ( svga? ( media-libs/svgalib ) )"
+	svga? ( media-libs/svgalib )"
 
 src_unpack() {
 	unpack ${A}
@@ -39,8 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
+	emake -j1 CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/netpbm/netpbm-10.18.7.ebuild b/media-libs/netpbm/netpbm-10.18.7.ebuild
index be06e7dd06a4..c10f4123bfca 100644
--- a/media-libs/netpbm/netpbm-10.18.7.ebuild
+++ b/media-libs/netpbm/netpbm-10.18.7.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.18.7.ebuild,v 1.3 2004/06/07 23:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.18.7.ebuild,v 1.4 2004/06/11 13:09:14 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic gcc
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
 IUSE="svga jpeg tiff png zlib"
-RESTRICT="nomirror"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	zlib? ( sys-libs/zlib )
-	x86? ( svga? ( media-libs/svgalib ) )"
+	svga? ( media-libs/svgalib )"
 
 src_unpack() {
 	unpack ${A}
@@ -27,24 +25,24 @@ src_unpack() {
 	cp Makefile.config.in Makefile.config
 
 	if use svga ; then
-	echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
-	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
+		echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+		echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
 	if use jpeg ; then
-	echo "JPEGLIB = libjpeg.so" >> Makefile.config
+		echo "JPEGLIB = libjpeg.so" >> Makefile.config
 	fi
 
 	if use png ; then
-	echo "PNGLIB = libpng.so" >> Makefile.config
+		echo "PNGLIB = libpng.so" >> Makefile.config
 	fi
 
 	if use tiff ; then
-	echo "TIFFLIB = libtiff.so" >> Makefile.config
+		echo "TIFFLIB = libtiff.so" >> Makefile.config
 	fi
 
 	if use zlib ; then
-	echo "ZLIB = libz.so" >> Makefile.config
+		echo "ZLIB = libz.so" >> Makefile.config
 	fi
 
 	# Sparc support ...
@@ -55,8 +53,7 @@ src_unpack() {
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
+	emake -j1 CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/netpbm/netpbm-10.19.ebuild b/media-libs/netpbm/netpbm-10.19.ebuild
index f0673ea05ab1..147c210adb69 100644
--- a/media-libs/netpbm/netpbm-10.19.ebuild
+++ b/media-libs/netpbm/netpbm-10.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.19.ebuild,v 1.4 2004/06/07 23:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.19.ebuild,v 1.5 2004/06/11 13:09:14 vapier Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ IUSE="svga"
 DEPEND=">=media-libs/jpeg-6b
 	>=media-libs/tiff-3.5.5
 	>=media-libs/libpng-1.2.1
-	x86? ( svga? ( media-libs/svgalib ) )"
+	svga? ( media-libs/svgalib )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/netpbm/netpbm-10.20.ebuild b/media-libs/netpbm/netpbm-10.20.ebuild
index eedf86c386fc..575a5e48cd00 100644
--- a/media-libs/netpbm/netpbm-10.20.ebuild
+++ b/media-libs/netpbm/netpbm-10.20.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.20.ebuild,v 1.4 2004/06/07 23:33:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.20.ebuild,v 1.5 2004/06/11 13:09:14 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic gcc
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa amd64 ~ia64"
 IUSE="svga jpeg tiff png zlib"
-RESTRICT="nomirror"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	zlib? ( sys-libs/zlib )
-	x86? ( svga? ( media-libs/svgalib ) )"
+	svga? ( media-libs/svgalib )"
 
 src_unpack() {
 	unpack ${A}
@@ -27,24 +25,24 @@ src_unpack() {
 	cp Makefile.config.in Makefile.config
 
 	if use svga ; then
-	echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
-	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
+		echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+		echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
 	if use jpeg ; then
-	echo "JPEGLIB = libjpeg.so" >> Makefile.config
+		echo "JPEGLIB = libjpeg.so" >> Makefile.config
 	fi
 
 	if use png ; then
-	echo "PNGLIB = libpng.so" >> Makefile.config
+		echo "PNGLIB = libpng.so" >> Makefile.config
 	fi
 
 	if use tiff ; then
-	echo "TIFFLIB = libtiff.so" >> Makefile.config
+		echo "TIFFLIB = libtiff.so" >> Makefile.config
 	fi
 
 	if use zlib ; then
-	echo "ZLIB = libz.so" >> Makefile.config
+		echo "ZLIB = libz.so" >> Makefile.config
 	fi
 
 	# Sparc support ...
@@ -60,8 +58,7 @@ src_unpack() {
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
+	emake -j1 CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "emake failed"
 }
 
 src_install() {
diff --git a/media-libs/netpbm/netpbm-9.12-r4.ebuild b/media-libs/netpbm/netpbm-9.12-r4.ebuild
index 1eba9d4ce190..9ec244547898 100644
--- a/media-libs/netpbm/netpbm-9.12-r4.ebuild
+++ b/media-libs/netpbm/netpbm-9.12-r4.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r4.ebuild,v 1.16 2004/01/14 17:45:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r4.ebuild,v 1.17 2004/06/11 13:09:14 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic gcc
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 hppa"
+IUSE=""
 
 DEPEND=">=media-libs/jpeg-6b
 	>=media-libs/tiff-3.5.5
@@ -24,21 +24,14 @@ src_unpack() {
 	# start fix
 	if [ ${ARCH} = "sparc" ]
 	then
-		filter-flags "-O3"
-		filter-flags "-O2"
-		filter-flags "-O"
+		filter-flags -O3 -O2 -O
 	fi
 	# end fix
 	sed -e "s:-O3:${CFLAGS}:" ${FILESDIR}/${PV}/Makefile.config >Makefile.config
 }
 
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1"
-	local myopts=""
-	[ -n ${CC} ] && myopts="${myopts} CC=\"${CC}\""
-	[ -n ${CXX} ] && myopts="${myopts} CXX=\"${CXX}\""
-	einfo "myopts=${myopts}"
-	emake ${myopts}|| die "Make failed"
+	emake -j1 CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "emake failed"
 }
 
 src_install() {