gentoo auto-resync : 12:04:2025 - 08:44:02

11 files changed, 253 insertions, 7 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bf87e739e34d..dbc8b0dd77e8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 4dff5fa18e34..3a04a4aa849c 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -12,9 +12,11 @@ DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20
 DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417
 DIST fontconfig-2.16.0.tar.xz 1294156 BLAKE2B 48d6fcbfe83f0a4c026a4f90d864a4195805e04cc6dd486bd18d68caa8b55fd51fc37822781298152d363b70dc103c9f8b216f6dc0193b2b192eb35565482ec4 SHA512 90b5c39e5eadc56a9fbddd69b2a6eaa6bf9ee5cda003091b0896e66f87f3c1be8ab4442f54d20fca7232d72f60d9578f5e5ba3f376e39b64b8a2aa7b8f13b062
 DIST fontconfig-2.16.1.tar.xz 1296396 BLAKE2B 10835a6491060bf1ce62fa26c114f226e72081116fc9508df2963741dcd94c77476a7159a9dde065afc3dbeec8fed205c5c0a7040adaefdfd2c1cc5d2952da28 SHA512 50901593e7d3ae1727a9ae3861f2d4074e1f031f8a5ac0cb5ab8db90e35c2a12bd14e9f40185187035887a26c3aca054a751fcf97f5cff63484091aa386fec8b
+DIST fontconfig-2.16.2.tar.xz 1298436 BLAKE2B 24fdbfc573d1a97e08fc159b91e24b77ddeb646e59ab62bb154b18f07383103a8b1e00c635299e1209fb5965dc889b8ab8f5d7228083af1a916978fa69c71136 SHA512 b51ac822f00b41026d74b73aabcdb5ec766b68c478fdb0a50d5ec20c5ad4661ba38417aac088ee86ef097bd1ecda708f818636389acb34502444298a08701c12
 EBUILD fontconfig-2.14.2-r3.ebuild 7192 BLAKE2B ac09bacc348d9b612d5e77941c694cb4b3881463cd9e7f0cbebf34669affc3a217158abd672e1aeae5387db106dc7b6004194436f9786039ca8b72654234c1d2 SHA512 253f4a7030c9838e5c005c371d74e3df659ab7ece6a332f8e04d8d5ac9920f79d49fa4475d89e9323e834f37ae27781e2316d4ac33d4068659ecb29a42943d30
 EBUILD fontconfig-2.15.0-r1.ebuild 7218 BLAKE2B 587db6fb26a8a8fb7c97bc42ebea197f83d7f7add9be0ee3551a8d17786ce9414ca4888db29237a37801d4e0fcc10918312d6fca6111a13b98a61c0b2d9772b0 SHA512 a669483686a18534eaa1c219c819109cb47be30efb9a03a82eb0ebba8098e7437ff862c24be53deb873506f05754af0eeb95284df1b3d780b92e2b94fc43e7d5
 EBUILD fontconfig-2.15.0.ebuild 7145 BLAKE2B 16aba4bc2a195da5d43084008dff53d06626f07f0dd09c824124f59fef89693cb87ed13dbbd1e9271698c7956d9587a99d04488333545c389f2a5abf2a974614 SHA512 273d3c5350a13c0155eadb084c3830865417feb10fd272fa8738cdb65210054351026e848605ab818eaace7a88a08a571596ef57194363a8ea945880aa898a5e
 EBUILD fontconfig-2.16.0.ebuild 7424 BLAKE2B a41f0d418fd85a4a5270ba50ee608a8759f64fa47d7dc2e639d46bb4e024716f4f6f8db878ac7ccb33445df5130892afdc9973ea5e56d999f6c1f0f459d32a59 SHA512 31f66531a33e284ca994bda0615b50a091b29174ecdb4886ecbbafb6b2c5eb1316a11717beb73df6f35a0138c2399e58f76fe2736fa62622a6928a1f5b42cf51
 EBUILD fontconfig-2.16.1.ebuild 7420 BLAKE2B c9527d49f1de3aed858b158268a33d4d8b3886b59e24a41c0c1fa0f1566103cbf87391ff99dd120faaa3ec154541b7d88c1d15b22fbd2a567929bd7bf6438bd6 SHA512 02f47725327bb32a3f24fb660613b31748ffb990c0dd110745c3a766754f5664cd4c183a812c5d455a7579066d2cf31385c82256a251e667abf2758ad5bd7421
