gentoo auto-resync : 17:01:2024 - 08:06:37

9 files changed, 73 insertions, 266 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8235d057ce98..2843dd4e1d27 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 4518bb6675fd..2d9f81dbf67e 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -11,5 +11,5 @@ EBUILD libpulse-16.1-r2.ebuild 5882 BLAKE2B 82a1b54af068c843e675d0c1e1caae6b658a
 EBUILD libpulse-16.1-r4.ebuild 6469 BLAKE2B 2b1be94822fb82f06d6bbc5c4dc3a5031444f66a9ee9b1dc19a427f672e84d156bcdc547aec7384eaab35d3206b63919608399cf70ccd34e918084ccc4abea41 SHA512 a4442c8c838a8d8c3a13a25dd7765c0299d8952b5af56b5c46ebd9c0589e157925ec85c63ba509dc2ab4fad488329949de76fa300eb7cf78562ad5a9e71d670a
 EBUILD libpulse-16.1-r5.ebuild 6252 BLAKE2B 7aa539bc2db1ce828946a4ce92c3420ebd7b8ad4caa17e2364c878b9822473986f44ca5dfedd6d62b98ab780ab3085d26ddca99df53c464f09f04cb2f875f9f2 SHA512 9d99f50cc467148b05ccf0ae8566209be71ad5fd8d841cd67adb600cfb21131e55ae42cf80570c5514ea50b1929481986c9313fb43d4a7a7b9a82965162f27e5
 EBUILD libpulse-16.99.1-r1.ebuild 5939 BLAKE2B 6015e5cdd36382c088b5ec3494ce10d4a00225bea7352a27dd91b6239ff6480405fda646fca640b9106da9eb56c2989bc5ea496fbaaa1ce086a244629250b64d SHA512 7f7ee2fda432abf2c9734fb9896d9122f1e1dc68eb8dbe8b48b61a1aa81592bc4194e68bf21af1874ec53d28a7ee8c9abd804ba43988c766fce0e17fec729a03
-EBUILD libpulse-16.99.1.ebuild 6156 BLAKE2B f38b1bac19ebb80b3844d916c0ca345e38f28e27d495faf3e0b13ff142fe37158e56f496dbe340b4bde77b875eb2bb59fe5c1b616db105d249029d0840eae469 SHA512 df4481fda001573e7fcf7aca6e446bcd0efde875f5a55e990c78e32de0484d15c1393f73d35f981ec79f3214cc20bda1efe3fc2ce1ab0ba9b7de74fb828dcb4f
+EBUILD libpulse-16.99.1.ebuild 6155 BLAKE2B a95f58b26a3b6034224b7b73358bcc2afd3d95edccccfef2d98f1ba05a19eadb1936979983a7749af456efa15246405b227154954b95022b679466fc360ff2d7 SHA512 f8e9b03cdab5532bb3b0373520d9fdbf832ae71b298c8482bab6395ae97996cc9a9bc7292ecee0cd3b55bbcc769fb35412d0796a9421b7e1fdd9af66937c0bce
 MISC metadata.xml 961 BLAKE2B 0aea6824645ccb54d4da477c5f65728abe5100176c5bb05f30c30704b0209f83dccda23380de7231a5fc0a5ffb31650c96d024b4d0511ced9806fc5652f51f9f SHA512 408206d9da60312898a87c2b400292178bd20b57b7a17b74e768c154ec3fc95f9ec9412ba497a03b32558e8ffaa21e8a50b0478c8908930f90ecd9b6aa81548e
