9 files changed, 14 insertions, 276 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index aacdc3bf7e91..bd81d26ada98 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 42b09e38ad42..50de8b6184b3 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -7,8 +7,8 @@ DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f69
 DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f
 DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
 DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384
-EBUILD libjxl-0.10.2.ebuild 2727 BLAKE2B 6839145ed9ad8b6715e545bf0e0cd9cc82cc473fc79ce2574b34d67e55a1a00467f300b511dd62b80ad8b206880cb1538a8261b6a819b9a0b78cd5c6499cc522 SHA512 956f1129b19342f2ac4c14a9e1fbacb6d5b96fbaecec55ea8e4aff0e87ff8a2047dcf50605ab05c97f984dbf3d00388932594e3c4ad1a658d8781df049c56c36
-EBUILD libjxl-0.8.2-r1.ebuild 2344 BLAKE2B 03a98939e6e207382611325cc1c8d18ad3ad09e8e6e04c7d8406453597997a59c2bfccbc05ad3ce0ba05328ca1e55a6f0bc6ddc14b0a6398bea53a4c10e0bad1 SHA512 0b8b2a49976c2551532a6b2749be8de9107deee342d34cab1a1a4ed2ff252eb45b59534c2d278cf082df520db7c675155e1bb7f3d4e5dac40b1dace41f280ef1
-EBUILD libjxl-0.9.2.ebuild 2789 BLAKE2B d645dc938798bd319541e80f73e4da59f585b3fe53afacedcd55c21305420fba45baf9133b30f9f66980014c2ee3c3b076e5e359255c65dda5b6dc216d96bfcf SHA512 6098199eefa073acf31eb0d904a24ffbce5f3251b6f2c7b0c0fa46a30f0f04ae9fc212a12c985a73b68642e924f917fe245c5726c75d6f6e7fe222c63f21b0f0
+EBUILD libjxl-0.10.2.ebuild 2722 BLAKE2B 628d35e59657616b49b5ab54308c3d8600bc18c135cf9c464055ba739239cc67e079693251f5da9c0f0f509f4d88bcd95b47c1472549fb8ed0bc6964424336aa SHA512 9b78395438c0116b286b8f56996cfce92845186f23d644621008de619fe9c87c6554a9749b5b121a2e226ae68b087c05dcb1a0ffc663131cf5ee151696bc222d
+EBUILD libjxl-0.8.2-r1.ebuild 2339 BLAKE2B 5e919bdd10fe20de0b45122a7ed2f037ef3e54c4c17a385bdc930288c8b9ccbabf0de82bedfe8510999ea8085d37981764243662fccd872f29ba19ac14d9c407 SHA512 f9227486972af086b08140bd81bd02cb3f303792f168fb05ef9dc5c743c6ad576da3f2a5616b31aeefdaa77d1c7fef6a04da0fdd36648ad7361aaaee2ce7f603
+EBUILD libjxl-0.9.2.ebuild 2784 BLAKE2B bb08ef63e10bcc07381fac168baa3b596f93e91c3d648b89f2a7ec0296b1bb4713fa91459faab76a08f89fe77cb23051131f19b3dcf1d6be3843b41ad6f8f271 SHA512 aeeca7ebde32c21a18e07d0b8e3c54fbdaa13b53d1c9eb642f53d34a56fd7b206d519c8f617d78fc691ffcd69745282577c589df3bef8af0692e9ef3346c2c06
 EBUILD libjxl-9999.ebuild 2417 BLAKE2B 65ce5cf9c5b1f2834b4fe15af97040309f50059fb06ee3ae7a7123a0c84069a9a2a03b5c9c215333b78b5dd73e79e2c01ff0ee52c1cf1ea6053b359e53948c4a SHA512 8265b56e188587d2d6eb0114de4c08979168fa57125e27acb50febdf907e8d1c3956d01b1e58c732369725665418e0e2ae3152538f5c78b35b02d0644a9e33d3
 MISC metadata.xml 864 BLAKE2B 04139ce686fbc36068182d03fc23f0a0d49262f8c6b21a690705411330c3b5ec4f969d0ed27fc712fc184736bb20e9bfa3a6fe2fe6d5db98527334151dc0a8d6 SHA512 73e89d636908712608a41f8c4b7f29fc9d551030cebcd83e8db722869aaff0bc96c1ad6c05c5dbe3a2b2b29b8c639c95d02a8d4ed7094a9200af7f008c9b20de