+EBUILD fontconfig-2.16.2.ebuild 7420 BLAKE2B c9527d49f1de3aed858b158268a33d4d8b3886b59e24a41c0c1fa0f1566103cbf87391ff99dd120faaa3ec154541b7d88c1d15b22fbd2a567929bd7bf6438bd6 SHA512 02f47725327bb32a3f24fb660613b31748ffb990c0dd110745c3a766754f5664cd4c183a812c5d455a7579066d2cf31385c82256a251e667abf2758ad5bd7421
 MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a
diff --git a/media-libs/fontconfig/fontconfig-2.16.2.ebuild b/media-libs/fontconfig/fontconfig-2.16.2.ebuild
new file mode 100644
index 000000000000..da1f8ee64b28
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.16.2.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit eapi9-ver 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://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PV}/${P}.tar.xz
+	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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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-build/meson-1.6.0
+	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="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
+	# Avoid network access and unpackaged pytest-tap
+	"${FILESDIR}"/${PN}-2.16.0-network-test.patch
+
+	# Patches from upstream (can usually be removed with next version bump)
+	"${FILESDIR}"/${PN}-2.16.0-macro-preprocess.patch
+)
+
+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
+		# TODO: Rust
+		-Dfontations=disabled
+		-Dxml-backend=expat
+
+		# Let users choose via eselect-fontconfig. See bug #900681
+		# and https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/356.
+		-Ddefault-sub-pixel-rendering=none
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+	meson_src_install
+
+	rm -rf "${ED}"/var/cache || die
+
+	# 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
+
+	# 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+	if ver_replacing -eq 2.14.2 || ver_replacing -eq 2.14.2-r1; then
+		if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then
+			einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)"
+			rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die
+		fi
+	fi
+
+	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/opencv/Manifest b/media-libs/opencv/Manifest
index 2add51ace5f8..5d48d7f14051 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -17,6 +17,7 @@ AUX opencv_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch 1158 BLAKE2B c4b1
 AUX opencv_contrib-4.8.1-rgbd.patch 477 BLAKE2B 0120e631199d7099bae437d459f0c950c3cbd11e5f0a900d687ca5aedf1d7602f7faa3be5ba1a9b3e0758f3fd70574450f97bd7429e447df7440d58326ceb99b SHA512 6fe2ef40bf26d40e4f52d84b17183f6e536b2fe51bf65266be6a59865def0b9c074aa5eff58a60d673afec776a7ba03acaba667c917b78751950b77f68759d96
 DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 BLAKE2B f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533 SHA512 85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655
 DIST ade-0.1.2d.tar.gz 117027 BLAKE2B c544b769c7b289342a469950ed047fa13719bafba29aa41167b588cf4f24ed6e596159ec19b65e61e09519a461a5e82ac07d63e2ea493279ee182fe658810abb SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
