gentoo auto-resync : 01:04:2024 - 14:13:28

8 files changed, 269 insertions, 148 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 65dd7801ee98..152454829b66 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c90948b5f403..6fb0eb6435b4 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -7,7 +7,9 @@ AUX netpbm-11.5.2-fix-tests-musl.patch 4779 BLAKE2B 049b20cecdaf40e77c37ad01cfe4
 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
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
 EBUILD netpbm-11.2.8.ebuild 6980 BLAKE2B 07938deedbf23fe5346246a90c07b8f76b68418d8655f318a5d91c2dc08cb81d5fc979c73a24db3fc16f8c05dc6b450139ca38b4f31b539c4ca7d744a47fa88a SHA512 3e8418800eae8e565c1dabcc4248ac0e946124de4b89c722c910c3f199e5557013ad0c4dc5ca9e01eb8f32688a8506d72c175a8edfacbc858e138f29901e5ac9
 EBUILD netpbm-11.5.3.ebuild 6893 BLAKE2B 51e08ff2753647d36c2bf8bafbbc26ab256e94a3bfe83c4c1690f8ab79ef4eae7246b44fa267abba3393b7617f802598e63ca73a0de6158c668bda1440b8d3d7 SHA512 350e2ceb608be231931cfd4044b8b6f7b570e3c212a45cc27a2c91e6991a977ef3bbbb35b5971a793d260ca11dd28365ef1808dd52b0a6bcc3edf331dcf2f14d
+EBUILD netpbm-11.6.0.ebuild 6843 BLAKE2B 9c918a3cdfa2e5555757e1743a864ea81d2b5ba93bfe39aa8aba9c83d35bea65fd48c7f9c6972d7c8f2c8fdae45d151c868e90e42e8eb204ee055454ca893cdf SHA512 732c3fda6c6c7a9d9de4728ca1a8c936e58b7a6bf82f7a1e81ebc1e0667517ab09cc4b973304d4e6c8742e8b72f33459a4c23f458dec270129c16a6cd820f5ef
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.6.0.ebuild b/media-libs/netpbm/netpbm-11.6.0.ebuild
new file mode 100644
index 000000000000..ee6f21f27d5a
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.6.0.ebuild
@@ -0,0 +1,257 @@
+# 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
+)
+
+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
+
+	# this test requires LC_ALL=en_US.iso88591, 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: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/opencv/Manifest b/media-libs/opencv/Manifest
index f2b10cdacead..942de3a6fa1d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -32,6 +32,6 @@ DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BL
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
 DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043
 DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa
-EBUILD opencv-4.8.1-r1.ebuild 29072 BLAKE2B bb02548e91bf43056200443667e4695bea73912bc1b3ac41909588cc31e13b7ac4271af3e1910bd9816833df2350450273d729988cf61e4fbc89785e7a3c74c3 SHA512 3d0ce895e1e6eab2eccd5d56be44370e1aabb77796a33b40970474c4a36f5e53051b4bbb01544dc650db0ff91bb8b45f6b67ae72039dd2204c24d24d2ce9b32f
-EBUILD opencv-4.9.0.ebuild 34227 BLAKE2B 5e0eaaca285595cafe08482faf67a7f7c248acb6ccf10bde52db6aa2b63abf49bfbf355e0b2b98da3d9f1b5bf6bde85d8c43e632d938b1d7e737ad607cacfdf1 SHA512 10cf8807dfbce36996ec2565f52c1ff6e496fdee44e078fe7e534547fab611416b88e54b095029ce1adfafddaf0b04a0e5f40ea135de52258f6443c976490e64
+EBUILD opencv-4.8.1-r1.ebuild 29116 BLAKE2B 6e4d371bc1fa8eeb255e469e2a4cbe79ff86e47037dbbd47d7e6532b4a2ca3abd6c27e3bb4428c5e77069d109fe104f336a91efd0d9abb39f47d2357fb3697a7 SHA512 79af1439f643d4ff118e712201af86ee2f687e917ce845fc32219975efb8a5ad04199abd505bc9bdda210e48426d0eb6f4318e2dca8ba550c17f58fc80a70ae5
+EBUILD opencv-4.9.0.ebuild 34323 BLAKE2B 48b4a9338e7c0742c411fa67b2a93759070f5a7e4cd41c64427654a105aa103479b9c9ff65e4a51f74daf1c0e77b2554b227444da93da903f841a1a25cafac81 SHA512 1963a5313145c7a588adb9e80567b9bd0dc60a6b72495f2501207fad18b6751bf7e8143a0701cbb5e497c9796d07b45cbcc175619309d1f0ce2b9f09df27811f
 MISC metadata.xml 3718 BLAKE2B 44b00ff4bc94a19f6a1b68cfefb29ce9f1a4ee21ee999b72a258268893ede5274d863d3a6faa325e6f0522c078c6afae53c6de4c46d6ed5a083888e195f34276 SHA512 b6c2f0a27b84afcb576209a3bdc641e81323c01bcac9617086d79821e723ea3c9698e8f3c5db837d46da68e48b6d9d08bdd05977e22d58d6c7ad30fa7b965b52
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index d183c6f8d97a..0f6ed3e6a080 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
 	cudnn? ( dev-libs/cudnn:= )
 	contribdnn? ( dev-libs/flatbuffers:= )
 	contribhdf? ( sci-libs/hdf5:= )
