[gentoo-commits] proj/musl:master commit in: media-libs/netpbm/files/, media-libs/netpbm/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     4eb07834c7e887088a98d8cee3b8cec6ffb72c70
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep  4 07:11:24 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 13:39:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=4eb07834

media-libs/netpbm: in tree version works

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 media-libs/netpbm/Manifest                         |  13 --
 media-libs/netpbm/files/make-tarball.sh            |  50 ------
 media-libs/netpbm/files/netpbm-10.31-build.patch   |  50 ------
 .../netpbm/files/netpbm-10.66-failing-tests.patch  |  28 ---
 .../netpbm/files/netpbm-10.66-jasper-hack.patch    |  41 -----
 media-libs/netpbm/files/netpbm-10.66-jbig-2.patch  |  19 --
 .../netpbm/files/netpbm-10.66-jpeg-dirs.patch      |  28 ---
 .../netpbm-10.66-musl-avoid-stdout-collision.patch |  30 ----
 .../netpbm/files/netpbm-10.66-options-case.patch   | 105 -----------
 media-libs/netpbm/files/netpbm-10.66-test.patch    |  17 --
 .../files/netpbm-10.66-wordaccess_be_aligned.patch |  23 ---
 media-libs/netpbm/metadata.xml                     |  14 --
 media-libs/netpbm/netpbm-10.66.00-r99.ebuild       | 197 ---------------------
 13 files changed, 615 deletions(-)

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
deleted file mode 100644
index e220e3c..0000000
--- a/media-libs/netpbm/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX make-tarball.sh 1053 SHA256 247827b36f85878195ad30f1a1ec3a4edf9992ccafcd4f66ce4fa18910abd731 SHA512 66d7de6cb87fefb353547183c7dd2ff28304534753aef48549801ef3ed23bcde995a766e6f3b14b70e64e1a7e6fddca56329e5a6e5e2182f26bf3b0d2dffd593 WHIRLPOOL 05831454f0109ef79549922234c98a9c4294804329212b197bb386d4faa37b26537f9b537cc50f890bf4d48e33b84d4fff3300da9adab12d3137ba2e90cbf3e0
-AUX netpbm-10.31-build.patch 1629 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323 SHA512 53e88bd1c85aa04d60ca2de7a32e5d00d9f959f3443e0c951c0694c814f6956708d8d12427a0fa8a8f76a1613d2982c3aa9b0c6ddd12b9cad3419ced1e5bb59e WHIRLPOOL 15a6b682813bfac808ccff8e16be492fd78defd59f82d5960d9a344452d8c761ea64ebbdc460c005c7d7669a3f26aa3704850487b43f4732bccb742b15709c28
-AUX netpbm-10.66-failing-tests.patch 535 SHA256 bce4b9243d2cb9ba41428a927ff5275fd34bee4e67ed6203efb9b4a503d4d3f5 SHA512 33101e745fdeb9159da48393622edf9163c85f2c133951ba33d48f80758179f18ce36e60e3357bb978c101a7a0e1688aa6dbbc1a1c646782089760908dfe2b04 WHIRLPOOL 4db4c9002f30ac77c3fcd7c19dc7d659bf8d5548e02fd31aa14f57fc99344ebbc8b0e0b212c8bef6cc1d9419cf45a824bdf2f5ce09da1e64a19039adb48ed12d
-AUX netpbm-10.66-jasper-hack.patch 924 SHA256 9c8b32539402b16ced4c83f4c300b742736a9c3eb5bba8f8e5b1758e9de6f7cb SHA512 e58a5f6800e2ab511080d505e9286e4831cb498f9a02cd5823bd52bb8e267c780f4b792388ccc29023afe18005c753b6ea32a3e277b8b1e3ceb8e4b997afe359 WHIRLPOOL 4757e9bab145dfae5837281d645a98906da9d5b16960d6dca2562feecdfb81d4439d6ee52bb41c45ac164dc15cc21de1cd541ba14daef775c9f57a1c737b749f
-AUX netpbm-10.66-jbig-2.patch 725 SHA256 defe6bd506c73c48eeb94c7a0dd2a2e471823c44ca6d57d562151ff1188acd4a SHA512 5d7a90c982c67c17b37dc91b7b4668ddcbd67434873cfde86e04bac7d057d6e6cd8ace52c3fc6e0ce36f767333bb00bdfc4fb3f29f54427285214cbd2f41c42f WHIRLPOOL a00fc6a9001db640dda10e2709e03c41be184db886d6b516ed6ab9013dd7c6b37c8e66e4b7630787647419910db871506850c7e524fe182a559dd2412a1473dd
-AUX netpbm-10.66-jpeg-dirs.patch 722 SHA256 8cca55c06fd4f678c069a0ae3e63997a408d54bba9c44150c126d94fd6cce424 SHA512 95a4ab08702faa3d25c75b71329ea28e5eb5f4f0b200d34d7350633e9a999160fe58e8f57fadab30e273c61a06c8d148fdebecbffa5c0b5023c59647f6d4c3ae WHIRLPOOL 877efe30dea24809593bfa214509b69768e443a5f59c6441d94d63e80855e34b6725fbb79658cfb76accdff8acbb6b9a140f99864b82270146fad6e73e754d02
-AUX netpbm-10.66-musl-avoid-stdout-collision.patch 1350 SHA256 105db299ebb57ef78435edcba1dd8055bb54870d31d12aa62c84cf12f110acbe SHA512 e15d35354255dd71de6336fdb8c6a8361062a5f1b79ac29b0d2f3612b56205d26caa678060e348d7c122751814cd77a63c5dfc068b0a65963a5b71eeaf5ac20d WHIRLPOOL 6e894cc260a79eb64712ff5931103b0a12bf9fab8075ab40737f8cae6fa8da98edb6b5196aeffbae40f085871ee1de8f12cbf604830b6b2494e88416fb2b6443
-AUX netpbm-10.66-options-case.patch 3417 SHA256 1d286fc9da28b7cc264b6d227871e3d77f09cfa57fd680972c5147344930ae22 SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23 WHIRLPOOL 6afb3df9509357060879394f3d0c175bdf5db04719280aa5f98b2bb17dee1fb29b70e8594eaa0819cb905b2d00a4b32a61822f48deb60c541942e0e593fdba35
-AUX netpbm-10.66-test.patch 347 SHA256 fb95a101811a6e8b983d6f82130e511658831e6ad2e873fa4632c4049a00bac2 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 WHIRLPOOL 5f59c43abf70d6bc74e6ac6050e25137421f0f3fd5e75e6fb8e77c54f2fc447f26c1a0aeb23ea70dca27bd44b11fdc88fbbd8bcbc1be338acb6f601b9fdcb943
-AUX netpbm-10.66-wordaccess_be_aligned.patch 942 SHA256 3a0c8120c69cd6f6f53dc51ec15944d17486e7d6d7a4cffc5a69fb2b94f863b1 SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 WHIRLPOOL 2288bf481ae97df10b56d89a022b16659dadafdf0c207bc4a5ac501f029d0b4633999691f2849f8f1692be5d9370944e6e1a501dcb082482f0b8bb9cb843ea97
-DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf
-EBUILD netpbm-10.66.00-r99.ebuild 5616 SHA256 88252d075eb2fb1c66157128e4b37180997165601860ae8c9de07a8a05cbbbbe SHA512 00c30b4d91a6da9739a2301c1a123a61a3ab34bf33566a2939eaee7b7e92d8d37e3eee8d96225a3cbe92769f4a405bc5240398a73d2afd3c71f980fbdfbb5090 WHIRLPOOL 1551d93b8ffd3823fd0881425ce8047575864c1abfd3eebfc949e39109ee7c875caf60c199672bb41bfa387ad0cf5eb45fc574ab7a95b580a485cd68ec9d34ea
-MISC metadata.xml 434 SHA256 c4381dbe1764d8ce6fdc2fbc9630eb0d5d769f1fe39847dadbfeb8109dc218b7 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f WHIRLPOOL d41b9d9b4a1d9a438e94bf2e3bbac905f142ca6b718d0020db37af25bdaaaff9899729fb82dd3f266b19ee949b850d521cb8995833201b64607ff49708dd3e6c

diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
deleted file mode 100755
index d391522..0000000
--- a/media-libs/netpbm/files/make-tarball.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/init.d/functions.sh
-
-if [[ $# -eq 0 || $# -gt 2 ]] ; then
-	exec echo "Usage: $0 <version> [netpbm svn root]"
-fi
-
-PN=netpbm
-PV=$1
-P=${PN}-${PV}
-
-SVN_ROOT=${2:-/usr/local/src}
-
-T=/tmp
-
-maint_pkg_create() {
-	local base="/usr/local/src"
-	local srcdir="${base}/netpbm/release_number"
-	local htmldir="${base}/netpbm/userguide"
-	if [[ -d ${srcdir} ]] ; then
-		cd "${T}" || die
-
-		rm -rf ${P}
-
-		ebegin "Exporting ${srcdir}/${PV} to ${P}"
-		svn export -q "${srcdir}/${PV}" ${P}
-		eend $? || return 1
-
-		ebegin "Exporting ${htmldir} to ${P}/userguide"
-		svn export -q "${htmldir}" ${P}/userguide
-		eend $? || return 1
-
-		ebegin "Generating manpages from html"
-		(cd "${P}/userguide" && ../buildtools/makeman *.html)
-		eend $? || return 1
-
-		ebegin "Creating ${P}.tar.xz"
-		tar cf - ${P} | xz > ${P}.tar.xz
-		eend $?
-
-		einfo "Tarball now ready at: ${T}/${P}.tar.xz"
-	else
-		einfo "You need to run:"
-		einfo " cd ${base}"
-		einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
-		die "need svn checkout dir"
-	fi
-}
-maint_pkg_create

diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index cd74474..0000000
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +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'
-
---- 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
-@@ -502,7 +502,7 @@
- 
-     strcpy(outputLine, "");  /* initial value */
-     runtime = FALSE;  /* initial value */
--    quiet = FALSE;   /* initial value */
-+    quiet = TRUE;   /* initial value */
-     error = FALSE;  /* no error yet */
-     for (arg = 1; arg < argc && !error; arg++) {
-         if (strcmp(argv[arg], "-runtime") == 0)

diff --git a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch b/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
deleted file mode 100644
index 63260de..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-punt failing tests; already notified upstream
-
---- a/test/Test-Order
-+++ b/test/Test-Order
-@@ -50,7 +50,6 @@ pamditherbw.test
- pbmclean.test
- pamcut.test
- pnmcat.test
--pamflip.test
- pamenlarge.test
- pnminvert.test
- pamchannel.test
-@@ -70,7 +69,6 @@ ppmmix.test
- 
- # Symmetry test
- 
--symmetry.test
- 
- # Format converter tests
- 
-@@ -87,7 +85,6 @@ ppmdfont.test
- pnm-plain-roundtrip.test
- pnm-pam-roundtrip.test
- pnminvert-roundtrip.test
--pamflip-roundtrip.test
- pamdepth-roundtrip.test
- pad-crop-roundtrip.test
- cut-paste-roundtrip.test

diff --git a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch b/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
deleted file mode 100644
index 285475d..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/513240
-
-the jasper headers are horribly broken and break things like stdbool.h.
-re-order the includes to work around this.
-
---- a/converter/other/jpeg2000/jpeg2ktopam.c
-+++ b/converter/other/jpeg2000/jpeg2ktopam.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include <string.h>
- 
-+#include <jasper/jasper.h>
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
- 
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
- 
- enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
---- a/converter/other/jpeg2000/pamtojpeg2k.c
-+++ b/converter/other/jpeg2000/pamtojpeg2k.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include <string.h>
- 
-+#include <jasper/jasper.h>
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
- 
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
- 
- 

diff --git a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch b/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
deleted file mode 100644
index f7e8cf8..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-fix building w/jbig-2.x
-
---- a/converter/other/jbig/jbigtopnm.c
-+++ b/converter/other/jbig/jbigtopnm.c
-@@ -230,8 +230,12 @@ int main (int argc, char **argv)
-     if (ferror(fin)) 
-         pm_error("Problem while reading input file '%s", fnin);
-     if (result != JBG_EOK && result != JBG_EOK_INTR) 
--        pm_error("Problem with input file '%s': %s\n", 
--                 fnin, jbg_strerror(result, JBG_EN));
-+        pm_error("Problem with input file '%s': %s\n", fnin,
-+#ifdef JBG_EN
-+                 jbg_strerror(result, JBG_EN));
-+#else
-+                 jbg_strerror(result));
-+#endif
-     if (plane >= 0 && jbg_dec_getplanes(&s) <= plane) 
-         pm_error("Image has only %d planes!\n", jbg_dec_getplanes(&s));
- 

diff --git a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch b/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
deleted file mode 100644
index fcf9821..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-use same -I style as converter/other/Makefile so people can disable these
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o
- 
- EXTERN_INCLUDES =
- ifneq ($(JBIGHDR_DIR),NONE)
--  EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+  ifneq ($(JBIGHDR_DIR)x,x)
-+    EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+  endif
- endif
- 
- ifneq ($(JBIGHDR_DIR),NONE)
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -11,7 +11,9 @@ include $(BUILDDIR)/config.mk
- 
- EXTERN_INCLUDES =
- ifneq ($(JASPERHDR_DIR),NONE)
--  EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+  ifneq ($(JASPERHDR_DIR)x,x)
-+    EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+  endif
- endif
- 
- 

diff --git a/media-libs/netpbm/files/netpbm-10.66-musl-avoid-stdout-collision.patch b/media-libs/netpbm/files/netpbm-10.66-musl-avoid-stdout-collision.patch
deleted file mode 100644
index 76deb52..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-musl-avoid-stdout-collision.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur netpbm-10.66.00.orig/converter/other/pstopnm.c netpbm-10.66.00/converter/other/pstopnm.c
---- netpbm-10.66.00.orig/converter/other/pstopnm.c	2014-01-01 15:59:14.000000000 -0500
-+++ netpbm-10.66.00/converter/other/pstopnm.c	2015-07-18 17:52:11.501826392 -0400
-@@ -79,7 +79,7 @@
-     unsigned int ysize;  /* zero means unspecified */
-     unsigned int dpi;    /* zero means unspecified */
-     enum Orientation orientation;
--    unsigned int stdout;
-+    unsigned int stdout1;
-     unsigned int textalphabits;
- };
- 
-@@ -127,7 +127,7 @@
-     OPTENT3(0, "dpi",        OPT_UINT,  &cmdlineP->dpi, &dpiSpec,        0);
-     OPTENT3(0, "portrait",   OPT_FLAG,  NULL, &portraitOpt,             0);
-     OPTENT3(0, "landscape",  OPT_FLAG,  NULL, &landscapeOpt,            0);
--    OPTENT3(0, "stdout",     OPT_FLAG,  NULL, &cmdlineP->stdout,         0);
-+    OPTENT3(0, "stdout",     OPT_FLAG,  NULL, &cmdlineP->stdout1,         0);
-     OPTENT3(0, "textalphabits", OPT_UINT,
-             &cmdlineP->textalphabits,  &textalphabitsSpec, 0);
- 
-@@ -664,7 +664,7 @@
- -----------------------------------------------------------------------------*/
-     const char * retval;  /* malloc'ed */
- 
--    if (cmdline.stdout)
-+    if (cmdline.stdout1)
-         retval = strdup("-");
-     else if (streq(cmdline.inputFileName, "-"))
-         retval = strdup("-");

diff --git a/media-libs/netpbm/files/netpbm-10.66-options-case.patch b/media-libs/netpbm/files/netpbm-10.66-options-case.patch
deleted file mode 100644
index a865bc1..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-options-case.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-r2175 | giraffedata | 2014-04-01 22:28:23 -0400 (Tue, 01 Apr 2014) | 1 line
-
-Fix bug: inconsistent use of upper and lower case Y and N in make file variables.  Make it consistently upper case
-
---- buildtools/configure.pl	(revision 2174)
-+++ buildtools/configure.pl	(revision 2175)
-@@ -835,16 +835,16 @@ sub getLibTypes($$$$$$$$) {
-         my $response = prompt("(y)es or (n)o", $default);
-         
-         if (uc($response) =~ /^(Y|YES)$/)  {
--            $staticlib_too = "y";
-+            $staticlib_too = "Y";
-         } elsif (uc($response) =~ /^(N|NO)$/)  {
--            $staticlib_too = "n";
-+            $staticlib_too = "N";
-         } else {
-             print("'$response' isn't one of the choices.  \n" .
-               "You must choose 'yes' or 'no' (or 'y' or 'n').\n");
-             exit 12;
-         }
-     } else {
--        $staticlib_too = "n";
-+        $staticlib_too = "N";
-     }
-     print("\n");
- 
---- config.mk.in	(revision 2174)
-+++ config.mk.in	(revision 2175)
-@@ -503,7 +503,7 @@ LINUXSVGAHDR_DIR =
- #LINUXSVGALIB = /usr/lib/libvga.so
- #LINUXSVGAHDR_DIR = /usr/include/vgalib
- 
--# If you don't want any network functions, set OMIT_NETWORK to "y".
-+# If you don't want any network functions, set OMIT_NETWORK to "Y".
- # The only thing that requires network functions is the option in
- # ppmtompeg to run it on multiple computers simultaneously.  On some
- # systems network functions don't work or we haven't figured out how to 
-@@ -512,11 +512,11 @@ OMIT_NETWORK =
- #DJGPP/Windows, Tru64:
- #   (there's some minor header problem that prevents network functions from 
- #   building on Tru64 2000.10.06)
--#OMIT_NETWORK = y
-+#OMIT_NETWORK = Y
- 
- # These are -l options to link in the network libraries.  Often, these are
- # built into the standard C library, so this can be null.  This is irrelevant
--# if OMIT_NETWORK is "y".
-+# if OMIT_NETWORK is "Y".
- 
- NETWORKLD = 
- # Solaris, SunOS:
-@@ -602,12 +602,12 @@ NETPBMLIBSUFFIX = so
- # Windows shared library:
- #NETPBMLIBSUFFIX = dll
- 
--#STATICLIB_TOO is "y" to signify that you want a static library built
-+#STATICLIB_TOO is "Y" to signify that you want a static library built
- #and installed in addition to whatever library type you specified by
- #NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
- #STATICLIB_TOO simply has no effect.
--STATICLIB_TOO = y
--#STATICLIB_TOO = n
-+STATICLIB_TOO = Y
-+#STATICLIB_TOO = N
- 
- #STATICLIBSUFFIX is the suffix that static libraries have.  It's
- #meaningless if you aren't building static libraries.
---- GNUmakefile	(revision 2174)
-+++ GNUmakefile	(revision 2175)
-@@ -396,19 +396,19 @@ lib/install.hdr:
- 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \
- 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
- 
--ifeq ($(STATICLIB_TOO),y)
--BUILD_STATIC = y
-+ifeq ($(STATICLIB_TOO),Y)
-+BUILD_STATIC = Y
- else
-   ifeq ($(NETPBMLIBTYPE),unixstatic)
--    BUILD_STATIC = y
-+    BUILD_STATIC = Y
-   else
--    BUILD_STATIC = n
-+    BUILD_STATIC = N
-   endif
- endif
- 
- .PHONY: install.staticlib
- install.staticlib: 
--ifeq ($(BUILD_STATIC),y)
-+ifeq ($(BUILD_STATIC),Y)
- 	$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
- 	SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib 
- endif
---- lib/Makefile	(revision 2174)
-+++ lib/Makefile	(revision 2175)
-@@ -175,7 +175,7 @@ else
-   ifeq ($(STATICLIB_TOO),Y)
-     BUILD_STATICLIB = Y
-   else
--    BUILD_STATICLIB = n
-+    BUILD_STATICLIB = N
-   endif
- endif
- 

diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch
deleted file mode 100644
index 7c80648..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/450530
-
-we disable fiascotopnm all the time, so delete the test too
-
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -387,10 +387,6 @@ for i in $ordinary_testprogs
- 
- 
- 
--# Test fiascotopnm, which has a unique -v flag.
--
--${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null
--    testExitStatus fiascotopnm 2 $?
- 
- 
- 

diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
deleted file mode 100644
index 0da719a..0000000
--- a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/547252
-
-------------------------------------------------------------------------
-r2395 | giraffedata | 2015-01-23 13:51:17 -0500 (Fri, 23 Jan 2015) | 1 line
-
-Fix syntax error
-
-build: fix compile failure in wordint_access_be.h with
-Bigendian target platforms.
-
-Index: trunk/lib/util/wordaccess_be_aligned.h
-===================================================================
---- trunk/lib/util/wordaccess_be_aligned.h	(revision 2394)
-+++ trunk/lib/util/wordaccess_be_aligned.h	(revision 2395)
-@@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) {
- static __inline__ void
- wordintToBytes(wordintBytes * const bytesP,
-                wordint        const wordInt) {
--    uint16_t const hi = ((wordInt >> 48) & 0xFF)
-+    uint16_t const hi = ((wordInt >> 48) & 0xFF);
-     uint16_t const mh = ((wordInt >> 32) & 0xFF);
-     uint16_t const ml = ((wordInt >> 24) & 0xFF);
-     uint16_t const lo = ((wordInt >>  0) & 0xFF);

diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
deleted file mode 100644
index ca3e23b..0000000
--- a/media-libs/netpbm/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<use>
-		<flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">netpbm</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/media-libs/netpbm/netpbm-10.66.00-r99.ebuild b/media-libs/netpbm/netpbm-10.66.00-r99.ebuild
deleted file mode 100644
index 01c5e6a..0000000
--- a/media-libs/netpbm/netpbm-10.66.00-r99.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
-	png? ( >=media-libs/libpng-1.4:0 )
-	rle? ( media-libs/urt )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex"
-
-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 '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-	*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netpbm-10.31-build.patch
-	epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530
-	epatch "${FILESDIR}"/netpbm-10.66-jasper-hack.patch #513240
-	epatch "${FILESDIR}"/netpbm-10.66-options-case.patch
-	epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch
-	epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch
-	epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch
-	epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252
-	epatch "${FILESDIR}"/netpbm-10.66-musl-avoid-stdout-collision.patch
-
-	# make sure we use system urt
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -rf urt
-
-	# avoid mixing the local copy of jbig with the system
-	rm converter/other/jbig/jbig.h || die
-
-	# disable certain tests based on active USE flags
-	local del=(
-		$(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip')
-		$(usex rle '' 'utahrle-roundtrip')
-		$(usex tiff '' 'tiff-roundtrip')
-	)
-	if [[ ${#del[@]} -gt 0 ]] ; then
-		sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
-	fi
-	del=(
-		pnmtofiasco fiascotopnm # We always disable fiasco
-		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
-		$(usex rle '' 'pnmtorle rletopnm')
-		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
-	)
-	if [[ ${#del[@]} -gt 0 ]] ; then
-		sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
-		sed -i '/^$/d' test/all-in-place.ok || die
-	fi
-
-	# take care of the importinc stuff ourselves by only doing it once
-	# at the top level and having all subdirs use that one set #149843
-	sed -i \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		common.mk || die
-	sed -i \
-		-e '/%.c/s: importinc$::' \
-		common.mk lib/Makefile lib/util/Makefile || die
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	BUILD_FIASCO = N
-	SYMLINK = ln -sf
-
-	# These vars let src_test work by default
-	PKGDIR_DEFAULT = ${T}/netpbm
-	RESULTDIR_DEFAULT = ${T}/netpbm-test
-
-	# Toolchain options
-	CC = $(tc-getCC) -Wall
-	LD = \$(CC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	LD_FOR_BUILD = \$(CC_FOR_BUILD)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	LDRELOC = \$(LD) -r
-	LDSHLIB = $(netpbm_ldshlib)
-	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
-	LINKERISCOMPILER = Y
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	STATICLIB_TOO = $(usex static-libs Y N)
-
-	# The var is called SSE, but the code is actually SSE2.
-	WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
-	[ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
-	emake -j1 pm_config.h version.h manual_importinc #149843
-	emake
-}
-
-src_test() {
-	# The code wants to install everything first and then test the result.
-	emake install.{bin,lib}
-	emake check
-}
-
-src_install() {
-	# Subdir make targets like to use `mkdir` all over the place
-	# without any actual dependencies, thus the -j1.
-	emake -j1 package pkgdir="${ED}"/usr
-
-	[[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm "${ED}"/usr/bin/{doc.url,manweb} || die
-	rm -r "${ED}"/usr/man/web || die
-	rm -r "${ED}"/usr/link || die
-	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-	dodir /usr/share
-	mv "${ED}"/usr/man "${ED}"/usr/share/ || die
-	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
-	doman userguide/*.[0-9]
-	use doc && dohtml -r userguide
-	dodoc README
-	cd doc
-	dodoc HISTORY Netpbm.programming USERDOC
-	dohtml -r .
-}