+DIST opencv-4.10.0-protobuf-30.patch 2746 BLAKE2B 7a532d6b50878b4518b2b4342474b9115cb4d58898d8bd9d300520c9f84fd0bffb97b6796f89dee29b7ec6f9d526dff421dd82d4c034114da65d9900deea4d42 SHA512 b749aaa56426ba452bd0d0b54de2803e2b03ad14c9059ad4e32e689d9d0c9f9c97e5627b5db3204171ae32d8a6b88b036ab7b67093807c98607630d2b05669b5
 DIST opencv-4.10.0.tar.gz 94993429 BLAKE2B f16de226337ce1dabda4a52ae03257b0570af0e6212102c483dce61f2bcee1549150d0016b6ea20bae5d8c838e12db3d54bcb9c2ec5d3164639cdd56818f0b1b SHA512 b4f7248f89f1cd146dbbae7860a17131cd29bd3cb81db1e678abfcfbf2d8fa4a7633bfd0edbf50afae7b838c8700e8c0d0bb05828139d5cb5662df6bbf3eb92c
 DIST opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 BLAKE2B 9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169e2222f6 SHA512 8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3
 DIST opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 BLAKE2B 923dc944edfda4c292d42207290bee414bfe21998f6ffe341ea3b38b6f2f581f3a243653e2c1fd3fa86084068ad6e7acd5ca73ab43094aa15f124d379833a5d8 SHA512 68cce870da0846cbd12a093ec7896b510e34590dad2b91699be1df5d4f72d343f9789d54c45c1b801784f7e57e0e80b19ba65dd99855225da99b4193dae97aaa
@@ -26,5 +27,5 @@ DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLA
 DIST opencv_contrib-4.10.0-3607.patch 29870 BLAKE2B cf43afbd24d0b32817e908c55ac3bf0d5da8b82b2c459bc04ef31414e16285eefe334c46eeee730bd3cad2bbec062f5bc212a82bd7f2ac83baca231d711545d4 SHA512 3fdd08cee6d7da8edf36411f30c8d6230ebd86a1c896a08f1dc86d3a0982e1f1f99797066722bc51ce4b1a60a2db55853c348441b3e6edc0d318fcb7bd5cf944
 DIST opencv_contrib-4.10.0.tar.gz 55387316 BLAKE2B 5d6f884817b6d45b86833fcab1e31cd0fd7be19885698e0aefe300fa570f93c446d7f564567cc08099d559a98a65e9c3dd0fd35ceeca7e0e9a1e56edc74a0fe9 SHA512 480df862250692a97ce6431cba00dbecb70332307a19c1c04aa9d7444e6e74ab4f8c798548dce76d2319a9877624b82e361fb22a71df14b996087ade448be501
 DIST opencv_extra-4.10.0.tar.gz 504349887 BLAKE2B 6e76860beb95cf00698980a19cfd2894e5bfe0d477d94352cbb2ff98688acbc1c404953cbc3baa95453588e7b9063175a067f24006c5d2719a6c75d15f2ef891 SHA512 1a581dad61bc1e5075af5afed2dd3d67793232a9e1219408448d08c518ae714cf0c4d5fec2c25791351a49a0d265fe051ea142b2170f82843e19e82f65abc8c6
-EBUILD opencv-4.10.0.ebuild 42996 BLAKE2B 844b33735f2473a07f341d0ac4d6bf5cc9961f9bab291aa196bece138625d8a02b58ddcea2154ec2d6ef666c3fdc02bb45c437c42a3dfae59aae8836e79bccb7 SHA512 850b2bb590440548a78f04713ef15ac20bc741814350b4ec5038ebf2fbea2d7d033957f83a1f67fd38575bdcb18bcbe10ea68683eb6500191eac5199da7f64f5
+EBUILD opencv-4.10.0.ebuild 43172 BLAKE2B 3967a8f5adb7c22d580a4bc695dfbd9da083a848b2d78e8b783f5ff850c9b13f2a9e3e647af5b76f09c535e410b6a1d8730f21f3d63c70386e082c36d4178a55 SHA512 3e44fb01a410d4d038f15669f4b9f05a36a3e47387fe4fdc7e773e00191a886da96de40c64eb3db2086150f54d0c36cb329a2c10bb735cf1c6ef147423ab3eea
 MISC metadata.xml 3937 BLAKE2B 5c56985141668333faa8e5f6f022207639cf1494bafba5ecfaf920b67a6b5de18d58c8535d2462ea6c973501400e927e5d15b220adc8b17dab78a184304849d3 SHA512 35cf8694e0a6e5a8017cff560238fc064493100da17bd35dc0ea926cd9a8e6de440cf1d860dc29df9b197c2b4f54a1e50152b495580f165ba44805443587672b
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 4bb3003623f7..a1f434194b03 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -62,6 +62,7 @@ else
 		test? (
 			https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
 		)
