Cleanup

Package-Manager: portage-2.1_pre4-r1

11 files changed, 12 insertions, 563 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 6c7624af3f18..c715e9508c40 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.108 2006/03/01 00:30:36 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.109 2006/03/05 08:55:51 lu_zero Exp $
+
+  05 Mar 2006; Luca Barbato <lu_zero@gentoo.org>
+  -files/netpbm-10.29-anytopnm.patch, -files/netpbm-10.29-build.patch,
+  -files/netpbm-10.29-infinity.patch,
+  -files/netpbm-10.29-pnmtopng-alpha-check.patch,
+  -files/netpbm-dSAFER.patch, -netpbm-10.26.24.ebuild,
+  -netpbm-10.26.25.ebuild:
+  Cleanup
 
   01 Mar 2006; Marcelo Goes <vanquirius@gentoo.org>
   +files/netpbm-10.32-parallel.patch, netpbm-10.32.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 68e98261328d..0cd5abba7bc8 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,12 +1,6 @@
-MD5 23be27cd00131618e59e5aba5f5b4898 ChangeLog 15319
-RMD160 322262f479a3ff5f0a92295ea3ae04bc73ca7eb0 ChangeLog 15319
-SHA256 015962edb55ebbe21be9b0ecd4a93a076a90d31468be7645d78b6bc52abf6aba ChangeLog 15319
-MD5 125fcf41ce0966bfca9e81ef32ae31f2 files/digest-netpbm-10.26.24 509
-RMD160 4d2382475d2251ab805faf74b33f73e4459eb8a4 files/digest-netpbm-10.26.24 509
-SHA256 0a7cec48efa34b0fd0116aa07180bd22c1ab91bc0706b226f60caa76b1615e44 files/digest-netpbm-10.26.24 509
-MD5 0ddde32893ebaac2d3fb25e7b258202c files/digest-netpbm-10.26.25 509
-RMD160 43b0ce1241a32396b6a1bcf7492421b5e87c16a5 files/digest-netpbm-10.26.25 509
-SHA256 4cffdbdd12e81a734589972355414988a77f16fb01bcb7fcc702f7f414fd2e4f files/digest-netpbm-10.26.25 509
+MD5 983a0d98d400cded392778d6334c3fb7 ChangeLog 15617
+RMD160 9449f4ecc4b42777a406dadc657b503a5c4db5b2 ChangeLog 15617
+SHA256 a31b8b15a8a2132b2d5bb1822d9c5e7e53c3aa20fa43b396ec3c918a0df0db11 ChangeLog 15617
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 RMD160 17c24907f2d3e4a1a59479e1767609ad16586224 files/digest-netpbm-10.29 62
 SHA256 e3919e50f5e05f7221fae56eb27e057518e8180fceb0609639e4b9de30b8e0e1 files/digest-netpbm-10.29 62
@@ -22,18 +16,6 @@ SHA256 98a5e2b901f361c534e18835d4bf9366531729b9fbf4242154d68e92c5e3ef34 files/di
 MD5 8ef24fe5097b041d3dcac4a1ea1ae8fa files/netpbm-10.19-message.patch 633
 RMD160 43ac665250a7af5079bf4e517220eee3871001df files/netpbm-10.19-message.patch 633
 SHA256 63ad772f1422216119b13ceb4e231e439bbf5ce30f29c300298972c81e65a2d4 files/netpbm-10.19-message.patch 633
-MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
-RMD160 7f41e544e1ba4ea868d5b39b4ead29ee4293df44 files/netpbm-10.29-anytopnm.patch 1562
-SHA256 3e93c30c44e03786c82778d798c9579da3947ae45176d4814618b08c71731ab1 files/netpbm-10.29-anytopnm.patch 1562
-MD5 e3ef1ff99bf9335b47ea62db7416b625 files/netpbm-10.29-build.patch 2283
-RMD160 f8d5affe2c4bdfa33f60b702901a74e39e113e68 files/netpbm-10.29-build.patch 2283
-SHA256 b225435ca2d0c72387f34bb0f837a84a2552d3d24a1819708aa5826fc18ab4a9 files/netpbm-10.29-build.patch 2283
-MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
-RMD160 9aaf63392b7e33ae4ed873be743e4ce2ad98c67e files/netpbm-10.29-infinity.patch 5840
-SHA256 0bad457a5f5f500c2a6ce41bc591c1ffe81fd50abd35802e8ebae8fd9c69695c files/netpbm-10.29-infinity.patch 5840
-MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-RMD160 d024635b5cd5ef05e3d74eddd2aaa9c5527aafc6 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-SHA256 07e2da805dd90b9ff60a073f21c7ea26e3ab8e3d8787ae79c4a33275d704bc16 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
 MD5 d54a93389a63382e459a5aa153484b46 files/netpbm-10.30-anytopnm.patch 1434
 RMD160 98524254aea8ba6ddc47a0dd6387aefa9240aec5 files/netpbm-10.30-anytopnm.patch 1434
 SHA256 87dad5302b8919935f5dfead34bf56c193af801c839ee80da4a24415f9ec3f24 files/netpbm-10.30-anytopnm.patch 1434
@@ -64,18 +46,9 @@ SHA256 7d90e69e49a370ded4d1d4b8c7fb2c4946a5d4555b6fed83312ac44ef1d054ee files/ne
 MD5 b1f727ca5ab6515f5d4973fb85521bba files/netpbm-10.32-parallel.patch 2726
 RMD160 8246092242b9df50137ea1fb677e01b54c8f68bf files/netpbm-10.32-parallel.patch 2726
 SHA256 453465c99f8ac7ab2a6194c4c78e48a3f53744bba2a8697a33742908e588d826 files/netpbm-10.32-parallel.patch 2726
-MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
-RMD160 7fd5d781027967dab727ff5587010597834d38af files/netpbm-dSAFER.patch 818
-SHA256 e90f484373a1e53b9ba27635caf6d22585a9425ee6532d89fdce07f38819161d files/netpbm-dSAFER.patch 818
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab metadata.xml 224
 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23 metadata.xml 224