diff --git a/media-libs/libjxl/libjxl-0.10.2.ebuild b/media-libs/libjxl/libjxl-0.10.2.ebuild
index 1a77dd6b4d0f..27f9a5132637 100644
--- a/media-libs/libjxl/libjxl-0.10.2.ebuild
+++ b/media-libs/libjxl/libjxl-0.10.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="+gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild b/media-libs/libjxl/libjxl-0.8.2-r1.ebuild
index a58a4068b463..64b13ee3f527 100644
--- a/media-libs/libjxl/libjxl-0.8.2-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.8.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="openexr test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libjxl/libjxl-0.9.2.ebuild b/media-libs/libjxl/libjxl-0.9.2.ebuild
index 9f34c8740745..566d2cf5113b 100644
--- a/media-libs/libjxl/libjxl-0.9.2.ebuild
+++ b/media-libs/libjxl/libjxl-0.9.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="+gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 86358b0a7f14..eeda41d9b680 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -5,11 +5,9 @@ AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37
 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68
 AUX netpbm-11.5.2-fix-tests-musl.patch 4779 BLAKE2B 049b20cecdaf40e77c37ad01cfe4e17b8006c3788f47971319e553bfbab760e7e0bb3a970060e74860a7c3326945f5505680519efe7c2feee5fa6ee08ba45202 SHA512 260f4282dcfd6dd0922b62e4c3f217e33d159ab2df779ec0c1df27f16c8075fb77927ce2aadd34c20475d38b7482506758e38b7571df7c3d5a92de9c5cc496d6
 DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
-DIST netpbm-11.2.8.tar.xz 3781396 BLAKE2B cb74b79b61a88d739071ab85e0ca96a0e51140e9398aba4bd1a8c918b26580acb81b4653863127676ee1d032251e8e9968500fe5fee72a4cf65c5e5064f55fb1 SHA512 8bfd0f08ae62515be18f0b6b8ef610dc72dda2dd063d2732096f540cbadb27314d2ea20b1a79ed5ea9442a9f8cee10f445f16caaef1227b486e16a4ebf8412f1
-DIST netpbm-11.5.3.tar.xz 3783400 BLAKE2B 45a0169865922dcdd2cba0d91e347aa753153e7a9496c8469ac40039628dc3bf13adbf67f30e6af929f4bb582c09769eac579f7086ee78fa206b564b736492c9 SHA512 f7e58fa086e6f549bb350ca9592ad5df2cdacd80c8cb0f508ab17b5f85c9358df56306d293e5b88bdcb3d2b350731bd7def0098437fdfea2711921b1caa95b95
-DIST netpbm-11.6.0.tar.xz 3792264 BLAKE2B 482e27df7aca081851b5e87cbd2e54d851c73922553a570223c22b4074178caef2e3018c8c2bab8a301bc35a645ea6ce8ac3bb7eb1001c0ca977f53182e0e19f SHA512 911912b0d6b9817ffdf3b9183c51305bc5418497865cd48cb7fad8bc5212e7092df7b2c0714b05f7459123f6ff10bcd128ffabcf2343c503e430d04aff1a837f
+DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
+DIST netpbm-11.6.1.tar.xz 3792940 BLAKE2B e48ec658708baac53708c96feb7aac94c32debae675d8f9114393aaccabc1f59309bf577bff98d252fecab37fb0faa1cc29955269636f736563a859edbdd947d SHA512 844256dc61d29c4f1ba164d5c1ec0b7c6cb8e97c4c6c04cf7b92cd7c118b99994cf7dda4a256f35ef575cb718a7a7f253468b60ba567733a613da8102d23bebf
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.2.8.ebuild 7068 BLAKE2B 13319efacfa64a5e9b306efbdafaaf1ca31580d21e17f2e72eaa3f1df6a1cb0aeef4bc6a9fb9b82d115588dab51ee295f8ad8e453a6bede6ef2c6c6d39068115 SHA512 8dc9ce4a4d64b84b2c3a752fe2ba6fafc5d64219be23f1b9703d76ccc9e0ade030539d7c1108779d79f9e17ebaeaf8893f3fae02032234f8639e5bbbb097e334
-EBUILD netpbm-11.5.3.ebuild 6984 BLAKE2B 23d8dc85e12a8a41f0f485b3eb308714185bbaa48c9016f238a3b4341f243114e7c6398361e21083fcdd42327fe83827c5c72b4941a9d802a9800d8e05f15f29 SHA512 8eb6062eeb78bd2edf00eb8d2b6fc3f1515115e1baf43e517184390384caa318a83a30b84d77c9fb2f66e62acfdd12bbe60c9cd254da2962048cb1b3f434dbb7
-EBUILD netpbm-11.6.0.ebuild 6934 BLAKE2B da524853140b4a2c3968904f607968a9db572a30f50e7b33da7a56e0154a9d49c58faf42e4e6988cdeb40e5ba754cd6fc2166d690bae66587e97cca99aa92635 SHA512 86461347264f11c113c216629ab11a3e662ee182d9f821ee4ce8f2a2705ddd9ffae7541107e9ec4d1358cc8496799259797a71418376221a4002010704ae97a7
+EBUILD netpbm-11.2.9.ebuild 7056 BLAKE2B 98516177afd25c82919639f5d31dcd5c98201b10c4084c606c0d2c2b2b2dee5de7c6dbc4edb5585f2fce74cb0464a01a889937a63c4e2d49122253becce4877b SHA512 a17e4559de67e1d479748eaa3f783deaec6af76e1f8b8929d4d21a5075655fcbdfe4cc82dbab47ae16841bb1ba709147f1a083cf50534c363f8fe8d44521fba4
+EBUILD netpbm-11.6.1.ebuild 6922 BLAKE2B bcceeb28fbb881a7c71ee1794b0f190cc14881b78f7345f315d099c496172d72f5a0ff5ffbe061118bbb0e9ccffcb25421b0c0ddd46edf3b74915d416528d805 SHA512 4dd64564ded09bdd30e106ac194de5a62bfb8a3356ce5be08dbd7685cf4cc3ce8dc85d706782579477c98986d5337f98c4593cb98cd78e336102d22cc3956747
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.8.ebuild b/media-libs/netpbm/netpbm-11.2.9.ebuild
index 72ada702ad14..ed27be399d6c 100644
--- a/media-libs/netpbm/netpbm-11.2.8.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.9.ebuild
@@ -7,8 +7,8 @@ inherit flag-o-matic multilib toolchain-funcs
 
 # Upstream has 3 flavors of netpbm: super stable, stable and advanced.
 # They only provide a tarball for super stable, but super stable is a bit lagging.
-# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]"
-# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]".
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced".
 # The stable branch is stabilized according to usual Gentoo rules, while the
 # advanced branch will not be stabilized.
 # A detailed explanation is here https://netpbm.sourceforge.net/release.html
diff --git a/media-libs/netpbm/netpbm-11.5.3.ebuild b/media-libs/netpbm/netpbm-11.5.3.ebuild
deleted file mode 100644
index 1870cbbec2ed..000000000000
--- a/media-libs/netpbm/netpbm-11.5.3.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
-# They only provide a tarball for super stable, but super stable is a bit lagging.
-# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]"
-# and the advanced branch of their svn (currently versions 11.4.yy) on SLOT "0/advanced[.rev]".
-# The stable branch is stabilized according to usual Gentoo rules, while the
-# advanced branch will not be stabilized.
-# A detailed explanation is here https://netpbm.sourceforge.net/release.html
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="https://netpbm.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
-
-LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
-SLOT="0/advanced"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
-
-# app-text/ghostscript-gpl is really needed for postscript
-# some utilities execute /usr/bin/gs
-# some installed programs are perl scripts
-RDEPEND="
-	dev-lang/perl
-	jbig? ( media-libs/jbigkit:= )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
-	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:= )
-	xml? ( dev-libs/libxml2 )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-arch/xz-utils
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.86.21-build.patch
-	"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
-	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
-	"${FILESDIR}"/netpbm-11.5.2-fix-tests-musl.patch
-)
-
-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_lib() {
-	usex ${1} -l${2:-$1} NONE
-}
-
-# for bug #828127
-netpbm_cflags_for_build() {
-	if is-flagq -fPIC; then
-		echo -fPIC
-	fi
-}
-
-src_prepare() {
-	default
-
-	# make sure we use system libs
-	sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die
-	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
-	# 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 \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		-i common.mk || die
-	sed \
-		-e '/%.c/s: importinc$::' \
-		-i common.mk lib/Makefile lib/util/Makefile || die
-	sed \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		-i GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
-	# The postscript knob is currently bound up with a fork test.
-	if ! use postscript ; then
-		sed \
-			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
-			-i converter/other/Makefile generator/Makefile || die
-		sed -r \
-			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
-			-i test/all-in-place.{ok,test} || die
-		sed \
-			-e 's:lps-roundtrip.*::' \
-			-e 's:pbmtextps-dump.*::' \
-			-e 's:pbmtextps.*::' \
-			-i test/Test-Order || die
-		sed \
-			-e '/^$/d' \
-			-i test/all-in-place.ok || die
-		sed \
-			'2iexit 80' \
-			-i test/ps-{alt-,flate-,}roundtrip.test || die
-	fi
-
-	# the new postscript test needs +x
-	chmod +x test/lps-roundtrip.test || die
-
-	# Do not test png if not built
-	if ! use png ; then
-		sed -E \
-			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
-			-i test/all-in-place.{ok,test} || die
-		sed \
-			-e '/^$/d' \
-			-i test/all-in-place.ok || die
-
-		sed -E \
-			-e 's:(pamrgbatopng|pngtopnm).*::' \
-			-i test/legacy-names.{ok,test} || die
-		sed \
-			-e '/^$/d' \
-			-i test/legacy-names.ok || die
-		sed \
-			-e 's:png-roundtrip.*::' \
-			-e 's:winicon-roundtrip.*::' \
-			-i test/Test-Order || die
-	fi
-
-	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
-	# pbmtext-utf8 requires locale, not available on musl
-	# ppmpat-random and pnmindex are broken on musl
-	# bug #907295
-	if use elibc_musl; then
-		sed \
-			-e 's:pbmtext-iso88591.*::' \
-			-e 's:pbmtext-utf8.*::' \
-			-e 's:ppmpat-random.*::' \
-			-e 's:pnmindex.*::' \
-			-i test/Test-Order || die
-	fi
-}
-
-src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed"
-		# Misc stuff
-		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)
-		PKG_CONFIG = $(tc-getPKG_CONFIG)
-
-		STRIPFLAG =
-		CFLAGS_SHLIB = -fPIC
-		CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
-
-		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_lib tiff)
-		# Let tiff worry about its own dependencies #395753
-		TIFFLIB_NEEDS_JPEG = N
-		TIFFLIB_NEEDS_Z = N
-		JPEGLIB = $(netpbm_config_lib jpeg)
-		PNGLIB = $(netpbm_config_lib png)
-		ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
-		LINUXSVGALIB = $(netpbm_config_lib svga vga)
-		XML2_LIBS = $(netpbm_config_lib xml xml2)
-		JBIGLIB = $(netpbm_config_lib jbig)
-		JBIGHDR_DIR =
-		JASPERLIB = NONE
-		JASPERHDR_DIR =
-		URTLIB = $(netpbm_config_lib rle)
-		URTHDR_DIR =
-		X11LIB = $(netpbm_config_lib X X11)
-		X11HDR_DIR =
-	EOF
-}
-
-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,data}
-	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/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
-	dodir /usr/share
-	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
-	doman userguide/*.[0-9]
-	dodoc README
-
-	cd doc || die
-	dodoc HISTORY USERDOC
-	docinto html
-	dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-11.6.0.ebuild b/media-libs/netpbm/netpbm-11.6.1.ebuild
index 80e083e89bc2..56896f092bd3 100644
--- a/media-libs/netpbm/netpbm-11.6.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.6.1.ebuild
@@ -7,8 +7,8 @@ inherit flag-o-matic multilib toolchain-funcs
 
 # Upstream has 3 flavors of netpbm: super stable, stable and advanced.
 # They only provide a tarball for super stable, but super stable is a bit lagging.
-# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]"
-# and the advanced branch of their svn (currently versions 11.4.yy) on SLOT "0/advanced[.rev]".
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.6.yy) on SLOT "0/advanced".
 # The stable branch is stabilized according to usual Gentoo rules, while the
 # advanced branch will not be stabilized.
 # A detailed explanation is here https://netpbm.sourceforge.net/release.html