@@ -231,7 +231,7 @@ pkg_pretend() {
 		einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
 	fi
 
-	if [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+	if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
 		local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
 		einfo "$info_message so all available architectures are build."
 	fi
@@ -566,7 +566,7 @@ multilib_src_configure() {
 	# workaround for bug 413429
 	tc-export CC CXX
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		cuda_add_sandbox -w
 
 		if [[ -n "${CUDA_GENERATION}" ]]; then
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index 8039acfa0f75..5ad9e4eabaaa 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -145,7 +145,7 @@ RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
 	cudnn? ( dev-libs/cudnn:= )
 	contribdnn? ( dev-libs/flatbuffers:= )
 	contribhdf? ( sci-libs/hdf5:= )
@@ -315,7 +315,7 @@ pkg_pretend() {
 		einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
 	fi
 
-	if [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+	if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
 		local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
 		einfo "$info_message so all available architectures are build."
 	fi
@@ -676,7 +676,7 @@ multilib_src_configure() {
 	# workaround for bug 413429
 	tc-export CC CXX
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		cuda_add_sandbox -w
 		CUDAHOSTCXX="$(cuda_get_cuda_compiler)"
 		CUDAARCHS="$(cuda_get_host_native_arch)"
@@ -791,7 +791,7 @@ multilib_src_test() {
 		)
 	fi
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		CMAKE_SKIP_TESTS+=(
 			'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
 			'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
@@ -817,7 +817,7 @@ multilib_src_test() {
 		--test-timeout 180
 	)
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		cuda_add_sandbox -w
 		export OPENCV_PARALLEL_BACKEND="threads"
 		export DNN_BACKEND_OPENCV="cuda"
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index c06ea8a3f0ea..d7b4920b3e17 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -4,9 +4,7 @@ AUX openh264-2.4.0-fix-off-by-one-decode-regression.patch 1269 BLAKE2B 1b7e87e6e
 AUX openh264-2.4.0-unordered-frame-glitches.patch 11895 BLAKE2B 3779c770b04ef44c8b57a21dd9c7ac1292de633f57a0ee41498fdff12b9cb9a38d7fdb2f55f4eb6ff72ce9e9cbd38669ebdc7b83722bac483ecacc274a8bb54c SHA512 2771c6a783184f7dcf17f9604d0a62ae153c7e9bcb11e2b2af09e064607627c87c6524a8a8f772be8bc3730957a8c3dd5760e8c373d1f20b2470a7154eb2267b
 DIST gmp-api-Firefox114_2-e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7.tar.gz 10915 BLAKE2B aa4b82baebbd990d94f381be4516e8780f6bc3a2104c4b899f091a9e6ec91dff9788ee6ef548d3bc07c7bf50f56347c44d01e51805f96cf9b59494889a5f7b61 SHA512 f1c75007d4f1e1ef3a11b8eb9c703935408a5e4051c8eab408e4edc09f265a71f172025269442fdab9d4c2a8b108fa69397bfbd84af4ecda22881b50de804de9
 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1
-DIST openh264-2.4.0.tar.gz 60297968 BLAKE2B d725896979e8178277e304ac0d94e59f0971a7f0f443f6dee0abffbadc53cce8ba7fe6612a966c697296bf46c3035bd03ac9a65e63d6d87853317b178b06a236 SHA512 dc66986e84ad328e1615384e7bff93d6eaac42a68e87d9c9b59f55d9f90efd13dc87637a7e3b8c9694634dfa82351c5944828f3f478286608e362e014dd70ca1
 DIST openh264-2.4.1.tar.gz 60297304 BLAKE2B c66dbe8003072c406641b3f1453df6d8e574b5526d6748d5f4efa4921ca6a438df2e491143dc07c8f9297d253e97cd4ee2dada450845e7d9323cb31dddc6fff4 SHA512 eb99144addd2e9c352bb95e752366e104ac6b0ddc84311dc7c87dafb803f8e7fe4d1e726833d49f8cc6d3914508e19c3a25ef82637a4993e8af3f504aa005baf
 EBUILD openh264-2.3.1-r3.ebuild 3949 BLAKE2B 68b79ae51de85dc5c4c19fe2f1d5460ce8d0a076e3201d68cafbe0155d9c2d49f127919e30b1d16ce6dc8b0b2359bcdbf8d586c42c95cef2b77afc072fb4f91b SHA512 50aec0bab131871d007a1915c5305b76ea3e1c1f91741ab3596d05a6ac8b0269e57243e4b0ed2a56464c5ddce8a95916a4f8035a1bf5440c4dab75ea09e404fb
-EBUILD openh264-2.4.0-r1.ebuild 4075 BLAKE2B 13b56a985102aa4ae61278ec4105fa7f41898b4e69a617b569aa3b6217bc9f6db0da1ed2c199cd3e34892ce9f51d9ab4dcc4daeb57b54cff7f322f6b5a67ee6f SHA512 09d887692e0434fc324b8b76db18e2d7f3ee225d31ed757f188f4192863af7913a7e2884d3360fce636445f832e111e69705369d62efd9ea665b578218a72987
 EBUILD openh264-2.4.1.ebuild 3945 BLAKE2B 571a11a72e1d39a28deca500a11f73e092ca9e972bd060824cfdf47609906b128a9c0a34971a4208252ed6d7d679f35960456c51fae60e6f292f8bf209df418b SHA512 ae3c0318b08b441c565e2bfa2635bb5b05e087d25b71ba3d670d6a2b8fdf4e719c827826f3db4d5690318bbab95784fe602c5f4a8b3f896012b4543bb93f64bf
 MISC metadata.xml 627 BLAKE2B aa6bcd394a1b792f8d0fc89030f34df7f0366f049f52ee11a90af301ca901a07acfc1d34a0d6d237a7d713db53b707b3b9f08d3c86574d6067f6ff7e8cf99c3a SHA512 55a7a5ee5f716e9eb1e5711d45a93fe27f057b54240511de72ade7f88c53eeac72f1bf1b524d22278c0fafbea70e1b5892262ee1b97370d70a0258bad7220e30
diff --git a/media-libs/openh264/openh264-2.4.0-r1.ebuild b/media-libs/openh264/openh264-2.4.0-r1.ebuild
deleted file mode 100644
index 5824fdfe525a..000000000000
--- a/media-libs/openh264/openh264-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal
-
-MOZVER=114_2
-MY_GMP_COMMIT="e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7"
-
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264"
-SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz"
-LICENSE="BSD"
-
-# openh264 soname version.
-# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
-#  https://github.com/cisco/openh264/issues/3459 )
-SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc64 ~riscv ~sparc x86"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
-
-RESTRICT="bindist !test? ( test )"
-
-BDEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/openh264-2.3.0-pkgconfig-pathfix.patch
-	"${FILESDIR}"/${PN}-2.3.1-pr3630.patch
-	"${FILESDIR}"/openh264-2.4.0-fix-off-by-one-decode-regression.patch
-	"${FILESDIR}"/openh264-2.4.0-unordered-frame-glitches.patch
-)
-
-src_prepare() {
-	default
-
-	ln -svf "/dev/null" "build/gtest-targets.mk" || die
-	sed -i -e 's/$(LIBPREFIX)gtest.$(LIBSUFFIX)//g' Makefile || die
-
-	sed -i -e 's/ | generate-version//g' Makefile || die
-	sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
-		codec/common/inc/version_gen.h
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
-		HAVE_GTEST=$(usex test Yes No) \
-		ARCH="$(tc-arch)" \
-		ENABLEPIC="Yes" \
-		$@
-}
-
-multilib_src_compile() {
-	local myopts="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
-	esac
-
-	if use arm; then
-		myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
-	fi
-
-	emakecmd ${myopts}
-	use plugin && emakecmd ${myopts} plugin
-}
-
-multilib_src_test() {
-	emakecmd test
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	if use utils; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	if use plugin; then
-		local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
-		insinto "${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}