gentoo auto-resync : 29:01:2023 - 14:55:22

11 files changed, 236 insertions, 299 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a49fa94fa5e5..5f7677093588 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 2da9e3768054..0443d46fc3bf 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,6 +5,8 @@ AUX fontconfig-2.14.1-gperf-meson-debugging.patch 879 BLAKE2B a9697083b74ae9d7e4
 AUX fontconfig-2.14.1-gperf-meson.patch 2559 BLAKE2B 203cdd0d208acaf417e81973810f2a1129f4e9ec75fb51addb36c29267943c4250d27926ab888cf339cf67e10c4ef7fd90d54990c819acfde796d4ec7dd8bd5a SHA512 b87e0506e374a04902a87bfa140fde9fcd4a1d769c249db8d218a32f0befcecca9ad7c7fe389806fc634b83d7a0100c568dba0e243f0a0c7f91e34ad6b5ac7d3
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73 SHA512 ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
+DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
 EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f
 EBUILD fontconfig-2.14.1-r1.ebuild 6669 BLAKE2B 15edcc9a23bf962f2de32be9afd712c846859bcd5969155f8d739d91e409f0ca0f540c0a9708d01053c13ad3512b6f64bbeef01a1f8c19167bbebf03f68fdc50 SHA512 28c1238f9128b0d058e92dcb749fcda4ff0b873b7e3c48c13da548a264202170a2d05e1150d555d2437ff9252b60ca0e41d7f1e3d7c4461e732d9d688a5d9548