+		https://github.com/opencv/opencv/commit/1db93911aeb65599f22db47d5d39f75bc94a821d.patch -> ${PN}-4.10.0-protobuf-30.patch
 	"
 	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
@@ -336,6 +337,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.10.0-26234.patch" # 26234
 	"${FILESDIR}/${PN}-4.10.0-tbb-detection.patch"
 
+	"${DISTDIR}/${P}-protobuf-30.patch" # drop in 4.11
+
 	# TODO applied in src_prepare
 	# "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
 
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index dc754026c83a..1e484720857a 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,5 +2,5 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b3773557
 DIST shaderc-2024.4.tar.gz 228004 BLAKE2B c694985ff96659756f70196d98fb48a82c2b05f917b0eb44596558bc17529bad51a282806c973278beb26ec97dd17235659e45b8814c815155448ab8bd7adc94 SHA512 d313af65e76664640020c964cbd7021e3b6f12ea839a58ef67f6052d9af684fc7fd237a687737e6483f24b89d5c85b3e0c0fafeec66b3646f77031cb0d6c9587
 DIST shaderc-2025.1.tar.gz 228284 BLAKE2B c2018b44c9da3744864e6ba86ce147ff5ff931265d4fdd0785b399ad980d86000b5b785be6a859e991e047be994c78259aea253118457a579f3b65f6fc19757d SHA512 3be5ffc10e870e63ac01b68ac27d9bde14d365b0ddd454ca28694198c494be1e4c5c9d3eabace953b2242ef2f66e412318331ca945fef755861dc68c8b439c46
 EBUILD shaderc-2024.4.ebuild 1916 BLAKE2B 1ee49e77aa9071da922a80d0fdb4897cb075c78f8f071f31a5115642aa656ea210232f23bcfded5f242c8374cc1a90a9027c9eec588e8b241b4385254d83cd98 SHA512 31698d2bb94f876459485e58624c86fa521729cf62e1e5a7be9ec6d644123ce08afd491c4101a33bbd1e70167aaba08b72254fdd737eb98aa4e13185af887661
-EBUILD shaderc-2025.1.ebuild 1922 BLAKE2B 25bb988af454e116c0288bebb823d09df3db45818f3121f0fa5a96e1436bef9df5d28f5b82cd31d382fd41b8b06c11909e40b4fa94623ade3492982ee7049b18 SHA512 38e70565465c556fbb34eb0ee4ecd3baa0d49aa581b7529243676673db96236b4c4edeb601a82524976f616f8b218a1ecd3bf499b98da044820c4cf4a9390699
+EBUILD shaderc-2025.1.ebuild 1917 BLAKE2B dd95adcfd8f1e104c250e0d3de28477e702afeade3ae3b42e495ce1f862c34add882c18d9865d260424176228e0aebe192d91bc931a8ae0a449553bff7b57475 SHA512 28defb7a5f4ed6bcbd67ac6f2213828e9116e1155e684342cba764414b51b9469d3b0491ee7622278fee49dcae2ebed1dc12bc67d8bd46fdc94f768e794307ca
 MISC metadata.xml 328 BLAKE2B 90488589d89b69a7840eea25c4456ce0d1032d77c99dc6cbafa830d2d274e72b5075b3eaede07ae6b07f699fdbb8d894dd82beee25e5172fdd5171c753619b43 SHA512 ca9eaa48af61542d9110b28954241f98b19a91fe47483cd80ccf7f761302fc23f5455379958d535431292c70dbc27c6347185208245b738bd9bcdbf3ebaeba8b