diff --git a/media-libs/libpulse/libpulse-16.99.1.ebuild b/media-libs/libpulse/libpulse-16.99.1.ebuild
index fc6316848187..0791f026e87a 100644
--- a/media-libs/libpulse/libpulse-16.99.1.ebuild
+++ b/media-libs/libpulse/libpulse-16.99.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index 932bf423a18c..b953fbebf69d 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,4 +1,5 @@
+AUX clang-17-version-script-check-fix.patch 2112 BLAKE2B 7be78047996e71ae144b160a0f860d5e0559a927a172962595a3a8b14c9b4af13e87ef515c7e749fe225e1ceb74077d660628853ce0b01001a599fec326e5f78 SHA512 29b202a999d1342574eb40b5d1259b5db857de4a4e8929c0ca02ead0707546063b95c28d67bcb3ee94174340760d5b0aab189653e2bbad45b93b6793588053d4
 DIST libva-2.20.0.tar.gz 280079 BLAKE2B bb1b7f8757d068765fa69e57e8747e0bbd61ea0874bd42d27e0a99786cad2a4a81d7c20a28ff977cebcef54cd8cafa6c0493c18b563ad1ab47a9c3190d0cd1c6 SHA512 85f4aa6b6e9173d407ca3987745f985d0f898091f14c947a928b6db662a03b5cfe82483901690d81618697fe17a2c41ff6694a611f3654d5ab06840da987e40d
-EBUILD libva-2.20.0.ebuild 1572 BLAKE2B f82ca4f628107ec9df521da5a1c491190e5306e0ec88e039d8a4a865533e1cb82c9884921b2c08bb3e8c7414f69df088aeec1c2bada90f448b9b91578e859061 SHA512 e7ee23f8f730ce4becac3b8bcbcb7a5d9abc125ba323def3a8afa4b0b546f4d39e2fae9f47aebcab0693e86a44923e2bd53c065b6179c17c569c38489eedcb58
+EBUILD libva-2.20.0.ebuild 1640 BLAKE2B c54dad2a9bec5c1e8982d355c59aa9204af5d2212cbd92e3aeac5a4908ef1a715d97d3f44c3f3b4532d8a0433c0287817021b05ee993dc02eced1fe7858e3e79 SHA512 6c52e382deebfc7b7efb621f065b49c1380f93316e0b48bde9d9b9c388ca989bbf55e9d9843dcda2cf7bd8a6c299d5d738e7c09e2a5319d198a859676176ffdd
 EBUILD libva-9999.ebuild 1544 BLAKE2B 3b5b3112bafca3f8e6efdf15f214135cb7e8d4ebc0a64040bcd6ab39a4f40fbd4df03af84101f25280780768512706a25568361187c9c3684332211b36b54a8f SHA512 cbb0614ff00b592a4ca71561acab24d5c1053bab5ed7a8c75353a0b1e3182c589035019536254dd44bc2377b841bd77fb2fcd45d2e9dbe4e7951e8cc5c4740f7
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/files/clang-17-version-script-check-fix.patch b/media-libs/libva/files/clang-17-version-script-check-fix.patch
new file mode 100644
index 000000000000..670b8c80a881
--- /dev/null
+++ b/media-libs/libva/files/clang-17-version-script-check-fix.patch
@@ -0,0 +1,62 @@
+Upstream URL: https://github.com/intel/libva/pull/732
+From 17e07d17ba723a6b5822390afacdd3ccd976ecd2 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sun, 1 Oct 2023 16:34:19 -0400
+Subject: [PATCH] va: Fix -Wl,--version-script check with LLD 17
+
+LLD 17 uses --no-undefined-version by default, so the check currently
+fails due to vaCreateSurface being undefined. This commit replaces that
+check with a generic check in the top level meson.build, using the
+conftest.syms file.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+---
+ conftest.syms  | 6 ++++++
+ meson.build    | 6 ++++++
+ va/meson.build | 2 +-
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+ create mode 100644 conftest.syms
+
+diff --git a/conftest.syms b/conftest.syms
+new file mode 100644
+index 000000000..7d8590ff3
+--- /dev/null
++++ b/conftest.syms
+@@ -0,0 +1,6 @@
++VERSION_1 {
++    global:
++        main;
++    local:
++        *;
++};
+diff --git a/meson.build b/meson.build
+index 6acf90676..b37a85119 100644
+--- a/meson.build
++++ b/meson.build
+@@ -87,6 +87,12 @@ dl_dep = cc.find_library('dl', required : false)
+ WITH_DRM = not get_option('disable_drm') and (host_machine.system() != 'windows')
+ libdrm_dep = dependency('libdrm', version : '>= 2.4.60', required : (host_machine.system() != 'windows'))
+ 
++ld_supports_version_script = cc.links(
++  'int main() { return 0; }',
++  name : '-Wl,--version-script',
++  args : ['-shared', '-Wl,--version-script,' + '@0@/@1@'.format(meson.current_source_dir(), 'conftest.syms')]
++)
++
+ WITH_X11 = false
+ if get_option('with_x11') != 'no'
+   x11_dep = dependency('x11', required : get_option('with_x11') == 'yes')
+diff --git a/va/meson.build b/va/meson.build
+index 372ae89ff..33c6cc8d3 100644
+--- a/va/meson.build
++++ b/va/meson.build
+@@ -60,7 +60,7 @@ libva_sym_arg = '-Wl,-version-script,' + '@0@/@1@'.format(meson.current_source_d
+ 
+ libva_link_args = []
+ libva_link_depends = []
+-if cc.links('', name: '-Wl,--version-script', args: ['-shared', libva_sym_arg])
++if ld_supports_version_script
+   libva_link_args = libva_sym_arg
+   libva_link_depends = libva_sym
+ endif
+
diff --git a/media-libs/libva/libva-2.20.0.ebuild b/media-libs/libva/libva-2.20.0.ebuild
index 26ee296ce8db..6b90d7162477 100644
--- a/media-libs/libva/libva-2.20.0.ebuild
+++ b/media-libs/libva/libva-2.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -48,6 +48,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_dricommon.h
 )
 