-MD5 6b2b0274ae97f30dc64dd9878d225dab netpbm-10.26.24.ebuild 2803
-RMD160 12ccc8666f539b0bbdfca7d5949ee8f7db9d9999 netpbm-10.26.24.ebuild 2803
-SHA256 86ea48040908051197c89d6e8e7f91f8b0cba0c5b2838f200db514f7bce93d29 netpbm-10.26.24.ebuild 2803
-MD5 e3b1095dced3211d561684a264c5c29d netpbm-10.26.25.ebuild 2803
-RMD160 1ef31b1278b64868d6071ea3faa8a5cd4d6c4265 netpbm-10.26.25.ebuild 2803
-SHA256 a93dc9aefcd0254369ac5aafcc19aa37cc303e055f6966cd82806ad0e202f471 netpbm-10.26.25.ebuild 2803
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
 RMD160 0d4e834d6042b8f2da780be23001aedd5cd615b2 netpbm-10.29.ebuild 2423
 SHA256 0d31480585431af95a7623d28ea1fe9c37224f92f4169d4705e65e112f69e4b3 netpbm-10.29.ebuild 2423
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.24 b/media-libs/netpbm/files/digest-netpbm-10.26.24
deleted file mode 100644
index debaf2b1bdb9..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-10.26.24
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f1c204b454fb7d6b417016a0aea32d68 netpbm-10.26.24.tgz 2540150
-RMD160 e62e853a66c144b8cec8f540ea3fac50e43aed39 netpbm-10.26.24.tgz 2540150
-SHA256 a261ae2030dbd6a81554a51729074cc211c1b4147046eb9b7dbe0344ee878ec5 netpbm-10.26.24.tgz 2540150
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.25 b/media-libs/netpbm/files/digest-netpbm-10.26.25
deleted file mode 100644
index 5366f3116d7a..000000000000
--- a/media-libs/netpbm/files/digest-netpbm-10.26.25
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d2bf4bc88689e4bf280c29de2c60fe3f netpbm-10.26.25.tgz 2540566
-RMD160 971491feec5da9cfc103fab2618720cb538bd80d netpbm-10.26.25.tgz 2540566
-SHA256 fda2b11538d077c55a59e0c24af35863426e3338ff7f82e3e3fb3ce119d25de6 netpbm-10.26.25.tgz 2540566
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/files/netpbm-10.29-anytopnm.patch b/media-libs/netpbm/files/netpbm-10.29-anytopnm.patch
deleted file mode 100644
index aa4cf5afec35..000000000000
--- a/media-libs/netpbm/files/netpbm-10.29-anytopnm.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Patch by Matthew Lange
-
-http://bugs.gentoo.org/105127
-
---- converter/other/anytopnm
-+++ converter/other/anytopnm
-@@ -73,7 +73,7 @@
-     file --mime /dev/null >/dev/null 2>/dev/null
-     if [ $? -eq 0 ]; then
-         # Now that we know the --mime option exists, use it.
--        mimeType=`file --mime "$1" | cut -d: -f2-`
-+        mimeType=`file --mime "$1" | cut -d: -f2- | cut -c2-`
-     else
-         # file --mime failed; we don't know why, but we assume it's because it
-         # is a traditional 'file' program that doesn't have a --mime option.
-@@ -90,26 +90,26 @@
-     case "$1" in
- 
-         image/jpeg )
--            type = "jfif"
-+            type="jfif"
-             ;;
-         image/gif )
--            type = "gif"
-+            type="gif"
-             ;;
-         image/tiff )
--            type = "tiff"
-+            type="tiff"
-             ;;
-         image/bmp )
--            type = "bmp"
-+            type="bmp"
-             ;;
-         image/png )
--            type = "png"
-+            type="png"
-             ;;
-         image/x-portable-bitmap | image/x-portable-pixmap | \
-                 image/x-portable-greymap)
--            type = "pnm"
-+            type="pnm"
-             ;;
-         image/x-xpm )
--            type = "xpm"
-+            type="xpm"
-             ;;
-         * )
-             filetype=unknown
-@@ -541,7 +541,7 @@
- 
- setMimeType "$file"
- 
--typeDescription=`file "$file" | cut -d: -f2-`
-+typeDescription=`file "$file" | cut -d: -f2- | cut -c2`
- 
- determineType "$file" "$mimeType" "$typeDescription" "$fileExtension"
- 
diff --git a/media-libs/netpbm/files/netpbm-10.29-build.patch b/media-libs/netpbm/files/netpbm-10.29-build.patch
deleted file mode 100644
index eab109a3c6a3..000000000000
--- a/media-libs/netpbm/files/netpbm-10.29-build.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-- Pass $(LINUXSVGALIB) to `libopt` so that 'libvga.so' is turned into '-lvga'
-
---- lib/Makefile
-+++ lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- 	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
--	  $(PKGDIR)/link
-+	  $(PKGDIR)/lib
- 
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time 
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
--	cd $(PKGDIR)/link ; \
-+	cd $(PKGDIR)/lib ; \
-           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
--          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-             libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- GNUmakefile
-+++ GNUmakefile
-@@ -87,6 +87,9 @@
- 
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
- 
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
---- buildtools/libopt.c
-+++ buildtools/libopt.c
-@@ -496,4 +496,5 @@
- main(int argc, char **argv) {
- 
-+    bool shut_the_hell_up = TRUE;
-     bool error;
-     bool runtime;  /* -runtime option has been seen */
-@@ -508,4 +509,6 @@
-         if (strcmp(argv[arg], "-runtime") == 0)
-             runtime = TRUE;
-+        else if (strcmp(argv[arg], "-v") == 0)
-+            shut_the_hell_up = FALSE;
-         else {
-             if (strlen(argv[arg]) > 200)
-@@ -534,4 +537,5 @@
-     } else {
-         fputs(outputLine, stdout);
-+        if (shut_the_hell_up == FALSE)
-         fprintf(stderr, "libopt results: '%s'\n", outputLine);
-         retval = 0;
---- other/Makefile
-+++ other/Makefile
-@@ -53,7 +53,7 @@
- 
- ppmsvgalib: %: %.o $(NETPBMLIB) $(LIBOPT)
- 	$(LD) $(LDFLAGS) -o $@ $< \
--	  `$(LIBOPT) $(NETPBMLIB)` $(LINUXSVGALIB) $(MATHLIB) $(LDLIBS) \
-+	  `$(LIBOPT) $(NETPBMLIB) $(LINUXSVGALIB)` $(MATHLIB) $(LDLIBS) \
- 	  $(LADD) 
- 
- install.bin: install.bin.local
diff --git a/media-libs/netpbm/files/netpbm-10.29-infinity.patch b/media-libs/netpbm/files/netpbm-10.29-infinity.patch
deleted file mode 100644
index 00717dd53bc5..000000000000
--- a/media-libs/netpbm/files/netpbm-10.29-infinity.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Index: netpbm-10.29/editor/pnmaddnoise.c
-===================================================================
---- netpbm-10.29.orig/editor/pnmaddnoise.c
-+++ netpbm-10.29/editor/pnmaddnoise.c
-@@ -252,14 +252,14 @@ laplacian_noise(FILE * const ifp,
-     int rows, cols, format, row;
-     double rtemp, gtemp, btemp;
-     double u, u1;
--    double INFINITY;
-+    double infinity;
- 
-     double const EPSILON = 1.0e-5;
-     int const forceplain = 0;
- 
-     pnm_readpnminit( ifp, &cols, &rows, &maxval, &format );
-     xelrow = pnm_allocrow( cols );
--    INFINITY = (double) maxval;
-+    infinity = (double) maxval;
- 
-     pnm_writepnminit( stdout, cols, rows, maxval, format, forceplain );
- 
-@@ -272,12 +272,12 @@ laplacian_noise(FILE * const ifp,
-                 u = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( u <= 0.5 ) {
-                     if ( u <= EPSILON )
--                        rtemp = PPM_GETR( *xP ) - INFINITY;
-+                        rtemp = PPM_GETR( *xP ) - infinity;
-                     else
-                         rtemp = PPM_GETR( *xP ) + lsigma * log( 2.0 * u );
-                 } else {
-                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
--                        rtemp = PPM_GETR( *xP ) + INFINITY;
-+                        rtemp = PPM_GETR( *xP ) + infinity;
-                     else
-                         rtemp = PPM_GETR( *xP ) - lsigma * log( 2.0 * u1 );
-                 }
-@@ -285,12 +285,12 @@ laplacian_noise(FILE * const ifp,
-                 u = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( u <= 0.5 ) {
-                     if ( u <= EPSILON )
--                        gtemp = PPM_GETG( *xP ) - INFINITY;
-+                        gtemp = PPM_GETG( *xP ) - infinity;
-                     else
-                         gtemp = PPM_GETG( *xP ) + lsigma * log( 2.0 * u );
-                 } else {
-                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
--                        gtemp = PPM_GETG( *xP ) + INFINITY;
-+                        gtemp = PPM_GETG( *xP ) + infinity;
-                     else
-                         gtemp = PPM_GETG( *xP ) - lsigma * log( 2.0 * u1 );
-                 }
-@@ -298,12 +298,12 @@ laplacian_noise(FILE * const ifp,
-                 u = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( u <= 0.5 ) {
-                     if ( u <= EPSILON )
--                        btemp = PPM_GETB( *xP ) - INFINITY;
-+                        btemp = PPM_GETB( *xP ) - infinity;
-                     else
-                         btemp = PPM_GETB( *xP ) + lsigma * log( 2.0 * u );
-                 } else {
-                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
--                        btemp = PPM_GETB( *xP ) + INFINITY;
-+                        btemp = PPM_GETB( *xP ) + infinity;
-                     else
-                         btemp = PPM_GETB( *xP ) - lsigma * log( 2.0 * u1 );
-                 }
-@@ -318,12 +318,12 @@ laplacian_noise(FILE * const ifp,
-                 u = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( u <= 0.5 ) {
-                     if ( u <= EPSILON )
--                        gtemp = PNM_GET1( *xP ) - INFINITY;
-+                        gtemp = PNM_GET1( *xP ) - infinity;
-                     else
-                         gtemp = PNM_GET1( *xP ) + lsigma * log( 2.0 * u );
-                 } else {
-                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
--                        gtemp = PNM_GET1( *xP ) + INFINITY;
-+                        gtemp = PNM_GET1( *xP ) + infinity;
-                     else
-                         gtemp = PNM_GET1( *xP ) - lsigma * log( 2.0 * u1 );
-                 }
-@@ -356,14 +356,14 @@ multiplicative_gaussian_noise(FILE * con
-     int rows, cols, format, row;
-     double rtemp, gtemp, btemp;
-     double uniform, rayleigh, gauss;
--    double INFINITY;
-+    double infinity;
- 
-     double const EPSILON = 1.0e-5;
-     int const forceplain = 0;
- 
-     pnm_readpnminit( ifp, &cols, &rows, &maxval, &format );
-     xelrow = pnm_allocrow( cols );
--    INFINITY = (double) maxval;
-+    infinity = (double) maxval;
- 
-     pnm_writepnminit( stdout, cols, rows, maxval, format, forceplain );
- 
-@@ -375,7 +375,7 @@ multiplicative_gaussian_noise(FILE * con
-             case PPM_TYPE:
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( uniform <= EPSILON )
--                    rayleigh = INFINITY;
-+                    rayleigh = infinity;
-                 else
-                     rayleigh = sqrt( -2.0 * log( uniform ) );
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-@@ -384,7 +384,7 @@ multiplicative_gaussian_noise(FILE * con
- 
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( uniform <= EPSILON )
--                    rayleigh = INFINITY;
-+                    rayleigh = infinity;
-                 else
-                     rayleigh = sqrt( -2.0 * log( uniform ) );
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-@@ -393,7 +393,7 @@ multiplicative_gaussian_noise(FILE * con
- 
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( uniform <= EPSILON )
--                    rayleigh = INFINITY;
-+                    rayleigh = infinity;
-                 else
-                     rayleigh = sqrt( -2.0 * log( uniform ) );
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-@@ -409,7 +409,7 @@ multiplicative_gaussian_noise(FILE * con
-             default:
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
-                 if ( uniform <= EPSILON )
--                    rayleigh = INFINITY;
-+                    rayleigh = infinity;
-                 else
-                     rayleigh = sqrt( -2.0 * log( uniform ) );
-                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
diff --git a/media-libs/netpbm/files/netpbm-10.29-pnmtopng-alpha-check.patch b/media-libs/netpbm/files/netpbm-10.29-pnmtopng-alpha-check.patch
deleted file mode 100644
index fbae5ac4e7a2..000000000000
--- a/media-libs/netpbm/files/netpbm-10.29-pnmtopng-alpha-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix segfault when converting files w/out alpha
-
-Patch by Andy Chambers
-
-http://bugs.gentoo.org/104434
-
---- converter/other/pnmtopng.c
-+++ converter/other/pnmtopng.c
-@@ -1690,7 +1690,8 @@
-             pnm_promoteformatrow(xelrow, cols, maxval, format, maxval,
-                                  PPM_TYPE);
-             
--            makePngLine(line, xelrow, cols, maxval, alpha, alpha_mask[row],
-+            makePngLine(line, xelrow, cols, maxval, 
-+			alpha, alpha ? alpha_mask[row] : NULL,
-                         cht, caht, info_ptr, png_maxval, depth);
- 
-             png_write_row(png_ptr, line);
diff --git a/media-libs/netpbm/files/netpbm-dSAFER.patch b/media-libs/netpbm/files/netpbm-dSAFER.patch
deleted file mode 100644
index d6a99b4bc275..000000000000
--- a/media-libs/netpbm/files/netpbm-dSAFER.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- netpbm-10.20/converter/other/pstopnm.c~	2005-06-02 16:20:03.205694176 +0200
-+++ netpbm-10.20/converter/other/pstopnm.c	2005-06-02 16:24:24.978262856 +0200
-@@ -568,11 +568,11 @@
-         pm_message("execing '%s' with args '%s' (arg 0), "
-                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-                    ghostscriptProg, arg0,
--                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
-+                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dSAFER",  "-");
-     }
- 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-", NULL);
-+          "-dNOPAUSE", "-dSAFER", "-", NULL);
-     
-     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
-              ghostscriptProg, errno, strerror(errno));
diff --git a/media-libs/netpbm/netpbm-10.26.24.ebuild b/media-libs/netpbm/netpbm-10.26.24.ebuild
deleted file mode 100644
index 41bb7e187f26..000000000000
--- a/media-libs/netpbm/netpbm-10.26.24.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.24.ebuild,v 1.1 2006/02/09 23:41:25 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-MAN_VER=10.30
-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
-	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sh ~sparc ~x86"
-IUSE="svga jpeg tiff png zlib"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	zlib? ( sys-libs/zlib )
-	svga? ( media-libs/svgalib )
-	media-libs/jbigkit
-	media-libs/jasper
-	media-libs/urt"
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo ${suffix//\.}
-}
-netpbm_ldshlib() {
-	case ${CHOST} in
-		*-darwin*) echo '-dynamiclib -install_name $(SONAME)';;
-		*)         echo '-shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	use $1 && echo -l${2:-$1} || echo NONE
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/netpbm-10.30-build.patch
-
-	rm -f configure
-	cp Makefile.config.in Makefile.config
-	cat >> Makefile.config <<-EOF
-	# Gentoo toolchain options
-	CC = $(tc-getCC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	LDSHLIB = $(netpbm_ldshlib)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-
-	# Use system versions instead of bundled
-	JBIGLIB = -ljbig
-	JBIGHDR_DIR =
-	JASPERLIB = -ljasper
-	JASPERHDR_DIR =
-	URTLIB = -lrle
-	URTHDR_DIR =
-	EOF
-
-	# Sparc support ...
-	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
-	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
-}
-
-src_install() {
-	make package pkgdir="${D}"/usr || die "make package failed"
-
-	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm -f "${D}"/usr/bin/{doc.url,manweb}
-	rm -rf "${D}"/usr/man/web
-	rm -rf "${D}"/usr/link
-	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo}
-	dodir /usr/share
-	mv "${D}"/usr/man "${D}"/usr/share/
-	mv "${D}"/usr/misc "${D}"/usr/share/netpbm
-
-	dodoc README
-	cd doc
-	GLOBIGNORE='*.html:.*' dodoc *
-	dohtml -r .
-
-	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
-	doman *.[0-9]
-	dodoc README* gen-netpbm-manpages
-}
diff --git a/media-libs/netpbm/netpbm-10.26.25.ebuild b/media-libs/netpbm/netpbm-10.26.25.ebuild
deleted file mode 100644
index b330dfc9c3e9..000000000000
--- a/media-libs/netpbm/netpbm-10.26.25.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.25.ebuild,v 1.1 2006/02/20 06:46:09 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-MAN_VER=10.30
-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
-	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sh ~sparc ~x86"
-IUSE="svga jpeg tiff png zlib"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	zlib? ( sys-libs/zlib )
-	svga? ( media-libs/svgalib )
-	media-libs/jbigkit
-	media-libs/jasper
-	media-libs/urt"
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo ${suffix//\.}
-}
-netpbm_ldshlib() {
-	case ${CHOST} in
-		*-darwin*) echo '-dynamiclib -install_name $(SONAME)';;
-		*)         echo '-shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	use $1 && echo -l${2:-$1} || echo NONE
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/netpbm-10.30-build.patch
-
-	rm -f configure
-	cp Makefile.config.in Makefile.config
-	cat >> Makefile.config <<-EOF
-	# Gentoo toolchain options
-	CC = $(tc-getCC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	LDSHLIB = $(netpbm_ldshlib)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-
-	# Use system versions instead of bundled
-	JBIGLIB = -ljbig
-	JBIGHDR_DIR =
-	JASPERLIB = -ljasper
-	JASPERHDR_DIR =
-	URTLIB = -lrle
-	URTHDR_DIR =
-	EOF
-
-	# Sparc support ...
-	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
-	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
-}
-
-src_install() {
-	make package pkgdir="${D}"/usr || die "make package failed"
-
-	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm -f "${D}"/usr/bin/{doc.url,manweb}
-	rm -rf "${D}"/usr/man/web
-	rm -rf "${D}"/usr/link
-	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo}
-	dodir /usr/share
-	mv "${D}"/usr/man "${D}"/usr/share/
-	mv "${D}"/usr/misc "${D}"/usr/share/netpbm
-
-	dodoc README
-	cd doc
-	GLOBIGNORE='*.html:.*' dodoc *
-	dohtml -r .
-
-	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
-	doman *.[0-9]
-	dodoc README* gen-netpbm-manpages
-}