gentoo auto-resync : 14:11:2023 - 22:34:48

11 files changed, 262 insertions, 122 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3b8a7928b183..e821d8947f5a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/SoXt/Manifest b/media-libs/SoXt/Manifest
index 6f5de813cca2..9727525d4f73 100644
--- a/media-libs/SoXt/Manifest
+++ b/media-libs/SoXt/Manifest
@@ -1,5 +1,4 @@
 AUX SoXt-1.4.0-drop-register-keyword.patch 1253 BLAKE2B 857056775a0cc5959f05377d30ce1dc6f69dd7d6754330f97ffe0008c257a12471fb996d9df16a8bb4205486b40e15a8d621b0cf86fda73acd096d093f694a02 SHA512 748cb1421d549c4641339b3ab1b7b0482118b68d34ef79dcec2d9037ee79c8a221780ac676fd2872ee728a2c04b3f7ff3013d53016f26cb65a8eefcdbbfde6d1
 DIST SoXt-1.4.0-src.tar.gz 1369725 BLAKE2B 727c56644878e9d52441ca905558524ccd369de123e8018d7fef4d949aa4e96007fa3a1e9782490b4dc9d50a916686a118d37ec7094dc6a3522ede032b30b6ea SHA512 9c661396ec18c2cba8984be8c0875f51554c8845e1a85d9b202f9a0f4de8203566a46d9b276e20039861dbf7ff3a0ffa474d098866f8a7692b53a01e3f62977d
 EBUILD SoXt-1.4.0-r1.ebuild 1027 BLAKE2B 8dfdb11afdf49f6412dceefc9aee462386b927d78e2e2a13df0240c420d97c6e0bfa5633737b029f7e99b6185bd77ba52efade50e62155e50f5d2c2efbc6b8b1 SHA512 82fc304b423ce4c976414a85a0df89aee11f5a14a5bae2194f9dee6bf985c4702d3ac3772098da10076f700782f829c03933dc9eab47fd7b391f5e8a0a3d8c90
-EBUILD SoXt-1.4.0.ebuild 948 BLAKE2B 439c5b9628d3fc9651a881ffab34682aa4fa94edc9e01a2e825e8ba563606a70de25167c1068401f6afd85a2abaf1fed1c91a12e36d8a44121d0788a4c2d70ba SHA512 8fd543f0b2cb02e37068b0be9eb325c7be02bb4aa2ef3a3fee8050cdad98c668989b5811757f3aaec492320d0c3a1d1d429fbc0c2ed29df4d716fd60aeba6d41
 MISC metadata.xml 659 BLAKE2B 3b402f9fa90396baa373a263d4023d24c6099daac86af52a70fa9d48b9570d488a5565676dfb305ed06c817c57248afb50327f4227b206475f5b83b6162eb804 SHA512 5066a6d85c08974474c2cb8d27f328932a402b4e7649f6ac3cb9474beea2721b6e1d0728ba95166a2ca585b1a4e050ca0239acdf8ffe9e769f154a2000b423a2
