gentoo resync : 05.12.2021

12 files changed, 73 insertions, 726 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 9ca660544dca..c414b4cf1567 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,19 +1,11 @@
 AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb7860d4b306a6553b41f24ed718e94113807f7b8cdfe21774de383baf7799f2a3c3a12acea6f7aedbd4f SHA512 8128d2d8c0fb60d1d3cba73b4b3d87e914a7ac284e5f049cfd0a596f772d705acb3222da2d6a6f7d1882c7221eeaae9daac9d1b855e61881600345dc615cc428
-AUX netpbm-10.31-build.patch 1641 BLAKE2B 2102aa5a41b89beea645842ebaf72d472464c161601673f25d100f030c8058c86a98ae1d402387c7ce09eaa2558d099ab6cc8551fe1f231ea5a7e71b813d84ee SHA512 352b4390c7b622a7509ce370ba03d596bdee9ed19f63ab72990f15cec74eee42e768525aeaff87a160c8edb0034189c0a09a86189f7324675091484652cc1abd
-AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74
-AUX netpbm-10.70-system-libs.patch 1024 BLAKE2B 8fe242dad22030b66613a9c3c3e1c5d0a00589581f68dccf2940b9991a16cf6e1c5deec86562ec696db65e0d1465e7dacf840c6d9220be1bce3505d9dccf96ff SHA512 e25f58186621820612923e50d1342262cc30a790725d31a8ff2a9e8eae8415db600b6601539e1124eb9dcc5fed2f7db9738d6b8effe9e8e118af1f517111eb81
-AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663466e8be04acbf52d30ca1ff50dae40dc24b0714cb50b00667f2d560c7f2ab5c7d457c90e8b31f322ca85498c3ba3d SHA512 db1d0593db6987933d7c937beeac65716866adaa079fb5329f8597b208c7dea9f6dd40b803f9dc4b3ef6cf61189c45dde9e139435b7d8e224bb83e037a7f076b
-AUX netpbm-10.76.00-misc-deps.patch 1677 BLAKE2B 2b54610958755b452bffd186e6bdbac16db9c7b0a0242776798a7cc4b6685c4b0a26bcea7810e392437bba25a8839b5852a84fc3acc2daa50e1a893d7c58d702 SHA512 a632c2eb9afd3fcd4ed7a9467293ad9ac6201296c0910d150f6a1c94121cf0dac9654531fd18c5aec7b412c3fae203a28e62b00cff877629f89e4f995ab730b2
-AUX netpbm-10.76.00-pbmtext-test.patch 711 BLAKE2B 7e1b825bd9735ace1e91c1e705df4843aebbec61d090ec3903e680aac3facba80075ffa518340140657e33cd6c36ae84cd669e9dcddb920d832caed218b6651e SHA512 32be11758652105a6964bca3a9b08c06ed34e2f9ea00370c8d3a961a0ba8b64102120881238fe016d0b0ca4f10882b25f655691bbd75be8ceb700e68a624d5ca
-AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e103d9dbaec0793707988265ecd9f1006e576b094e4a47c9a94de5aa0ac2be00702493d3234364e91e727ac90ca4f61 SHA512 36244194a688d7b3f9ef632ecc3a56ea9aae3e28ad68d4dc5f1a804c19203a76b76fd75c1d999661dea4aa6e529e7200fd195383d8585d129d6df088a0c633b5
 AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629
 AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
-DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
+AUX netpbm-10.86.24-fix-test-ppc64.patch 634 BLAKE2B 41f42436d5f77a37a1e8cb9200cb470d894953f85a3ee3d0b754cb32960f1f60c28d7e2c4ac3578220f7f5f5b4eb68d98b3c0e8e5d5ac7a91a5851859c0ea555 SHA512 5f79bd90ea9ea8d1577a71ba9aebfb24d8c02f845b26b81a9403e411e284f4213af931769dfa367be6c5f4e0453771e480df684a64dedacc858f1e3171a39fd2
 DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
-EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
-EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
-EBUILD netpbm-10.86.24.ebuild 5797 BLAKE2B 58fd9b7100c77de027803c7131b8dc41993596fa1a56cf93f196179f3384ab4eb35b58d0195d10246da9e4190996245882c92440176b053858f4d3088bda831c SHA512 0595cf621ec276e707de81631929303c0953aaaf02dbefb5f0c831157270cc46b7d0bf5287b04d7ec8be807a815b20121c3a436846112991c892b8da489b0d1b
+DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
+EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
+EBUILD netpbm-10.86.27.ebuild 5832 BLAKE2B d7b07a579edfb2ec3a9e7ae760beee17fb21ccf063344bd0b194fdb24177c1ccb6f37594fdde85f3bd922c84961c5fc8e9cd7f79f59b232113ff8c8ebed672f6 SHA512 61a4ffc7241024db2725db4fd6023644e4b626c4bae0b0e5c53a392e59de7f12a7175538291619f203503092124a1b757d298b8d7ca87dc6da470411b47c7552
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
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 281f8ee928f7..000000000000
--- 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'
-
---- a/lib/Makefile
-+++ b/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)
---- a/GNUmakefile
-+++ b/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
---- a/buildtools/libopt.c
-+++ b/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-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch
deleted file mode 100644
index 7c80648bafab..000000000000
--- 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.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
deleted file mode 100644
index efe9fd8dd3c4..000000000000
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-when we disable the bundled libs, make sure we don't try to run install in them
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jbig
- VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
--SUBDIRS = libjbig
-+SUBDIRS =
- 
- include $(BUILDDIR)/config.mk
- 
-@@ -35,6 +35,7 @@ SCRIPTS =
- 
- ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
-   JBIGLIB_DEP = $(JBIGLIB)
-+  SUBDIRS += libjbig
- else
-   # It's not our internal version; user's on his own to make sure it's built
- endif
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jpeg2000
- VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
--SUBDIRS = libjasper
-+SUBDIRS =
- 
- include $(BUILDDIR)/config.mk
- 
-@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)
-   # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
-   # be relative to the current directory.
-   MERGE_OBJECTS += $(JASPERLIB)
-+  SUBDIRS += libjasper
- endif
- MERGEBINARIES = $(BINARIES)
- 
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da5446719..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-
---- a/lib/Makefile
-+++ b/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)
---- a/GNUmakefile
-+++ b/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
- 
- # Parallel make (make --jobs) is not smart enough to coordinate builds
- # between submakes, so a naive parallel make would cause certain
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index bd894bfb3159..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
- 
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
- 
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
- 
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
- include $(BUILDDIR)/config.mk
- 
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
- 
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
-     XML2_CFLAGS=$(shell xml2-config --cflags)
-   endif
- endif
-+endif
- 
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
-   endif
- endif
- 
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
- 
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
-     endif
-   endif
- endif
-+endif
- 
- ifneq ($(JPEGLIB),NONE)
-   ifneq ($(JPEGHDR_DIR)x,x)
---- a/other/pamx/Makefile
-+++ b/other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
- 
- EXTERN_INCLUDE =
- 
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
-   # Pkg-config has never heard of X11, or doesn't even exist
- 
-@@ -23,6 +24,7 @@ else
-   X11LIB = $(shell pkg-config x11 --libs)
-   EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
- 
- ifeq ($(HAVE_X11LIB),Y)
-   PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index 717c86a72ac5..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates.  force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- a/test/pbmtext.test
-+++ b/test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
- 
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
-              for (i=160;i<=255;++i) printf("%c",i); }' | \
-     pbmtext -builtin bdf | cksum
- 
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
-              for (i=160;i<=255;++i) printf("%c\n",i); }' | \
-     pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 8bb1b17e15fa..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
- 
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+	BUILDDIR=$(BUILDDIR) \
-+	RGBDEF=$(RGBDEF) \
-+	BUILD_FIASCO=$(BUILD_FIASCO) \
-+	JASPERLIB="$(JASPERLIB)" \
-+	JBIGLIB="$(JBIGLIB)" \
-+	JPEGLIB="$(JPEGLIB)" \
-+	PNGLIB="$(PNGLIB)" \
-+	TIFFLIB="$(TIFFLIB)" \
-+	URTLIB="$(URTLIB)" \
-+	X11LIB="$(X11LIB)" \
-+	XML2_LIBS="$(XML2_LIBS)" \
-+	ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
- 
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
- 
- check-tree: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=tree \
--	  PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+	  PBM_TEST_PATH=$(PBM_TEST_PATH) \
- 	  LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
- 
- check-package: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=package \
--	  PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+	  PBM_TEST_PATH=$(PBM_TEST_PATH) \
- 	  LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- 
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=install \
--	  BUILDDIR=$(BUILDDIR) \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- 
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
-   zeisstopnm \
- "
- 
-+enabled_testprog() {
-+    case $1 in
-+      fiascotopnm|\
-+      pnmtofiasco)
-+        [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+      jpeg2ktopam|\
-+      pamtojpeg2k)
-+        [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+      jbigtopnm|\
-+      pnmtojbig)
-+        [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+      jpegtopnm|\
-+      pnmtojpeg|\
-+      ppmtojpeg)
-+        [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamtopng|\
-+      pngtopam|\
-+      pnmtopng)
-+        [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+      svgtopam)
-+        [ "${PNGLIB}" = "NONE" ] && return 1
-+        [ "${XML2_LIBS}" = "NONE" ] && return 1
-+        ;;
-+
-+      pamtotiff|\
-+      pnmtotiffcmyk|\
-+      tifftopnm)
-+        [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+      pnmtorle|\
-+      rletopnm)
-+        [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamx)
-+        [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+    esac
-+
-+    return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
- 
- for i in $ordinary_testprogs
-   do
-+    # Stub out programs that aren't built.
-+    if ! enabled_testprog "$i"; then
-+      echo "$i: ok"
-+      continue
-+    fi
-+
-     $i --version  2>&1 | \
-     egrep -v -e fiascotopnm -e \
-     "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/fiasco-roundtrip.test
-+++ b/test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
- 
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+  exit 80
-+fi
-+
- # Should print 215556145 102615
- 
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- a/test/jbig-roundtrip.test
-+++ b/test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
- 
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- # Test 1.  Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- a/test/legacy-names.test
-+++ b/test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
-   ppmtouil \
- "
- 
-+enabled_testprog() {
-+    case $1 in
-+      ppmtojpeg)
-+        [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamrgbatopng|\
-+      pngtopnm)
-+        [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pnmtotiff)
-+        [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+    esac
-+
-+    return 0
-+}
-+
- for i in $ordinary_testprogs
-   do
-+    # Stub out programs that aren't built.
-+    if ! enabled_testprog "$i"; then
-+      echo "$i: ok"
-+      continue
-+    fi
-+
-     $i --version  2>&1 | \
-     egrep -v \
-     "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/png-roundtrip.test
-+++ b/test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
- 
-+if [ "${PNGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- # Test 1.  Should print 1926073387 101484 18 times
- for flags in "" -interlace \
-   -gamma=.45 \
---- a/test/png-roundtrip2.test
-+++ b/test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
- 
-+if [ "${PNGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- # Test 1.  Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
-   do
---- a/test/ps-roundtrip.test
-+++ b/test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
- 
-+if [ "${ZLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
- 
- # pstopnm does not use libnetpbm functions for output.
---- a/test/tiff-roundtrip.test
-+++ b/test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
- 
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- a/test/utahrle-roundtrip.test
-+++ b/test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
- 
-+if [ "${URTLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- #Test 1.  Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \
diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
new file mode 100644
index 000000000000..e1b558d59117
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
@@ -0,0 +1,22 @@
+char is unsigned by default on ppc64
+
+--- a/converter/other/pnmtopalm/palmtopnm.c
++++ b/converter/other/pnmtopalm/palmtopnm.c
+@@ -823,7 +823,7 @@
+     unsigned int j;
+ 
+     for (j = 0;  j < bytesPerRow; ) {
+-        char incount;
++        signed char incount;
+         pm_readchar(ifP, &incount);
+         if (incount < 0) {
+             /* How do we handle incount == -128 ? */
+@@ -865,7 +865,7 @@
+     unsigned int j;
+ 
+     for (j = 0;  j < bytesPerRow; ) {
+-        char incount;
++        signed char incount;
+         pm_readchar(ifP, &incount);
+         if (incount < 0) {
+             /* How do we handle incount == -128 ? */
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
deleted file mode 100644
index 595ad00ef034..000000000000
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-BDEPEND="app-arch/xz-utils
-	sys-devel/flex"
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	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}"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.31-build.patch
-	"${FILESDIR}"/netpbm-10.66-test.patch #450530
-	"${FILESDIR}"/netpbm-10.70-system-libs.patch
-)
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo "${suffix//\.}" || die
-}
-
-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 || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# make sure we use system libs
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || 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 jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
-		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		jpeg2ktopam pamtojpeg2k # jasper has been removed
-		$(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 = NONE
-	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
-
-	if [[ $(get_libdir) != "lib" ]] ; then
-		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	# 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]
-	dodoc README
-
-	cd doc || die
-	dodoc HISTORY Netpbm.programming USERDOC
-
-	docinto html
-	dodoc -r *.html
-	use doc && dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
index b27af756a539..bef703001a86 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
@@ -1,41 +1,51 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib toolchain-funcs
 
 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"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+# zlib USE flag is no longer used, enabled by default.
+# cannot remove it yet because of #801445
 
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/flex
 	virtual/pkgconfig
 "
-RDEPEND="jbig? ( media-libs/jbigkit )
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+RDEPEND="jbig? ( media-libs/jbigkit:= )
 	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	postscript? ( app-text/ghostscript-gpl )
-	rle? ( media-libs/urt )
+	png? (
+		>=media-libs/libpng-1.4:0=
+		sys-libs/zlib
+	)
+	postscript? (
+		app-text/ghostscript-gpl
+		sys-libs/zlib
+	)
+	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}"
 
 PATCHES=(
-	"${FILESDIR}"/netpbm-10.76.00-build.patch
-	"${FILESDIR}"/netpbm-10.76.00-test.patch #450530
-	"${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
-	"${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
+	"${FILESDIR}"/netpbm-10.86.21-build.patch
+	"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+	"${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
 )
 
 netpbm_libtype() {
@@ -57,8 +67,8 @@ netpbm_ldshlib() {
 	esac
 }
 netpbm_config() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
+	if use ${1} ; then
+		[[ ${2} != "!" ]] && echo -l${2:-$1}
 	else
 		echo NONE
 	fi
@@ -92,15 +102,32 @@ src_prepare() {
 		sed -i -r \
 			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
 			test/all-in-place.{ok,test} || die
+		sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
 		sed -i -e '/^$/d' test/all-in-place.ok || die
-		sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die
+		sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
 	fi
 
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+	# the new postscript test needs +x
+	chmod +x test/lps-roundtrip.test
+
+	# Do not test png if not built
+	if ! use png ; then
+		sed -i -r \
+			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i -e '/^$/d' test/all-in-place.ok || die
+
+		sed -i -r \
+			-e 's:(pamrgbatopng|pngtopnm).*::' \
+			test/legacy-names.{ok,test} || die
+		sed -i -e '/^$/d' test/legacy-names.ok || die
+		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
+	fi
 }
 
 src_configure() {
+	# cannot chain the die with the heredoc
+	# repoman tries to parse the heredoc and fails
 	cat config.mk.in - >> config.mk <<-EOF
 	# Misc crap
 	BUILD_FIASCO = N
@@ -140,7 +167,7 @@ src_configure() {
 	TIFFLIB_NEEDS_Z = N
 	JPEGLIB = $(netpbm_config jpeg)
 	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
+	ZLIB = -lz
 	LINUXSVGALIB = $(netpbm_config svga vga)
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
@@ -152,8 +179,6 @@ src_configure() {
 	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"
 }
 
@@ -178,13 +203,9 @@ src_install() {
 	fi
 
 	# 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]
diff --git a/media-libs/netpbm/netpbm-10.86.24.ebuild b/media-libs/netpbm/netpbm-10.86.27.ebuild
index 70bebdd0051e..a4bc1a21670d 100644
--- a/media-libs/netpbm/netpbm-10.86.24.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 # zlib USE flag is no longer used, enabled by default.
 # cannot remove it yet because of #801445
@@ -166,7 +166,7 @@ src_configure() {
 	TIFFLIB_NEEDS_Z = N
 	JPEGLIB = $(netpbm_config jpeg)
 	PNGLIB = $(netpbm_config png)
-	ZLIB = -lz
+	ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
 	LINUXSVGALIB = $(netpbm_config svga vga)
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)