+PATCHES=(
+	"${FILESDIR}/clang-17-version-script-check-fix.patch"
+)
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index dc2af97cb212..5f4a2ab44282 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -2,12 +2,10 @@ AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb78
 AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629
 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
-DIST netpbm-11.2.4.tar.xz 3791116 BLAKE2B bc3c4c7dd1c473cf6a0511c1a756dc11ddac693bd288daa8cac5d997d75f48ea9f039552decaff601a46fcdc1b08bba55596fc116547eee5a0ab78cf9a0ea55c SHA512 41219fcf8c02eb1f9bb8619d972312d63f0781e071f1c494ba5b2e1f2b614c37d78097259bcf39cb85feac783c811fcc24f088ec2cd406786296ae055ee10318
 DIST netpbm-11.2.5.tar.xz 3791980 BLAKE2B 147297cd35a114f278410bfc4837d632bd2d8815a461b4288d87808bc4cba4480d4ab41c7365d9845f0bb2c94f295907a0fbcbb0b8cfef64f6581e435efd5842 SHA512 de23a62b74c6a0020e0a178d14f64e87c79f94c56c132e3f3e4c895d2d4d27580fa6ed2310b31bd476b9922672dcf9833cde5fb5b5b0ea094b01c520fcd24059
 DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
 DIST netpbm-11.5.1.tar.xz 3781792 BLAKE2B 40773f81bba1e2231009d0e3b3950eb6bf5c22a4a9d02c42db76536d1b70140a1b462e3dc6db29bc5a822c0f9d72463d4ed3a390e199bcd4bb7a9c7495570f1e SHA512 05fa20fdabc175c99c89e779ffa719b0447ce97b4a6851f17afdf247dd3e67787ce251e28b5529bb793d46164b0c3908a368a77e0a5245c49109767f7870676d
-EBUILD netpbm-11.2.4.ebuild 6836 BLAKE2B ee8ce8774917ae49808eb5ee8b70f46289f7feac05e9ef304ffe492474d26bb35b0a5d7413293eb25da15c91645b2b49b2aa2c6a90cc164dc6956e0262bf2f11 SHA512 e405ebd3d0a44c96de0b25f8a99f355a49044740159d977d0734946b4ed9f47a660c4977bfd00b996b37f983f4616ce94d19486a0881cb495c714f128d8ea0e3
-EBUILD netpbm-11.2.5.ebuild 6837 BLAKE2B 47ce673f44aeb6264e3008fff75badbfae3c5b36b178fdf734e305a3e22becf8e2618f1e0438d34c32cec48c4b6f9064f674ec48d54a09429c94dd9568722faf SHA512 31f2cbd25ae17663e46954dbfdd76cc90492778eb743b9f3ae7e3b37041579a6003bad7685a1402255769fdbc44c178173ba0ff8188eb7596136c8591df02379
+EBUILD netpbm-11.2.5.ebuild 6836 BLAKE2B ee8ce8774917ae49808eb5ee8b70f46289f7feac05e9ef304ffe492474d26bb35b0a5d7413293eb25da15c91645b2b49b2aa2c6a90cc164dc6956e0262bf2f11 SHA512 e405ebd3d0a44c96de0b25f8a99f355a49044740159d977d0734946b4ed9f47a660c4977bfd00b996b37f983f4616ce94d19486a0881cb495c714f128d8ea0e3
 EBUILD netpbm-11.2.7.ebuild 6844 BLAKE2B 5ab71dbc1d638ec58a06974343f6f9b7d0dfa30cb4234daecb2b972e3eabfeb8c103e754d45f4433afc6612b4e9db11bf61035450e6af6d56334b5a7a6746baa SHA512 8a1f9e89ad3c1b896e3116ca59591072a54e34d807b65fd335dbbcb665d7f3a65fe481da918700772220ace5367063d621c0b8da91c919cb69e39f5c4f207e6a
 EBUILD netpbm-11.5.1.ebuild 6724 BLAKE2B a1fe436c072b05af84091d2964e321372f363d158c639fd345f497b24e3a993b77c63fcbdd0c07a8960f971d17c1e56f80dd082d4a56deefa185ae6c4e95f374 SHA512 9cd9826b92945ed3d6a67e4a9dceeb35f49acac3d4f7e3a1f9052bce3887bcf6dd475fe78037501d320b3d1ff5ade49c034e31b65c9eab6dc76ab9b358acfa1a
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.4.ebuild b/media-libs/netpbm/netpbm-11.2.4.ebuild
deleted file mode 100644
index 3afe4523512a..000000000000
--- a/media-libs/netpbm/netpbm-11.2.4.ebuild
+++ /dev/null
@@ -1,258 +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.3.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/stable.102"
-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
-)
-
-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 -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
-	# fix typo in a test
-	sed -i \
-		-e 's:^o#! /bin/sh:#! /bin/sh:' \
-		test/stdin-ppm3.test || 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 -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
-	sed -i \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
-	# The postscript knob is currently bound up with a fork test.
-	if ! use postscript ; then
-		sed -i \
-			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
-			converter/other/Makefile generator/Makefile || die
-		sed -i -r \
-			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
-			test/all-in-place.{ok,test} || die
-		sed -i \
-			-e 's:lps-roundtrip.*::' \
-			-e 's:pbmtextps-dump.*::' \
-			-e 's:pbmtextps.*::' \
-			test/Test-Order || die
-		sed -i \
-			-e '/^$/d' \
-			test/all-in-place.ok || die
-		sed -i \
-			'2iexit 80' \
-			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 -i -E \
-			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
-			test/all-in-place.{ok,test} || die
-		sed -i \
-			-e '/^$/d' \
-			test/all-in-place.ok || die
-
-		sed -i -E \
-			-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.*::' \
-			-e 's:winicon-roundtrip.*::' \
-			test/Test-Order || die
-	fi
-
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
-	if use elibc_musl; then
-		sed -i \
-			-e 's:pbmtext-iso88591.*::' \
-			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 Netpbm.programming USERDOC
-	docinto html
-	dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-11.2.5.ebuild b/media-libs/netpbm/netpbm-11.2.5.ebuild
index 179d780fff80..3afe4523512a 100644
--- a/media-libs/netpbm/netpbm-11.2.5.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.5.ebuild
@@ -19,7 +19,7 @@ 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/stable.102"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+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