diff --git a/media-libs/shaderc/shaderc-2025.1.ebuild b/media-libs/shaderc/shaderc-2025.1.ebuild
index a4944cd43652..5ac8e0eca2c3 100644
--- a/media-libs/shaderc/shaderc-2025.1.ebuild
+++ b/media-libs/shaderc/shaderc-2025.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 397748782955..0d2548829cc3 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-layers-1.4.304.0.tar.gz 5940153 BLAKE2B 68e4f944383c4f4a574c83735c36b8521fbde4ecaf346cf99c1b925358b4178bacaca75bb5b5fb0684ed15255c331c777bdea44ae7a62def20998971f2d968d9 SHA512 1b13ab2d196b5a9c5e85d0d8679ba0ca03b0c0c18f456ac9fb4314cd283b834883d4a89421a32627e266022dbd1b6684955799906c874e8c325c404738d49a4c
 DIST vulkan-layers-1.4.309.0.tar.gz 6035572 BLAKE2B e8d5d8b0bee9da0fce3b784224727026116320dfc441479af5672c853ca1bddab00b93c7766ab9e050a85293dfa9eead10a10f0cc803ace90520f0fbe4a5fce8 SHA512 453fb519e2b4e035e82f9e372e235e6870eff7e32938fc903a3ee35354f4a535393f9f45264518e8ff5113ce3d59450668253b8d9b833c6f0669b7a1373cb7cc
 EBUILD vulkan-layers-1.4.304.0.ebuild 1641 BLAKE2B bb538a15831defc3c49230d1b137f5152056dd7f06e42beb2ecff3a1a5ab17c6f96c14cc1fcf46f35bfbe906e341267443fe6f22f72d6da7d49af8c2953755d2 SHA512 84332e12934d243c275f14549010911c443b730363a93a7a0518ce2275a54c0001159d04bc6ad35ab4d1a0299302d4fbbfcc0bc2738b3e7b68c084c313f83387
-EBUILD vulkan-layers-1.4.309.0.ebuild 1647 BLAKE2B 86d8568a4c6884860c6cc8f33e019e2833ec733c8f239e64c54f87617406208600f5e81c3040978dec6297de291fc3bc0ca8644807b8339360bae90e0d64b14c SHA512 0d1475694c0a5afaaa8274086d957f0f253c8fcc675d582d824eab87ba0cc6b6feb1b094263eac95ef63216bdb51c26389fea609fac5bb3c7f0afd98aa4429e6
+EBUILD vulkan-layers-1.4.309.0.ebuild 1642 BLAKE2B 3e9253df2783ea759d52151d4506e253862e042790a2b3c136f4eebd693284f5294f8ffed29fe357323b5c1a93730d98cbc6f3660e4470db3c33ff4109a4670e SHA512 08ce602788c373bd350e45b99d253fbcbadf32e53b4ecda1560085543e3ff3e857cdca124a9a3795f637513e3576f3d647416c55dad9db20d917bf205990da77
 EBUILD vulkan-layers-9999.ebuild 1647 BLAKE2B b309abf84fc8299fce6289a6d1285d6b8beb06cc77ac4b07eb48a9cb6aada2d7dd30ba9d574b1eb325d23aa23d5b255bc679745675c7af01a0075701738f8cfb SHA512 b1bca6852c02f377db0c27991c46d307c9256ee414d22f4b607e05f1bb8fdca264cbf99802b5bdd1b3468257141d215c1ec7f7f82e305baff539e76176822e09
 MISC metadata.xml 350 BLAKE2B 41220dc2f9acacd1ca6d16d8cf6beb8d7cb73ea3ee7c57b0b809cd1ad72b6c867da471c4c3e7cb1cee80233a105c2854cf54cd118e566b3dbc1a48418177513d SHA512 c2f13683f0ffdde16da90ec4852c1404d6eaa4cd738772b5d55f375713c598661d1f7b2b210f9127af794d19920412877f584f024d247f4e15ff56c641c79469
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.4.309.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.4.309.0.ebuild
index fcdb3b98ed3a..cb55f78fd726 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.4.309.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.4.309.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index e455ce19974c..cdc8c3114985 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-loader-1.4.304.0.tar.gz 1756893 BLAKE2B e5b28b37a4d86ff803b228515e38d96ac078d878f02afdc236722ccd0afac85f254347a22a5a21c7cfe997d1a769eb2b561953a7097b6632c0c7026b950b99fb SHA512 331792dab0e321c8d9ca266a6675ae431ead7babcf59da6f8ca14bacbfb8933c2d0c65dd05545b90a972c8c2bb811ba2b68c88b641f0469850d440d791dae443
 DIST vulkan-loader-1.4.309.0.tar.gz 1761949 BLAKE2B 1edbd34ba914beaedb3c6eb48863241c3d7a09147a534a5160f85c251bf4165579bf0c929843aef915297208f7f00244b8f7206b078be08cd845e4232837ef79 SHA512 f77d42639037b79eeeba4007eded039527a345cd39ed1b6a3c5e786a418c481811a72c43cb24821268c7bc57c39941cfe5511e86362ac892c51d45a062dc0e2c
 EBUILD vulkan-loader-1.4.304.0.ebuild 1566 BLAKE2B c34c3ef604bc7e5fda9621a44ee6d812d1119e9dc3dcd4e7fd8f7f95471f02c0e943c4e1fe79f0e1f2877aa5ee3bd02e4fc046001d6fc43c2fde4393a2fc3f9d SHA512 cd74f608d7df7163cced1ddfa6d9b2297b356fed4f7779dc4048d1e8ffaa92042312b6d275ab5dd2e00bcf9fba3d792b19070da11ec6448ec7ca889b4aa95b87