+EBUILD fontconfig-2.14.2.ebuild 6583 BLAKE2B 89039845abd60319906ecd842f40db50fa2409814fb09ec54f0c4d4d2e273d0477f22391aef14b17198e854a95cf37c16aac8b3cc42d0608e119c879e909f166 SHA512 3dd868c3a7cc1619d469d23328e78c27bfafa198ab88d3edc38b55718bf5233f2751e71e8421a4f19b481543b7f036430b0be094628afed0a8274720bdec0da9
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
new file mode 100644
index 000000000000..a7eb1fcf0c0c
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/"
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/json-c )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
+	)
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
+
+PATCHES=(
+	# bug #130466 + make liberation default
+	"${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+	# Avoid test failure (bubblewrap doesn't work within sandbox)
+	"${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+	# Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+	default
+
+	# Test needs network access
+	# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+	# On bumps, please check to see if this has been fixed
+	# to allow local access!
+	sed -i -e '/test-crbug1004254/d' test/meson.build || die
+}
+
+multilib_src_configure() {
+	local addfonts=(
+		"${EPREFIX}"/usr/local/share/fonts
+	)
+
+	# Harvest some font locations, such that users can benefit from the
+	# host OS's installed fonts
+	case ${CHOST} in
+		*-darwin*)
+			addfonts+=(
+				/Library/Fonts
+				/System/Library/Fonts
+			)
+		;;
+
+		*-solaris*)
+			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+				addfonts+=( /usr/X/lib/X11/fonts/TrueType )
+			[[ -d /usr/X/lib/X11/fonts/Type1 ]] &&
+				addfonts+=( /usr/X/lib/X11/fonts/Type1 )
+		;;
+
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts+=( /usr/share/fonts )
+		;;
+	esac
+
+	local emesonargs=(
+		# USE=doc only controls the additional bits like html/pdf
+		# and regeneration of man pages from source. We always install
+		# the prebuilt man pages.
+		$(meson_native_use_feature doc)
+		$(meson_native_use_feature doc doc-txt)
+		$(meson_native_use_feature doc doc-html)
+		$(meson_native_use_feature doc doc-man)
+		$(meson_native_use_feature doc doc-pdf)
+
+		$(meson_native_use_feature nls)
+		$(meson_feature test tests)
+
+		-Dcache-build=disabled
+		-Dcache-dir="${EPREFIX}"/var/cache/fontconfig
+		-Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts
+		-Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" )
+		-Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+	meson_src_install
+
+	# Avoid calling this multiple times, bug #459210
+	if multilib_is_native_abi; then
+		insinto /etc/fonts
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# fc-lang directory contains language coverage datafiles
+	# which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if ! use doc ; then
+		find "${S}" -name "*.[[:digit:]]" -type f -exec doman '{}' + || die
+	fi
+
+	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
+		mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${PF} || die
+		rm -rf "${ED}"/usr/share/doc/fontconfig || die
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig || die
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
+		local file f
+		for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
+			f=${file##*/}
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" \
+						"${ED}"/etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ -z ${ROOT} ]] ; then
+		multilib_pkg_postinst() {
+			ebegin "Creating global font cache for ${ABI}"
+			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+			eend $?
+		}
+
+		multilib_parallel_foreach_abi multilib_pkg_postinst
+	fi
+}
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index ab6accc7194b..0c7e9cb87584 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,3 +1,3 @@
 DIST libaacs-0.11.1.tar.bz2 325669 BLAKE2B be8553ef8d312d3c62005b12d0473f9f3a8e1d0fbe86b0c0e69ffe213b26658489a1d0b0414222d2a5088d157832e5b27b989945d4a25b1a16e858e43e67629d SHA512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42
-EBUILD libaacs-0.11.1-r1.ebuild 1047 BLAKE2B d63825a53d7f69bd8c7b5c6438af11ef0ce5eb7d2247c8aedb4e570ddbdd4abf3326fa946020a9fa3b0f654dae59d1d1ccc3277e9c1dca879ad85240686ea50f SHA512 f1e51c9254f70eb9e526d701d27cbe028a56d8f96e48b01b9c7abbe10ae29e7afce591456f5d6b584d87a85fb73536f73e8ea06368cab798fd4628697fd4a323
+EBUILD libaacs-0.11.1-r1.ebuild 1211 BLAKE2B 9223b7634f4ff26a9840bb8bc7cd7e479394cdc70642d2085074d602b33ee313656c32bd43d48603c0977d64b3cf5c00b44caded444dca8e39c0a0156fd5d8a0 SHA512 9a23aef02b2a0da5e07f3565d5c7de893c8db7dbf923420325bbf9ad2376ec6f131da76c14df1505dcff0f6b19d3e83159e95066dae9f85d3fd469e5e77a6bd2
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-libs/libaacs/libaacs-0.11.1-r1.ebuild b/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
index c521f48a95d6..aaacf8da1fb6 100644
--- a/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
+++ b/media-libs/libaacs/libaacs-0.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,15 +13,24 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
-RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
+RDEPEND="
+	>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
-	app-alternatives/yacc"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
 
 DOCS=( ChangeLog KEYDB.cfg README.md )
 
 multilib_src_configure() {
+	# Force Bison & flex as it doesn't work even w/ build system fixed
+	# https://code.videolan.org/videolan/libaacs/-/merge_requests/14
+	unset YACC
+	export LEX=flex
+
 	local myeconfargs=(
 		--disable-optimizations
 		--enable-shared
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 7a3f4e6e8b3e..1ba2e25c9a80 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -2,6 +2,6 @@ AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434
 DIST liblscp-0.9.7.tar.gz 98364 BLAKE2B 8ea8d05f7753db3dc3210e3faaa60d7f0e7fab558948a7e687b60b728f00ca557a08594f72beb0823e14c4eb3d4ec0aa75bb802194a4b9e660546c462196553a SHA512 03b83962ea89bbf4ca6b76c71f4883c7621a7306383bbd53f6240d7f17838cfa89c2861aa169f789754f6067fe76866068b26ab1370a0c2fafbf0f660894a4ad
 DIST liblscp-0.9.8.tar.gz 98451 BLAKE2B 6b353f322194ee4fa13a3b916982b5fed25eda746c40d1efde28e407a7c5dda943f331bd25a130976b6410a16c6a6a95e055bdcdbd6846bb7d522fcbf600074a SHA512 b46ac3407fca12fe3d330041bcdca72e481ab1a1149faf31aed8f41e5b153b788678c2cd595a22eb7ec9ce285225f451f7b8fecaf60d31695a9c308dc506ed83
 EBUILD liblscp-0.9.7.ebuild 748 BLAKE2B 91cdd739be37cafa76cb6241f8b89ee2053f5d03518381acab1ac106f8d816c6a9001acd03bdf3f380e3529e25e5c100e16a9ededb3e427135f1c27cc9b874f0 SHA512 c37f1f6ea1e27fdc5f573dc8745a6aadc9aadbee8ce496c78631b13af7317f72f1f57e84dc043938b81ee63c261228528d4c13dfe7ca78a6d5f6c106d55e2478
-EBUILD liblscp-0.9.8.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
+EBUILD liblscp-0.9.8.ebuild 748 BLAKE2B 0d001b0d06c800f1f0a404e5ce07708c4e7e3c7333089430b1f2ccc866f983e65937b4d41c3d45b323c618e9a0ec7a1b7b1d86462b472315c7a8caa900cf3070 SHA512 9e377d3a7aead12fe991dce44d91446f9da73fe4c9d0ada58dab1a6f770d48416e5ccfda886998e18585fb4b65d8952059f1ee2f5b81c377013c8ff9c22a3a84
 EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-0.9.8.ebuild b/media-libs/liblscp/liblscp-0.9.8.ebuild
index 5d0c3733b0ff..f58f229f36be 100644
--- a/media-libs/liblscp/liblscp-0.9.8.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 9b205ed2d1ec..9b4d718ba352 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -5,10 +5,8 @@ AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
 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-10.86.35.tar.xz 3699944 BLAKE2B 754b695ab25ba2c3ff0cdc8d3810a3df7af9a30476dfd6afa70591df0931334806ad41da41797e3f6121b77b7e3fb77a3c01ebc533812e9a8cb3ccb3eb6c19ea SHA512 a4a0107f04ccdef066d340f97a7d3487a2b349dd5994b294fd815813bb04db10063ba933442ef77e27a96fb3b31a5769f3a19532a651b802f14667dbf43c06f5
 DIST netpbm-10.86.36.tar.xz 3700660 BLAKE2B c5f0acd0147f2ad66f69ae2ade56fcbb5286faddc7f8f3387e2269fd20ea2586a29d7e7dc96bd715fe12896eef47803b826031087e6be8166183ba7cf82aebf4 SHA512 b05df76760629881047c44799a905a491fb4c139a9af909d77cc4238fc82dfac37ba174df4f81cb1177716ad38a37b26eadcc3889d2c2057ff9d850697fad3c6
 DIST netpbm-11.1.0.tar.xz 3771676 BLAKE2B 0f377dc36b03b99a174c2d5a09d62aea8a813f9eb501a59630c4f083247cc3c82e3fee88085ec686f4d787d67104b834a511b4ef1f7d75eda7b10fed3281d9e5 SHA512 77528e2508d7a2d348de339d57b677fd1a061bb2902273d536ea09c34033af03a75bb723bcc7e87551406f47f115085a60691b3fda4ae672372b8473528370de
-EBUILD netpbm-10.86.35-r1.ebuild 6868 BLAKE2B 6671fe735c84396edf72a5946e9de2514080d143508dcf274838c2480cd8d5218788ae5d01ab024d9a21f05deaca8f718a8129b696801cf793fc7021fd3d90f8 SHA512 a6aebe77131a72863e88dc3917d1b1301c4f8ddf2322acf77c7fe823231ff0c7e9bcb8cf19107cb1a1a629e9ccb41e1048d6c771cfa688bbd90e1656d8ee303e
 EBUILD netpbm-10.86.36.ebuild 6771 BLAKE2B 261ea89a2609e11f160fbcfb5a940963b77cfdf1820705566758a988d294635e3213ec4af3ce3ab37a74cde19ea875ac53dae8b2552f6e588dbd5e31230102cd SHA512 d9075e67b699f62852ed6e0fe747fd55b6bde0d97b7510cbdc56472ec328f5257899805defff19de56d9e3b548488e7b99ff35e170fed5080f6f15b786f43002
 EBUILD netpbm-11.1.0-r2.ebuild 6968 BLAKE2B e3deb3af629c1addd0a3db814088af4ae11a453c62500b79463e246afaee6059dcd77d9d477af9a6eca51fc8783deed96c698fbb8c4398b44940cf72d36871b6 SHA512 0e0941d1c0d62595f4d0a119c4e139a289e26d1193534d37c27b09e9122f104a89d3fc5da46c00c94cc9548550ac15442fedb8deb1057379de40de5989be2197
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-10.86.35-r1.ebuild b/media-libs/netpbm/netpbm-10.86.35-r1.ebuild
deleted file mode 100644
index 0798299bfe79..000000000000
--- a/media-libs/netpbm/netpbm-10.86.35-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 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 10.86.xx) on SLOT "0/stable"
-# and the advanced branch of their svn (currently versions 11.aa.bb) 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
-
-# libnetpbm.so is not 100% ABI compatible between stable and advanced, so
-# packages that depend on it should use "media-libs/netpbm:="
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="https://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
-SLOT="0/stable"
-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
-# also 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-10.86.21-test.patch #450530
-	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
-	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
-)
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo ${suffix//\.}
-}
-
-netpbm_ldshlib() {
-	case ${CHOST} in
-		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	if use ${1} ; then
-		[[ ${2} != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-# 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
-
-	# 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.*::' 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
-
-	# 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
-
-	# 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() {
-	# cannot chain the die with the heredoc
-	# repoman tries to parse the heredoc and fails
-	cat config.mk.in - >> config.mk <<-EOF
-	# 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 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 = $($(tc-getPKG_CONFIG) --libs zlib)
-	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
-	[[ $? -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,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 *.html
-	dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index 31abac49d454..6135e4e60194 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,6 +1,4 @@
 AUX zita-alsa-pcmi-0.3.2-Makefile.patch 789 BLAKE2B b6105b972818ed184ef1e3d4963885d34b3d52e4ec0bbf397d85d03c67ea22f82f6c2f8ef0c2e1e7f5e1f19b2adb5372f9c56cb60597dfe94623414ff9edf9a7 SHA512 aa9cae5d9d8fb7567b1723ce8334880bbdef1bf0f361ff5cdb8b1932316ed531e410b32e20d919cd1c7b0c24647e810f4cec754360d72c99c18dee9bb9894483
-DIST zita-alsa-pcmi-0.5.1.tar.bz2 21728 BLAKE2B 7ea5980939ebdcb25b88cc15ff10037adbb328128174d6d6ee243dae1be6305d5967c8c53b15ac37739abb168b2fd24ec2349eba82c9452cc178c39e8a204c59 SHA512 afa0751ef4e510bdc2603d52bdb921cbf8b0a8372bdcae77dd9ba5b4790c08a0a510b9a9e2240bd9ee7ce23163125bd44556621bbb9312c8ab5f82780b648c22
 DIST zita-alsa-pcmi-0.6.1.tar.bz2 21767 BLAKE2B 15c089131cd859f4686e06383abab5296bacfc88f10fcd323eca99b46455d3387a3505ae6e6ed2bc8cafab0f3612966ad45e796b1eb0ffa211f06876ed1909b7 SHA512 f4f8f4f834f566a2b81fc9f23c49714815b68e4c6c0b840830592a2d80171e6d4538aacfeb2d3f835bd28fec1a5e1f232c97c4dce254f797ce262e5414062cbc
-EBUILD zita-alsa-pcmi-0.5.1.ebuild 914 BLAKE2B 6528b89f990ec6911b5df9dd194199c451b7151199bbc929e0a5832f7cb264671015cbf473634f71e2d2007b760f035edba19c978da49b3e085de387866ecfda SHA512 b37b85bc756cc94f795dfa0580425e7f004d042bd4184469e119e697f458a9cb67fa4f66e76c67e567fc3b551c5433ffe16d6319a441ff90a10d5bbfbd358e73
 EBUILD zita-alsa-pcmi-0.6.1.ebuild 914 BLAKE2B 39c96a3ef50c38182776d7d97a760ee1bb47f8d07f885a1a3a638cfa827b8ee43642dc50c9c1487f130443520ae30a35a6f645aeff90eeaea2b46da3a60c5738 SHA512 1e10f5257b9ca39b8bd39c0c7f3049dafcf7ae4018ca2f3bb4bcf4805714238c10b5db927054d967a05304b9a72814ec5b7534bca8bf5b37587e380c9f30705b
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.5.1.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.5.1.ebuild
deleted file mode 100644
index 311cf5f1de49..000000000000
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Provides easy access to ALSA PCM devices"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-CDEPEND="media-libs/alsa-lib"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS COPYING README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.2-Makefile.patch"
-)
-
-src_compile() {
-	tc-export CXX
-	cd "${S}"/source || "Failed to cd to sources dir"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	default
-	cd "${S}"/source || "Failed to cd to sources dir"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
-}