diff --git a/media-libs/SoXt/SoXt-1.4.0.ebuild b/media-libs/SoXt/SoXt-1.4.0.ebuild
deleted file mode 100644
index 5ab58c8ede88..000000000000
--- a/media-libs/SoXt/SoXt-1.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_P=${P/soxt/SoXt}
-
-HOMEPAGE="https://github.com/coin3d/coin/wiki"
-DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
-SRC_URI="https://github.com/coin3d/soxt/releases/download/${MY_P}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc"
-
-RDEPEND="
-	media-libs/coin
-	x11-libs/motif:0
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/soxt"
-
-DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt)
-
-src_configure() {
-	use debug && append-cppflags -DSOXT_DEBUG=1
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DSOXT_BUILD_DOCUMENTATION=$(usex doc)
-		-DSOXT_BUILD_INTERNAL_DOCUMENTATION=OFF
-		-DSOXT_VERBOSE=$(usex debug)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/libcue/Manifest b/media-libs/libcue/Manifest
index 02b6a5e0b935..975ecd862211 100644
--- a/media-libs/libcue/Manifest
+++ b/media-libs/libcue/Manifest
@@ -1,6 +1,3 @@
-AUX CVE-2023-43641.patch 409 BLAKE2B 141e918945e422f84602df33b43f4ab4aebd6dc44985d9908c83cce5514311b5610a274766cc9857a9fdffc0fac332f501c94364731320c34b817e9d30c231e0 SHA512 fd756d6949ed8032e6a4f4a3d0cd88d49f251e494df05497704b769c4d5157ecd5944b788ec4f6af60c4d461a346ed72b3e32f0926cd1ff66b9a8f67a199c7a9
-DIST libcue-2.2.1.tar.gz 24177 BLAKE2B 478f897567aee006c9e835bbf6e54373351b6b4e4bb68154c94f13107b38bdb670fa032d69744e7dbc51132d86dbf276cbf9701c9d7da0882820b71adae53362 SHA512 32e476cb09ed2cb2d64aaba1342fb91e77e448391b493a3a794a8d2a6723a0e6097a90b11c6ad82998cb7f270f4f18c2578d7b8575f6929c2a35502e09ebc964
 DIST libcue-2.3.0.tar.gz 24326 BLAKE2B 6080db29a100b0ba3872f12c131f6d30c82c6292e78840bc30db31d7c6512ea1810b0c12634612ffc0ecf0495ada01fdeb154a1eebd43f8856f06b9d2923084e SHA512 fe2c39cc9794ac36c0706405e0432bab23228d343ba4e3395220d5b2a2ebf8b3c97e71d76a628f9144977c0dd56636f78d0c2d1f9f2b0d4068a837a258f035b6
-EBUILD libcue-2.2.1-r1.ebuild 505 BLAKE2B bddcc3faefe190451368423147345d57eee89b63a53759fd5226dbbe607093484e3f963e93452cd4bbd6779a0720d70f66199d5e2e08568c0fa29a3383dde32d SHA512 e32d7d8826c542770aa25384f874573986323e3fe0ad2204a2aecb6cea2a362ceba2cdfbb9699cd8574efa2cc544a56eef6cd4eed08e034eacf65fb462668b93
 EBUILD libcue-2.3.0.ebuild 456 BLAKE2B 8fac6c6d74f0f1f3c3cb8efa75f2ad13f56cc0da58168bbd40130ff473b1c45f0a4e13364b616baa6033fbfebfb7fcc9ec40b2c3de30a2dc3961f9b6dea90d13 SHA512 08a8f8a79d58843cce04270ffbbcfefd768885affe108dfe312c9908215bbdac78ca0984c4b782158ce07e8520adb107cf69e115779ce019627c2f657965a9d5
 MISC metadata.xml 334 BLAKE2B 02d441ff7dcdb2138ee06f2819e25c49f313b71ed0c6f742e4dcfbf6b32cf619850e4b13ffd611ecac9374d3ffdfbe9115bd668f83024c83de25452bf88e5c02 SHA512 1bcdf9c97b0cf3e40cbc2a751f7c9e9f93f2a5995ebafbfacff2dcd023caf99cbeb18101a683dcf2ad9e5acdd697fc487bbb693131ef02e675fd189e77c805db
diff --git a/media-libs/libcue/files/CVE-2023-43641.patch b/media-libs/libcue/files/CVE-2023-43641.patch
deleted file mode 100644
index b94de663aaa0..000000000000
--- a/media-libs/libcue/files/CVE-2023-43641.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.blog/2023-10-09-coordinated-disclosure-1-click-rce-on-gnome-cve-2023-43641/
-
-diff --git a/cd.c b/cd.c
-index cf77a18..4bbea19 100644
---- a/cd.c
-+++ b/cd.c
-@@ -339,7 +339,7 @@ track_get_rem(const Track* track)
-
- void track_set_index(Track *track, int i, long ind)
- {
--	if (i > MAXINDEX) {
-+	if (i < 0 || i > MAXINDEX) {
- 		fprintf(stderr, "too many indexes\n");
-                return;
-        }
diff --git a/media-libs/libcue/libcue-2.2.1-r1.ebuild b/media-libs/libcue/libcue-2.2.1-r1.ebuild
deleted file mode 100644
index 7b18b7e74273..000000000000
--- a/media-libs/libcue/libcue-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CUE Sheet Parser Library"
-HOMEPAGE="https://github.com/lipnitsk/libcue"
-SRC_URI="https://github.com/lipnitsk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2023-43641.patch
-)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index b115dc8696e8..8f681a050bdb 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -3,7 +3,9 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c
 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.4.3.tar.xz 3792792 BLAKE2B 64d9c239ae98f1cdd521a73958a372f027bbdd9f8926dc3dcff48b7a630064e0f7b2aa4f526469580b7048a3dd2b94ba059d46a58e33402362c203c7bb348cea SHA512 2059c450276640e7ef510ba6cfe79395cc88da0250e9c94881fda94c54b6a8d8d0dbc8c9b14d5503b5dfccd52beb9c1108e12b57ca3c667c72dd89b5adf0d298
+DIST netpbm-11.2.5.tar.xz 3791980 BLAKE2B 147297cd35a114f278410bfc4837d632bd2d8815a461b4288d87808bc4cba4480d4ab41c7365d9845f0bb2c94f295907a0fbcbb0b8cfef64f6581e435efd5842 SHA512 de23a62b74c6a0020e0a178d14f64e87c79f94c56c132e3f3e4c895d2d4d27580fa6ed2310b31bd476b9922672dcf9833cde5fb5b5b0ea094b01c520fcd24059
+DIST netpbm-11.4.4.tar.xz 3793892 BLAKE2B 786641dad78b8bd17f93bd57908e527c06804e42a5e831b47b8238efbb61ccbb277bb0102a37e4064ea91afd4d98d21eecb691b4ba6723320ba18911197789ad SHA512 f9c387bf4eea34d2ac39859a939905df8b06b328d4f9cafae54a7b75887ba312df83679f579911b5ecc9342fe1e778bea75d263a77cb550eb221aaf72a69de78
 EBUILD netpbm-11.2.4.ebuild 6830 BLAKE2B c07e114dd61e0aef2f08f93bd722f72fac8021bbe9d369b111084a706e64f93e76913074e74758bc37780abd13eff479e58f00b524daf1a6ba2171b57272d825 SHA512 9cc1e468d04a7e8538e4ed1964e5a34834c8b3e637c4db7c79dde6c0290500d713ed09f3d746a07f0c6bce9fbf812f5be497050d79c6360a65aaadb1e793c83e
-EBUILD netpbm-11.4.3.ebuild 6722 BLAKE2B 65b486aaba5a3a219f484290ff4d22dd0e01781b9d441339dec183bd0f36f9430f7fa3ef1dd087b2b11dc858349c3a28e813fa63220bed4dc54bded4c5165c53 SHA512 b4eb0fcae2a166dcddd03b607d2ac90d91045e02189b249818ab4ffb55adc48f940b91aaa247fc1d930a29b0e14cfd63a1300aee4eebb8617ce51808954c2834
+EBUILD netpbm-11.2.5.ebuild 6838 BLAKE2B dbae0fa94f43bf2b7f0dc6a0797448a5b776730c9ae03277bddafca0d95e6e47769bdd0220772ccc65a3aaf54b0c8c22b1818a128cc62e92411b2aa75dd8f862 SHA512 1e0cfdde5a2e5856402edc684aa1dbc21a3141f288cb78ee1905efada4a7c0ba84f4b1a6cf4557777cf16be2c7754f0e2668c9544aa0b2bb5605ce63c889cdd2
+EBUILD netpbm-11.4.4.ebuild 6722 BLAKE2B 65b486aaba5a3a219f484290ff4d22dd0e01781b9d441339dec183bd0f36f9430f7fa3ef1dd087b2b11dc858349c3a28e813fa63220bed4dc54bded4c5165c53 SHA512 b4eb0fcae2a166dcddd03b607d2ac90d91045e02189b249818ab4ffb55adc48f940b91aaa247fc1d930a29b0e14cfd63a1300aee4eebb8617ce51808954c2834
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.5.ebuild b/media-libs/netpbm/netpbm-11.2.5.ebuild
new file mode 100644
index 000000000000..e22e58d3b22b
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.5.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 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
+	sys-devel/flex
+	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.4.3.ebuild b/media-libs/netpbm/netpbm-11.4.4.ebuild
index 1b6604b4e321..1b6604b4e321 100644
--- a/media-libs/netpbm/netpbm-11.4.3.ebuild
+++ b/media-libs/netpbm/netpbm-11.4.4.ebuild
diff --git a/media-libs/noise-suppression-for-voice/Manifest b/media-libs/noise-suppression-for-voice/Manifest
index 035927ab385f..1f92d433d8cf 100644
--- a/media-libs/noise-suppression-for-voice/Manifest
+++ b/media-libs/noise-suppression-for-voice/Manifest
@@ -1,6 +1,4 @@
-DIST noise-suppression-for-voice-0.91.tar.gz 207544 BLAKE2B e16f81b58f382e6bc01905c046fdb0b00891b9a82540df01387fc5e5ded165314b8f3c40a1c3c33a4544c536eb1b7aa57d25ac59180624dd2550ec9c465f0545 SHA512 e117fd54e6cf01c4721b79fddca2f2898331e46764c7a05077ed3034c50e2cbc0c1d6fa3084f7c6f56a629bf20127a7d1bccd57d30b0693cc3eb30edaae6cd28
 DIST noise-suppression-for-voice-1.03.tar.gz 19486457 BLAKE2B 50d92eb6d8868aa5c175fd2d78c3a24a9d92ddc00327c9155ac59a3d143ec7e462b122e3ad6b07f5647346d69731c0940658581a42100df5924eb759385dd1fc SHA512 1cf08c947a1f5415e35d11007acb3bf1cbb6929c81c3d877d2a1714ec30061285077f9850eb08da7784bf2188d849bd630ad605b1b6e03ea75a1afb16076a512
-EBUILD noise-suppression-for-voice-0.91.ebuild 737 BLAKE2B 9dec2dae834a4e29d29f5ec6c97f04a77ac73bad3bf3305abe0caeb8a905bc42d95ff9ebda65f28708d8def783532e1b6c6efa82fcfe1f4e67407f5584189364 SHA512 bddf2382b9b74c57ad6ebb2090db91d98907974d15e2bc971e05a5b3a2830213e755079651b4d67822d9b7e12111fc72141518e9d0608145222edf8327379a2f
 EBUILD noise-suppression-for-voice-1.03.ebuild 1087 BLAKE2B 9eef7701b025514c81012ad94745834171d3f06b4400e430c0209a1f362a10921dc3c1ec95838bf32d525e5bf1399d9ba2a046d3ea498c3ab373d4d080c1f17e SHA512 d662be0b92b28176c4156b45ea0c6112ebceff9138efe2254ba0c85de9739ab6d134abdd5f7871d0d1fcd232266625c378df6f9cf98ce3178d65fb4b5c0fbd89
 EBUILD noise-suppression-for-voice-9999.ebuild 1087 BLAKE2B 9eef7701b025514c81012ad94745834171d3f06b4400e430c0209a1f362a10921dc3c1ec95838bf32d525e5bf1399d9ba2a046d3ea498c3ab373d4d080c1f17e SHA512 d662be0b92b28176c4156b45ea0c6112ebceff9138efe2254ba0c85de9739ab6d134abdd5f7871d0d1fcd232266625c378df6f9cf98ce3178d65fb4b5c0fbd89
 MISC metadata.xml 778 BLAKE2B 08b4b25e83e178aeade44e0893ecb314fa66d2818cf89ae527c33bf626142b9470936224037ca3b19683a2acc70d854594032cbe166cbdb3d4e882e0bc0ff8c6 SHA512 fced74a022682a0420ba60a529451e4c4b2bf8742e1595ada05465980af3e460fd8aa9400f0a96a538334b03728ccdd5200e2c950126e5fbe3f8fb663e69682c
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild
deleted file mode 100644
index 9d39add132b4..000000000000
--- a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A real-time noise suppression plugin for voice"
-HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	dodoc README.md
-
-	cd "${BUILD_DIR}"
-
-	insinto /usr/$(get_libdir)/lv2/
-	doins -r bin/rnnoise.lv2
-
-	insinto /usr/$(get_libdir)/ladspa/
-	doins bin/ladspa/librnnoise_ladspa.so
-}