-EBUILD vulkan-loader-1.4.309.0.ebuild 1572 BLAKE2B 3104aadac501ffecfda8a52e274ce3783deacaa8f6aa3d86ea0d89ec8886792e9df400920afbd0258b436726eff22234174ef916378e55c8f65acd89cebfe341 SHA512 009460b66f97e47087d9fd4e5289d827213c2df61215a37a75fd0ca97d1eb9d6db3b9fd541ec65826a61a670d38db29df35b07c00c9ff24861fd09080f687393
+EBUILD vulkan-loader-1.4.309.0.ebuild 1567 BLAKE2B d06b72100b88ab3766d33f770cb36ad21794ad0224282ee224c65ebd0dc6a55d8e5dbd192baa8225bd01bab2073e2ddbc35db6b10fd22d0bcfa6bae44f389030 SHA512 216984a26c5a7150372c6e2e20bbec9383e24d65ef6a9fb2524830aca1a7208a7bacdb53cee7c5ec4aa5cd8b94aef5ec12093b5121c4149c9c2a4366ab13649c
 EBUILD vulkan-loader-9999.ebuild 1572 BLAKE2B 023bfa83a067e51f5bd6fcf5da76c60bd5393fa4ab48f78d796363ead0e10b8fcccebbac0ba2206484ec9983b2c0a1c5f6ed88495470fef3687fe66221e9d129 SHA512 a2a7f4b8919152671c0f8af073d0bb41633984ee9cfec23d09146bc5175dd9a131aea0069bff6382016878933a33e2211403888476fbe31e31beb726e3ce9a0a
 MISC metadata.xml 429 BLAKE2B a0971a1631dc09134ba547210d48115cc0ad850414badc232db88d74f97da5a9c8d181ec489742d6c142ebffead1f3535d195ea15e12651c840f634bccf3bb67 SHA512 0c54fbb7b8147877cdeb919784db42cb12f7fc36286e7c3d83783493ad67e08e2486cb98c77f7ba201ac12e35678fdb53797acbd0f4f6a8b6a9e63f29573eedc
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.4.309.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.4.309.0.ebuild
index 35b52db1dcba..bb115b8a6d5e 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.4.309.0.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.4.309.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi