Adding metadata

author: root <root@alpha.trunkmasters.com> 2026-09-14 03:04:42 -0500
committer: root <root@alpha.trunkmasters.com> 2026-09-14 03:04:42 -0500
commit: d09313d7f2546bde376a20ff739a5e90cb229e25 (patch)
tree: a409e87d73f1fd8dc145a1210d1a44bb1b1982c7
parent: 98066fc1faacac449ddea472e456f23ad0e2a515 (diff)
download: srcux-d09313d7f2546bde376a20ff739a5e90cb229e25.tar.gz
srcux-d09313d7f2546bde376a20ff739a5e90cb229e25.tar.xz
srcux-d09313d7f2546bde376a20ff739a5e90cb229e25.zip
279 files changed, 6009 insertions, 1328 deletions
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 4f8ead016384..65126527af7f 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,3 @@
 DIST orca-47.5.tar.xz 3394148 BLAKE2B 8c7c20c48fc681bec42fbf17f08a39ac2c57b6d1804fa6121bd8712a712219247991b59c0d1e125aac6f3ddd891234b641172d8374d6077d008b3fabbb71246c SHA512 01aa17ae47ba60ffdfaa00af16ee0df0e128a3d34d3d0bf75f030970289c7cd860b16c3852699ecc4269d3124a9127d34abde4c4b4ffe8b8e26a6da7ce0a9c4e
-DIST orca-49.5.tar.xz 3514924 BLAKE2B 659974487f065fb4373e3c8150dfcfa314139f108b1a699422709d2e2551374931d02400e32c8fd1a19554fd3b7f190f6b5eebff2a487d092378937bdba947ed SHA512 dca938d10552c41404d8f6e2b772846749be15e01af4d7b2104d79eaa983c6909273ba10e528d6534c9425d82411fb268681ab2a0d9b8b7db3475245460e3e79
 DIST orca-49.7.tar.xz 3641960 BLAKE2B 3c41572e600a3b24a11f6d4fad72159828d58f0309d61fca23b22e49f579721a9d3cc9b78e2645b92dad146bf0e68501098184a86458653e72022d2196bdd6ae SHA512 8e07841643b9431070e5562491595dcb638e751080ed53a8d090756dac4dc7ad4969bd879012a854db11558c5afe2159d20aab8fe67732d8981a1ff42b5c93e3
+DIST orca-50.2.tar.xz 3718716 BLAKE2B 3cab038389b962ea487bfe711d8f0d21a23e218436e07863103a19f27efd1f82fc97986a87d9b4bf6cac2c41bc14f65a3d37d7fdbfe00b341a1366f0001c581c SHA512 66ee5e6baae0ba37167ce08a17645d3163570575df83ed07f7a34c1ee433a3b958406f16f6accf12fbc36ffa20d99914dacfe34ee17cfe569f4c99ff31260012
diff --git a/app-accessibility/orca/orca-49.5.ebuild b/app-accessibility/orca/orca-50.2.ebuild
index 19bd4b57fa23..e5fe42cc7fcd 100644
--- a/app-accessibility/orca/orca-49.5.ebuild
+++ b/app-accessibility/orca/orca-50.2.ebuild
@@ -2,23 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{13..14} )
 
-inherit gnome2 meson python-single-r1
+inherit gnome2 meson python-single-r1 virtualx
 
 DESCRIPTION="Extensible screen reader that provides access to the desktop"
 HOMEPAGE="https://orca.gnome.org/"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="+braille test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-core-2.50:2[introspection]
+	>=app-accessibility/at-spi2-core-2.56.0[introspection]
 	>=dev-libs/glib-2.28:2
 	media-libs/gstreamer:1.0[introspection]
 	>=x11-libs/gtk+-3.6.2:3[introspection]
@@ -64,7 +65,7 @@ src_configure() {
 
 src_test() {
 	# test_structural_navigator needs more time
-	meson_src_test --timeout-multiplier=10
+	virtx meson_src_test --timeout-multiplier=10
 }
 
 src_install() {
@@ -72,3 +73,13 @@ src_install() {
 	python_fix_shebang "${ED}"
 	python_optimize
 }
+
+pkg_postinst(){
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/awscli/awscli-1.46.0.ebuild b/app-admin/awscli/awscli-1.46.0.ebuild
index 9a90371bff57..0f645e277a69 100644
--- a/app-admin/awscli/awscli-1.46.0.ebuild
+++ b/app-admin/awscli/awscli-1.46.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 # technically they bundle an older version but let's keep it in sync
 # with the latest, just in case
diff --git a/app-admin/openvox/openvox-8.27.0-r1.ebuild b/app-admin/openvox/openvox-8.27.0-r1.ebuild
new file mode 100644
index 000000000000..3bde779b8b59
--- /dev/null
+++ b/app-admin/openvox/openvox-8.27.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2025-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33 ruby34"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="OpenVox agent and apply tools for Puppet-compatible configuration management"
+HOMEPAGE="https://github.com/OpenVoxProject/openvox"
+SRC_URI="https://github.com/OpenVoxProject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="augeas diff doc ldap selinux shadow sqlite test"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby
+	dev-ruby/deep_merge
+	dev-ruby/fast_gettext
+	dev-ruby/getoptlong
+	dev-ruby/hocon
+	dev-ruby/json:=
+	dev-ruby/locale
+	dev-ruby/openfact
+	dev-ruby/ostruct
+	dev-ruby/puppet-resource_api:2
+	dev-ruby/racc
+	dev-ruby/scanf
+	dev-ruby/semantic_puppet
+	virtual/ruby-ssl
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/json-schema:0
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+		dev-ruby/scanf
+		dev-ruby/vcr:6
+		dev-ruby/webrick
+		dev-ruby/webmock:3
+	)
+"
+
+RDEPEND+="
+	acct-group/puppet
+	acct-user/puppet
+	!app-admin/puppet
+	!app-admin/puppet-agent
+	>=app-portage/eix-0.18.0
+	selinux? (
+		sec-policy/selinux-puppet
+		sys-libs/libselinux[ruby]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/openvox-systemd.patch"
+	"${FILESDIR}/openvox-spec-load-path.patch"
+)
+
+all_ruby_prepare() {
+	# RDoc::Parser#initialize signature changed in rdoc 6.4+ (4 args vs 5)
+	rm spec/integration/util/rdoc/parser_spec.rb || die
+
+	# puppetserver_gem provider tries to read /etc/puppetlabs/puppetserver/puppetserver.conf
+	sed -i '/puppet_gem provider_command.*list local gems/s/^\(\s*\)it /\1xit /' \
+		spec/unit/provider/package/puppetserver_gem_spec.rb || die
+
+	# TODO: investigate why these are failing
+	sed -i \
+		-e '/ask the provider whether it is enabled/s/^\(\s*\)it /\1xit /' \
+		-e '/enable the service if it is supposed to be enabled/s/^\(\s*\)it /\1xit /' \
+		-e '/disable the service if it is supposed to be disabled/s/^\(\s*\)it /\1xit /' \
+		spec/unit/type/service_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# agent systemd unit
+	systemd_newunit "${WORKDIR}/all/${P}/ext/systemd/puppet.service" openvox.service
+
+	# tmpfiles
+	newtmpfiles "${FILESDIR}"/openvox.tmpfiles puppet.conf
+
+	# agent openrc init
+	newinitd "${FILESDIR}/openvox.init" openvox
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs{,/puppet,/puppet/ssl}
+	fowners -R :puppet /etc/puppetlabs
+
+	# ext and examples files
+	local f
+	while IFS= read -r -d '' f ; do
+		docinto "${f%/*}"
+		dodoc "${f}"
+	done < <(find ext examples -type f -print0 || die)
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "OpenVox is a community fork of Puppet."
+	elog "All existing Puppet documentation and modules are compatible."
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+}
diff --git a/app-admin/puppet/puppet-8.10.0-r2.ebuild b/app-admin/puppet/puppet-8.10.0-r2.ebuild
new file mode 100644
index 000000000000..1cff290e2bf7
--- /dev/null
+++ b/app-admin/puppet/puppet-8.10.0-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby32 ruby33 ruby34 ruby40"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://www.puppet.com/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	hiera? ( dev-ruby/hiera )
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-4.4.1
+	dev-ruby/deep_merge
+	dev-ruby/concurrent-ruby
+	dev-ruby/puppet-resource_api
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? (
+		|| (
+			>=dev-ruby/rrdtool-bindings-1.2.23
+			>=net-analyzer/rrdtool-1.2.23[ruby(-)]
+		)
+	)
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/puppet-openrc.patch
+)
+
+all_ruby_prepare() {
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+#	"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 1a24476cc239..97199a268445 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1 +1,2 @@
 DIST unrar-7.2.7.tar.gz 270458 BLAKE2B 823f6d76dd81679da571310f4909404b3f684e632aeea52b1daf1d846a765e289a295e650f270c55c763d72671595c1258c1c090c43b0b7834371b978091a40f SHA512 d0bd26a03eb2961a792fd2c8983abcce46cea22d66b2a190f5b0defa95c457aaf460ddfe17b3f83d48de90faf3f5126ebed4088172be6ec973099dfc5461fcb7
+DIST unrar-7.3.1.tar.gz 273526 BLAKE2B 6dcdbb57600984d022655d6df3cc3656db650c14fa1d4c9ed89c827cbf002e105083949b34ba3d2dd6e0c4b1c8584001adbcd206a0099c0f02646df657f62c26 SHA512 f772ef9e67d4828eef1ff7270ca875e9b0447f146b9e609c50594bb46754e7cce9e7ad8c05f6c026d5ba430c110483bfbc880ad2fbd081cff7939ee5ea21a521
diff --git a/app-arch/unrar/unrar-7.3.1.ebuild b/app-arch/unrar/unrar-7.3.1.ebuild
new file mode 100644
index 000000000000..6a6212b2451c
--- /dev/null
+++ b/app-arch/unrar/unrar-7.3.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/7" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	# unrar doesn't officially install headers, but unofficially, software
+	# depends on it anyway. There is no standard for where to install them,
+	# but the most common location (shared by nearly all vendors) is "unrar".
+	# FreeBSD alone uses "libunrar". Gentoo formerly used "libunrar6" and
+	# had a compat symlink for FreeBSD, then passed the compat location in
+	# ./configure scripts e.g. for sys-fs/rar2fs. Software in the wild
+	# seems to expect either "unrar" or "libunrar".
+	# See: https://bugs.gentoo.org/916036
+	#
+	# We now use the "standard" (hah) location, and keep the compat symlink but
+	# change the destination. The version-suffixed location lacks utility, but
+	# we would keep it if we could, just in case -- unfortunately portage is
+	# buggy: https://bugs.gentoo.org/834600
+	#
+	# Hopefully, no one has ever actually used it and therefore this does not
+	# matter. The odds are on our side, since it periodically changed location
+	# arbitrarily.
+	insinto /usr/include/unrar
+	doins *.hpp
+	dosym unrar /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-crypt/p11-kit/p11-kit-0.26.4.ebuild b/app-crypt/p11-kit/p11-kit-0.26.4.ebuild
index f5f435b22aae..e03d891e6e6f 100644
--- a/app-crypt/p11-kit/p11-kit-0.26.4.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="+libffi gtk-doc nls systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index 5e51f0976a5d..f291cd131851 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,2 +1 @@
-DIST aspell-pl-6.0.20260601.0.tar.bz2 666096 BLAKE2B 6837e87d0b717298a016da9638af8d8859a04d6d927f003bc0077700de0b827642765758893d8e583563deafb3b290a2a1ba4ea847224f900243f77e440396d2 SHA512 2576e8534dbdd31be4d2c11dd520d77712fe6a6bbaf0e61fac3b3c43d2954cc592f6d3b6caa2c9d73a05f8243e4358fd03317a8f69a5c8e28637271a24c4d14f
-DIST aspell-pl-6.0.20260820.0.tar.bz2 666083 BLAKE2B f0abcf4664dbf92dd60b830e509050582acedadc06be143d63290c1844a0d0e532494d1c433a2095b20e595119c1937cc59a91b62720aff4838b7f9d4855070b SHA512 9bbe78ef4e8986f37b108e4bb8980e8f92f7f1b5f64fc60fa67059a1109d3316493d8d30ae5da983667b2e35f9b6287794df67cda2794b53d1a2d3cd1a612a40
+DIST aspell-pl-6.0.20260901.0.tar.bz2 667392 BLAKE2B ff913ac77ad20c02c053b7bc3e7be13e6bfefdadd45ec22415ba324e6971360b7bb018eecec6e88fe64b5dc04eeb41ec24fa947b640bcff995cbea77b745ffb3 SHA512 1e7c72fa8cb2c24c3ec9c3300ddcc1e76b75e1fcaac2c76d66707917dcc717d1286a155f22d1abbc89ec0a724b5292eb4ed2e10c101d599753073597ff3951ef
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20260820.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20260820.0.ebuild
deleted file mode 100644
index 03b6df97a842..000000000000
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20260820.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTE: bump togeter with myspell-pl
-
-EAPI=8
-
-ASPELL_LANG="Polish"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-$(ver_rs 2 _ 3 -)"
-
-HOMEPAGE="https://sjp.pl/sl/en/"
-SRC_URI="https://sjp.pl/sl/ort/sjp-${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1 Apache-2.0 CC-BY-4.0" # upstream's order
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20260601.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20260901.0.ebuild
index 80c377766d4f..80c377766d4f 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20260601.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20260901.0.ebuild
diff --git a/app-editors/joe/joe-4.8.ebuild b/app-editors/joe/joe-4.8.ebuild
index 16efc5df0c72..9876e19fbf51 100644
--- a/app-editors/joe/joe-4.8.ebuild
+++ b/app-editors/joe/joe-4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-emacs/forge/forge-0.6.7.ebuild b/app-emacs/forge/forge-0.6.7.ebuild
index cb199dc3affd..50a79036d02a 100644
--- a/app-emacs/forge/forge-0.6.7.ebuild
+++ b/app-emacs/forge/forge-0.6.7.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 60aa1b688ada..21b36df0272d 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,2 +1,2 @@
-DIST faudio-26.07.tar.gz 1136655 BLAKE2B e8892f98d6d0caa59076b0d35728ae2b1a35ced0c886b18636ec1b42c5dc52f237d6a255d8138d617ac20775d9540276370fec19fcd5a3e7a58e56e2de22d46e SHA512 18ffeab2f1f9bdb30119417557c9203f50eebe37ef590dac0bf3c079bde5161246c4b06e7b106e322d153290832a6e8794835c2b4296a86fc2f3c81c52f10400
 DIST faudio-26.08.tar.gz 1137124 BLAKE2B 3fb2794078dad503e8bec646b2607f100e7bc61630ba3528fd695987f5950c0d52691f54306ee7a1356bf3a7732c4dc5a59ec3e9786e761d0e01ef2a677ed1cd SHA512 07d262b2cb000b8d1d0419e38c3d6692c9eed4d01f0324b102a97f55b4830d330359b0d60456601aab6e22e80ebd4cd1badc71654512aff90d7f1f0a1ab8816d
+DIST faudio-26.09.tar.gz 1137246 BLAKE2B 53436c76c8c9fb82aed2d72ed36e597044da734c6fcf016e690ff4f4c62e95f4c744959f9bbe5f2234672662aec2a3b661440eb0719b97800ff99d142e78db27 SHA512 94a123767375a460e1cd87c582ec878adafa2cb976d9fb73f445e022ac9baa00bb2333c2f9c647911f0a6a0dcbb821cbe3e9c411f2bd77585121f1205a01fcc4
diff --git a/app-emulation/faudio/faudio-26.08.ebuild b/app-emulation/faudio/faudio-26.08.ebuild
index 70f5ae591a4b..b29949c0a633 100644
--- a/app-emulation/faudio/faudio-26.08.ebuild
+++ b/app-emulation/faudio/faudio-26.08.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/FAudio-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug dumpvoices sdl3 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/faudio/faudio-26.07.ebuild b/app-emulation/faudio/faudio-26.09.ebuild
index b29949c0a633..70f5ae591a4b 100644
--- a/app-emulation/faudio/faudio-26.07.ebuild
+++ b/app-emulation/faudio/faudio-26.09.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/FAudio-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dumpvoices sdl3 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/ibus/ibus-1.5.34-r2.ebuild b/app-i18n/ibus/ibus-1.5.34-r2.ebuild
index e612c836e824..1af5d6295872 100644
--- a/app-i18n/ibus/ibus-1.5.34-r2.ebuild
+++ b/app-i18n/ibus/ibus-1.5.34-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-office/merkuro/merkuro-26.04.3.ebuild b/app-office/merkuro/merkuro-26.04.3-r1.ebuild
index dc752780abd9..29976a1d4f68 100644
--- a/app-office/merkuro/merkuro-26.04.3.ebuild
+++ b/app-office/merkuro/merkuro-26.04.3-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="6"
 KEYWORDS="amd64 arm64"
-IUSE=""
+IUSE="plasma"
 
 # All of the tests involve interacting with akonadi right now (as of 22.04)
 RESTRICT="test"
@@ -58,6 +58,7 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	plasma? ( kde-plasma/libplasma:6= )
 "
 # Qt5Compat.GraphicalEffects usage in multiple QML files
 # qtlocation is needed at runtime only or fails to start
@@ -69,3 +70,10 @@ RDEPEND="${DEPEND}
 	=kde-apps/kdepim-runtime-${PVCUT}*:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package plasma Plasma)
+	)
+	ecm_src_configure
+}
diff --git a/app-office/merkuro/merkuro-26.08.1.ebuild b/app-office/merkuro/merkuro-26.08.1-r1.ebuild
index 93a8674c75fd..eda867615a91 100644
--- a/app-office/merkuro/merkuro-26.08.1.ebuild
+++ b/app-office/merkuro/merkuro-26.08.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/merkuro.calendar/"
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64"
-IUSE=""
+IUSE="plasma"
 
 # All of the tests involve interacting with akonadi right now (as of 22.04)
 RESTRICT="test"
@@ -57,6 +57,7 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	plasma? ( kde-plasma/libplasma:6= )
 "
 # Qt5Compat.GraphicalEffects usage in multiple QML files
 # qtlocation is needed at runtime only or fails to start
@@ -68,3 +69,10 @@ RDEPEND="${DEPEND}
 	=kde-apps/kdepim-runtime-${PVCUT}*:6
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package plasma Plasma)
+	)
+	ecm_src_configure
+}
diff --git a/app-office/texstudio/texstudio-4.9.5.ebuild b/app-office/texstudio/texstudio-4.9.5.ebuild
index c53398798987..cac18c5f4c1e 100644
--- a/app-office/texstudio/texstudio-4.9.5.ebuild
+++ b/app-office/texstudio/texstudio-4.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/texstudio-org/texstudio/archive/${PV}.tar.gz -> ${P}
 # CC0-1.0: Colibre icon theme
 LICENSE="GPL-3 MIT LGPL-2 CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="qtermwidget video"
 
 DEPEND="
diff --git a/app-text/qpdf/qpdf-12.4.0.ebuild b/app-text/qpdf/qpdf-12.4.0.ebuild
index 4ddf121ea89f..995ffe5f2f54 100644
--- a/app-text/qpdf/qpdf-12.4.0.ebuild
+++ b/app-text/qpdf/qpdf-12.4.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc examples gnutls test zopfli"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-dotnet/csharp-gentoodotnetinfo/Manifest b/dev-dotnet/csharp-gentoodotnetinfo/Manifest
index e46da8c667d1..49207b5247e5 100644
--- a/dev-dotnet/csharp-gentoodotnetinfo/Manifest
+++ b/dev-dotnet/csharp-gentoodotnetinfo/Manifest
@@ -1,5 +1,5 @@
 DIST coverlet.collector.6.0.2.nupkg 2243339 BLAKE2B 6c169dee185f31b9b47b2ab042fad4f2386c6b8e5843f208d3e7d878820483d9387963ec61a90ab4c29512889f1a94d9c918d4da450040fdd9e226bafa638cf6 SHA512 9060ec586906992aa906154d05e8af0592b145d46b40cfbbfc097236e81faf48d9ec6a437c5642cc094f7eaff2642dd036d58f7823c65cdf10e13705e1a3d904
-DIST csharp-gentoodotnetinfo-2.0.0.tar.bz2 26408 BLAKE2B f5a567e2e4386d7a2371b62a356c0c34d388ea5248744a4c595ade4cf868ebfd5286e2ce3a704f2871af691dbd170ad3a9f7d98b029b4d78ac67c4766c209722 SHA512 0bd9cdb0aebdae45f39b16ca2e6cd6dc616ecc98f50e22e95ef87b64926e9dead39f395bb51b327eae7a81278a005bf9a48f6ffa29141035c3905a9f2b715b86
+DIST csharp-gentoodotnetinfo-2.0.0.ggo.tar.bz2 26408 BLAKE2B f5a567e2e4386d7a2371b62a356c0c34d388ea5248744a4c595ade4cf868ebfd5286e2ce3a704f2871af691dbd170ad3a9f7d98b029b4d78ac67c4766c209722 SHA512 0bd9cdb0aebdae45f39b16ca2e6cd6dc616ecc98f50e22e95ef87b64926e9dead39f395bb51b327eae7a81278a005bf9a48f6ffa29141035c3905a9f2b715b86
 DIST microsoft.codecoverage.17.12.0.nupkg 9421347 BLAKE2B 46afd5c4c8352005700e0541dc87c2ac76d8726f60589ec9a84d6fdd52eb28bf7d4e33b032daddecd0dca9bf6854efe958dc903ef2af8be63eddc08db301e60d SHA512 3ce06a83bf3caeb2c0a6f9dccbcaefb72277ca7b01754d3f4865170febcfab244333f69425b3d95b1d35a9a9462512b519c02b4a4bbc40377d01531ad1390290
 DIST microsoft.dotnet.platformabstractions.3.1.6.nupkg 72146 BLAKE2B 08d852b5e6558b499f2d780284aa747e5cf39886d86fa378128fae9f71741bd57c5bc75c0077948f193b7e8ea03a520d8ef3bd3b4fc80779adb4a84a4b44fe8c SHA512 55b87f544874686bed96889953b7e99e43426b79b0fac31cc452e0f4a27ca5cc08522c0ac967bf9df649f7c04137a5e2553d134ad79d5c1e69578367c2b4b4c6
 DIST microsoft.net.test.sdk.17.12.0.nupkg 34293 BLAKE2B 30424196c85fb2d0fe44d013e21df5e94d7314148d54e626930c0a177c4002cffc5186bd1c477023e9c9d4371f19be1aeb20ea93779b5217314eba29b8f3d8b1 SHA512 8467fc23cfb2a35e5eb5abe831dfbb39770e1bafc6ec760f0c4260e5a42784ccecc5a529abeb9d359cd2c6610df6b19358c64e01515cc8d5cd2fb601b0de9c87
diff --git a/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.0.0-r1.ebuild b/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.0.0-r1.ebuild
index d05f47487e7e..a3ac12b3c2f8 100644
--- a/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.0.0-r1.ebuild
+++ b/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.0.0-r1.ebuild
@@ -31,7 +31,8 @@ if [[ "${PV}" == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/dotnet/${PN}.git"
 else
-	SRC_URI="https://gitlab.gentoo.org/dotnet/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	SRC_URI="https://gitweb.gentoo.org/proj/dotnet/${PN}.git/snapshot/${P}.tar.bz2
+		-> ${P}.ggo.tar.bz2"
 
 	KEYWORDS="amd64 arm arm64"
 fi
diff --git a/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.9999.ebuild b/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.9999.ebuild
index 63a497be4406..fdfe92e89f3c 100644
--- a/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.9999.ebuild
+++ b/dev-dotnet/csharp-gentoodotnetinfo/csharp-gentoodotnetinfo-2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,8 @@ if [[ "${PV}" == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/dotnet/${PN}.git"
 else
-	SRC_URI="https://gitlab.gentoo.org/dotnet/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	SRC_URI="https://gitweb.gentoo.org/proj/dotnet/${PN}.git/snapshot/${P}.tar.bz2
+		-> ${P}.ggo.tar.bz2"
 
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
diff --git a/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest b/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest
index 0073da38f520..1dfcab95b6fe 100644
--- a/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest
+++ b/dev-dotnet/gentoo-dotnet-maintainer-tools/Manifest
@@ -10,7 +10,7 @@ DIST fsharp.data.json.core.6.3.0.nupkg 71606 BLAKE2B 7ae58b0addc294a771993ba5dda
 DIST fsharp.data.runtime.utilities.6.3.0.nupkg 104522 BLAKE2B 62ca50953fd504d0973bbef224a48c814e6621a14052808abe392488f97b2b79206cabf30a6b43165bead50f8e1d21e7239729321c42e8c4385883f5a3818aee SHA512 173f3ec6809a36f77a4204ad0f8fe9d007dce22775beadea5a03f3e52affaede0a7852434f9794a507ba22db622f1fb9462506f6d56c083cfcfa9df8b74ed263
 DIST fsharp.data.worldbank.core.6.3.0.nupkg 56347 BLAKE2B 5dc760236e85ef1755a2e10e3060f46dd32260bd0b7545bdda37b49ae313ed4e33b3e91cd84c749249bcf89ecddd02d82d96539e3bfd0f9271a35491e6ea3685 SHA512 cdcbc0373689808fba68c8cbaf91511a16fc75332f68ff2ca981854a35b1127c55bf8266c436d4f477819db92f97c497c9939ef6bed0f4c0033b5db958496faf
 DIST fsharp.data.xml.core.6.3.0.nupkg 64478 BLAKE2B eaeeaf5d0f31a9a7694bd02732e748be62f717e5cdda2f9f02370c0b394dc0dd47e75058887d90c44ace7e9117393667f3a8a31b00035903b9ed0aab7b7cbb43 SHA512 2ceb6130b8c3fe5f18a3a732876508c00c27468b48cff740143754bf894b8827bf3e48d905a4956201d95d328f64106950c4b18aed77a09ccc23db0ab63cdbb8
-DIST gentoo-dotnet-maintainer-tools-3.0.0.tar.bz2 491656 BLAKE2B 32b2e263beed68bed1c471fee18b47769ff96d75d4ae61b569683ab74e5fd295d759562bca0b0a83178a3fffdf6e849977f6e2b9ed973dbe698a728cde7ba2bc SHA512 927e1a61e43bc6f7ad6980e4f6c10e01cdd8551f6c5941c3b7debfc65b37a9181448706f53211a5fc7c712fbb146b828cf271a5a5f42152636662e19b4a475b4
+DIST gentoo-dotnet-maintainer-tools-3.0.0.ggo.tar.bz2 59256 BLAKE2B 4ac3e345e54dea74e33c4092e26ae051edcd7b547722b645d1c26112b760508b4bfb56996de2d5defcdf5f8a2ad7c3d7736bb57a9c3afa9924a855f2b88fcbb7 SHA512 b352716ee3f915ccad9e2f197957e8920e91643fc6471eba9d2fbb8f931b51400332482c37deaa6e97aa1eaeea53ec621a418bfe7da2c08708346b672b5e2168
 DIST libgit2sharp.0.29.0.nupkg 720966 BLAKE2B 7fdb41e1654d2f572aabbe8141e8d39205437dc2e3bcd0f1dae3514b8c3bc2939fd418b44fb98f73d05b0a38b237b16bdc955343b0d05763a2db474477bf2e1f SHA512 add84f8c68c11e46247370cd3b506627326f26d1c9c5e23643e167875ffdf21ec90a5bb915d043e91a76a2820798db6ec13cdcb613a92b75d732a2a901b8b8a2
 DIST libgit2sharp.nativebinaries.2.0.321.nupkg 7966938 BLAKE2B d76dfae54215e463c3fc7ed652b93cfe8cf6bd9bd654eb70c443b226dcf9fbf5642949b5278b09bfa2abdad4707c9a22813a61098eef07af6c461f0e14237d0c SHA512 3b975be9c20bf4c1c637fefa1728443e5729a14c874b93818af0f177650d5e904bb8d09bb8fb9c490ee37391de96ddbabcda05fc4de519a990ceb79831b31d96
 DIST microsoft.netcore.platforms.1.1.1.nupkg 31072 BLAKE2B 095f6e8b48a99353061a021ac9a07ec161e28602338d7fa3624891696e9b91642034f968d9e1b77c74ced46628cad45f47cc24189dc12479d1bee92c93eb4cec SHA512 9835090f578b5c8ce6527582cd69663506460e9fdc5464fc2b287331c24d9369e57dd1543a865a8bd89d4fcfc569c26bf0dbfcce102675fdfd1479b9a9652819
diff --git a/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.0.0.ebuild b/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.0.0.ebuild
index 0be3a0691c1c..6b7bdbf682cf 100644
--- a/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.0.0.ebuild
+++ b/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -43,9 +43,10 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Dotnet
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://gitlab.gentoo.org/dotnet/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/dotnet/${PN}.git"
 else
-	SRC_URI="https://gitlab.gentoo.org/dotnet/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	SRC_URI="https://gitweb.gentoo.org/proj/dotnet/${PN}.git/snapshot/${P}.tar.bz2
+		-> ${P}.ggo.tar.bz2"
 
 	KEYWORDS="amd64"
 fi
diff --git a/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.9999.ebuild b/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.9999.ebuild
index c9ceb8d97b3d..f2b75c8eb985 100644
--- a/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.9999.ebuild
+++ b/dev-dotnet/gentoo-dotnet-maintainer-tools/gentoo-dotnet-maintainer-tools-3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -43,9 +43,10 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Dotnet
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://gitlab.gentoo.org/dotnet/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/dotnet/${PN}.git"
 else
-	SRC_URI="https://gitlab.gentoo.org/dotnet/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	SRC_URI="https://gitweb.gentoo.org/proj/dotnet/${PN}.git/snapshot/${P}.tar.bz2
+		-> ${P}.ggo.tar.bz2"
 
 	KEYWORDS="~amd64"
 fi
diff --git a/dev-libs/aws-c-cal/aws-c-cal-1.0.0.ebuild b/dev-libs/aws-c-cal/aws-c-cal-1.0.0.ebuild
index f89b2788308e..78f33a981361 100644
--- a/dev-libs/aws-c-cal/aws-c-cal-1.0.0.ebuild
+++ b/dev-libs/aws-c-cal/aws-c-cal-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awslabs/aws-c-cal/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/aws-c-compression/aws-c-compression-1.0.0.ebuild b/dev-libs/aws-c-compression/aws-c-compression-1.0.0.ebuild
index 9eed1642d1cf..c7ef57eafae8 100644
--- a/dev-libs/aws-c-compression/aws-c-compression-1.0.0.ebuild
+++ b/dev-libs/aws-c-compression/aws-c-compression-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awslabs/aws-c-compression/archive/refs/tags/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/aws-c-sdkutils/aws-c-sdkutils-1.0.0.ebuild b/dev-libs/aws-c-sdkutils/aws-c-sdkutils-1.0.0.ebuild
index 5d0b8c2762db..ae93f7a2b2d6 100644
--- a/dev-libs/aws-c-sdkutils/aws-c-sdkutils-1.0.0.ebuild
+++ b/dev-libs/aws-c-sdkutils/aws-c-sdkutils-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awslabs/aws-c-sdkutils/archive/refs/tags/v${PV}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/aws-checksums/aws-checksums-1.0.0.ebuild b/dev-libs/aws-checksums/aws-checksums-1.0.0.ebuild
index 8f59712797dc..9989f738f7e1 100644
--- a/dev-libs/aws-checksums/aws-checksums-1.0.0.ebuild
+++ b/dev-libs/aws-checksums/aws-checksums-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awslabs/aws-checksums/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gweather-locations/Manifest b/dev-libs/gweather-locations/Manifest
new file mode 100644
index 000000000000..1efbc7e92ac2
--- /dev/null
+++ b/dev-libs/gweather-locations/Manifest
@@ -0,0 +1 @@
+DIST gweather-locations-2026.2.tar.xz 2599712 BLAKE2B 78eda60bd3c08e059614f956bf1508e4ea5dfcb37b54c2d389558246cc39084e257940d146b274a3c1fd843cfdd00b6f1b10d70d3de218fe1339ebe581998a0c SHA512 88ec27c27efb69df3668f8b2dd774ac0d8bbe3fc75cf9089c8f64f00bf839c1f8aac04b644075bc4b51ce61b8f62b1bd24a466a82887538f743807e79309c804
diff --git a/dev-libs/gweather-locations/gweather-locations-2026.2.ebuild b/dev-libs/gweather-locations/gweather-locations-2026.2.ebuild
new file mode 100644
index 000000000000..e34403a206ce
--- /dev/null
+++ b/dev-libs/gweather-locations/gweather-locations-2026.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson
+
+DESCRIPTION="GWeather Locations Database"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gweather-locations"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="
+	virtual/pkgconfig
+	dev-libs/libxml2
+	dev-python/pylint
+"
diff --git a/dev-libs/gweather-locations/metadata.xml b/dev-libs/gweather-locations/metadata.xml
new file mode 100644
index 000000000000..025211a4e112
--- /dev/null
+++ b/dev-libs/gweather-locations/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <origin>baldeagleos-repo</origin>
+</pkgmetadata>
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 1e66764fd3d7..a126c42d7cd0 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -2,3 +2,4 @@ DIST intel-compute-runtime-24.35.30872.32.tar.gz 7376572 BLAKE2B af924c111d28862
 DIST intel-compute-runtime-24.35.30872.36.tar.gz 7377285 BLAKE2B 3c80f0dd7d4853476a8c60e51853c84cbc85827f70e93b45555376c7854b9b10195aa0606e42410c0ce496aad65cf2c6eae7dd757a703d07c7b39b08c75f72bd SHA512 271507bbccc66a52747314b05944726e9b46d544b044d72feea698fc566b8396a1182a113469c0421586af236bc2878a1e6ef494abe6c1f46b467e88e8d3cd6b
 DIST intel-compute-runtime-26.22.38646.4.tar.gz 9173397 BLAKE2B aa234d0d244f300db1bd4244674f1a89c62c2c4691fa68cee2971f2fdab3bed872e2929d93be6e4227c05c7e3f672de66c6179d030138d370dc7a168c9fd115b SHA512 16bacf6b030bcc292bee16f964936bcb13ef6e3f12e76aa4cdee807dd1a3b9b32dca49a0cb3cc59e62b616a1662389db4505e6b05edaef10c9ca67a73bbc77d1
 DIST intel-compute-runtime-26.27.39122.12.tar.gz 9384549 BLAKE2B b929ac2d1d0a7d064500b7d78dcb008a441d07e9348d25798d6fc319cf62a39050910be93f5ea1516c44b36dcd7fbb922304d7dacab02c4c35a5e616840655b5 SHA512 df75b82dba99852a71497fe99b0e974454a1aa9b96623f54efd978d10cb51513aef4d94d774ff5f2ee3c266a7dc4cd90efd0e9b1b9bd1164d9b0b9d1879f30a6
+DIST intel-compute-runtime-26.31.39395.14.tar.gz 9420076 BLAKE2B 8ba4caf6c4853c7d6ef5ad6f8253f3c6fe6c5188cbf41455a60f87252214e2fb2cf717dc1f4593d3e3445330bd68952f6ec6418d265c16a7ae26db12571d6cb8 SHA512 1f002c703bd82a1d447a5ea7fda97620ba127fce7cdc2833e6322a2d3c3bec4a062b0a2ffbd192aa67c458b5f2391dc68eacba9c92fbde65b617174efdddf8d5
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-26.31.39395.14.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-26.31.39395.14.ebuild
new file mode 100644
index 000000000000..2f9dd7bbdb09
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-26.31.39395.14.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/1.6.$(ver_cut 3)"
+KEYWORDS="~amd64"
+IUSE="disable-mitigations +l0 +vaapi"
+
+RDEPEND="
+	!dev-libs/intel-compute-runtime:legacy
+	>=dev-util/intel-graphics-compiler-2.41.5:0
+	!dev-util/intel-graphics-compiler:legacy
+	>=media-libs/gmmlib-22.10.1:=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/intel-metrics-discovery:=
+	>=dev-libs/intel-metrics-library-1.0.231:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-system-controller-1.3.2:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( <dev-libs/level-zero-1.33.1:= )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		media-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "Security.md" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Filtered for two reasons:
+	# 1) https://github.com/intel/compute-runtime/issues/528
+	# 2) bug #930199
+	filter-lto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON"
+		-DNEO_DISABLE_LTO="ON"
+		-DNEO_DISABLE_MITIGATIONS="$(usex disable-mitigations)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+		-Wno-dev
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest
index 8b5424d86d5f..d44a16f1dfd1 100644
--- a/dev-libs/intel-metrics-discovery/Manifest
+++ b/dev-libs/intel-metrics-discovery/Manifest
@@ -1,2 +1,2 @@
-DIST intel-metrics-discovery-1.16.190.tar.gz 4512073 BLAKE2B dc15348d8af7624cd83c48c59e84f042d960b4922f813c82c98d59aa7dc97c4daba0b6440e54fa0fdc526774d2e06200bdc5a4e28f8172416589e0aa0209a6a6 SHA512 0f3dee143d1baa8bd3372ca541971c9e9c44910d712179ee6504ce54430823d42c3f287be02475a6733dbc9dbc6244841981dcb3c769bf7a7360c64763a876c8
 DIST intel-metrics-discovery-1.16.193.tar.gz 4511825 BLAKE2B 48e2e0e8bccce1934317750408e59c9b1507b1d2ed45dd88510e193d8110eb0953384bf30486ace1bb743a985b8eef931330b28eba81b1427debf555f3ff24e0 SHA512 3a65a9e7ee14dc06391465e56e3afdf3f39db58c724d9ca6d223bc080c057878e9cdd8146130f35b471bed025c021470933ef7131d70b4c60fd904d59b303903
+DIST intel-metrics-discovery-1.16.194.tar.gz 4523989 BLAKE2B ff987e6867b5dc1b47ce6067ff929f198e4b8e8273c3f5dd53675707b7caca90cc86777e28ebbef03ab3b9b76ba6d22ec68bc2366213fcdf7ee968a726af0626 SHA512 0cef5bfd0b2b828dc7c1c841b4da85245750add2c7519edf6ec2a43ff873722c5221b7a0baf13345c7f24c4c43e1a8fd109abae1909c621d48a034f44ff3f6b1
diff --git a/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.185-revert-definitions.patch b/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.185-revert-definitions.patch
deleted file mode 100644
index e9cf8ecff1e3..000000000000
--- a/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.185-revert-definitions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -394,7 +394,6 @@
-         -fpack-struct=8          # struct member alignment - 8 bytes
-         -Wformat                 # enables format string checking warnings during compilation
-         -Wformat-security        # warns about potentially insecure format string usages
--        -Werror=format-security  # treats format string security warnings as errors
-         -Wno-comment             # allows multi-line comments
-         -fstack-protector-strong # enables stack protection for vulnerable functions that contain: An array of any size and type
-         -fdiagnostics-color=auto # color=auto only to colorize compiler output
-@@ -434,19 +433,6 @@
-             )
-     endif ()
- 
--    # configuration specific defines
--    if ("${BUILD_TYPE}" STREQUAL "release" OR
--        "${BUILD_TYPE}" STREQUAL "release-internal" OR
--        "${BUILD_TYPE}" STREQUAL "releaseinternal")
--        set (COMMON_COMPILE_OPTIONS ${COMMON_COMPILE_OPTIONS}
--            -O3                 # optimize for speed with conforming optimizations
--            -Werror             # treats warning as errors
--            -fvisibility=hidden # hides non-exported symbols
--            -flto               # enables Link-Time Optimization (LTO)
--            -fPIC               # generates position-independent code during the compilation phase
--            )
--    endif ()
--
-     if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-         set (COMMON_COMPILE_OPTIONS ${COMMON_COMPILE_OPTIONS}
-             -msse
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.193.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.193.ebuild
index 7bf64abbc38b..ff7797e5a0ef 100644
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.193.ebuild
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.193.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.190.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.194.ebuild
index 69ad5464b2a7..7bf64abbc38b 100644
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.190.ebuild
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.16.194.ebuild
@@ -16,12 +16,12 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.12.185-revert-definitions.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.12.193-revert-definitions.patch" )
 
 src_configure() {
 	cmake_src_configure
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index d2677f06c6f2..9ccbdaeb324f 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,2 +1 @@
-DIST intel-metrics-library-1.0.234.tar.gz 271775 BLAKE2B f13384c9d23668c77d926dbde5d19a25676008056e2091375df0619cadab2c40b58a90863728663c0e1de35c5fb2ad0c944737fd3b4adc67549a586fd37eb10f SHA512 d3ea59800f345c84f7c4bd99f2f89f92e1327507a88e3b11cacfbc04a2e21648b64831b01a23dcad59af22a6fa9c6316f7fe82f2791b283a875d84f975379b85
 DIST intel-metrics-library-1.0.238.tar.gz 274656 BLAKE2B 03a45261f8b5112d92cb07c35b2f2a03384490b405631b2746935499d277efd7e135ae58f50e9ac83c3bf47b66aa5bb3b8ea4ecd5b58e99b9d2a01be711d0429 SHA512 13717c640a68f69c7685628f3bc180571eafc31f0271bdbbf30f6989fbd3142b07b6adb104d58379d34533776c480d881edeffe09a594827ce7003716812f8c1
diff --git a/dev-libs/intel-metrics-library/files/intel-metrics-library-1.0.231-cmake.patch b/dev-libs/intel-metrics-library/files/intel-metrics-library-1.0.231-cmake.patch
deleted file mode 100644
index 5f5818d62403..000000000000
--- a/dev-libs/intel-metrics-library/files/intel-metrics-library-1.0.231-cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- metrics-library-1.0.231.old/CMakeLists.txt	2026-05-29 13:00:24.000000000 +0200
-+++ metrics-library-1.0.231/CMakeLists.txt	2026-06-14 14:17:55.085824407 +0200
-@@ -673,11 +673,6 @@
-         "${CMAKE_BUILD_TYPE}" STREQUAL "release-internal" OR
-         "${CMAKE_BUILD_TYPE}" STREQUAL "releaseinternal")
-         set (COMMON_COMPILE_OPTIONS ${COMMON_COMPILE_OPTIONS}
--            -O3                 # optimize for speed with conforming optimizations
--            -ffast-math         # enable fast-math optimizations (equivalent intent to -Ofast)
--            -Werror             # treats warning as errors
--            -fvisibility=hidden # hides non-exported symbols
--            -flto               # enables Link-Time Optimization (LTO)
-             -fPIC               # generates position-independent code during the compilation phase
-             )
-     endif ()
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.234.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.234.ebuild
deleted file mode 100644
index 340393e1f47c..000000000000
--- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.234.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
-HOMEPAGE="https://github.com/intel/metrics-library"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.231-cmake.patch"
-)
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.238.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.238.ebuild
index 58bc1e6335c1..cee1224ea52d 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.238.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.238.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest
index 4c9b9c830b33..8d49713a9251 100644
--- a/dev-libs/libdex/Manifest
+++ b/dev-libs/libdex/Manifest
@@ -1,2 +1,2 @@
-DIST libdex-0.10.1.tar.xz 102088 BLAKE2B e8be9d2c20c60e0800e098cbb284927e7bfee6a4b1acbc1ab464cb1057b105716e2083df14ecf0b2276728b635dcb9cd03a365a1da3999b63b19e8b418cb8b45 SHA512 ada18b95eaddfccfa1d73889979c914c646fe78ff93878346db0a40483206263429b9a97a073b7129da8eeefcb80a1911f994f04f306aa41877c102683a4a1ef
 DIST libdex-1.0.0.tar.xz 107124 BLAKE2B 9bb1a09e0fbf2b1a80e80fa7979b502c01ba91901e9380f3230dcf94793aa6cc5d7a7a57e3852677b43f5768c7b0ee80f09de500f997d3e82ad6974c7e83597e SHA512 589097390a1c33c2e93eca7adb2b51a7153849e6454af6bb2491dd1111a3d3812926391e4ce6186bc0e15f5904239e311ca488349e93eadc75a7d8b227901661
+DIST libdex-1.2.0.tar.xz 181764 BLAKE2B a699f9541e5d5a08831f3febe1e2865ba36e8d4328c29e09d6e143485c67c0101ff6e09797e97990b2992f3d59319c1851a4088f0b26513242eeb604b370dfec SHA512 bd785fa1ac8ff71eee6d614b07982da8d781c60cc1ddc2bcbfd509000a0e6a2b16cce2baa9e189d32e86f64f4eb2d7e68be672f9477225d3917f7d9deaee77bc
diff --git a/dev-libs/libdex/libdex-0.10.1.ebuild b/dev-libs/libdex/libdex-1.2.0.ebuild
index f7ff319adefe..54f2b3531015 100644
--- a/dev-libs/libdex/libdex-0.10.1.ebuild
+++ b/dev-libs/libdex/libdex-1.2.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit gnome.org linux-info meson vala
+inherit gnome.org linux-info meson vala virtualx
 
 DESCRIPTION="Dex provides Future-based programming for GLib-based applications"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm64 ~loong x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 
 IUSE="+eventfd gtk-doc +introspection +liburing sysprof test vala"
 REQUIRED_USE="
@@ -20,7 +20,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/glib-2.68:2
+	>=dev-libs/glib-2.87:2
 	liburing? ( >=sys-libs/liburing-0.7:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
 	sysprof? ( dev-util/sysprof-capture:4 )
@@ -57,6 +57,7 @@ src_configure() {
 		$(meson_use test tests)
 		$(meson_feature liburing)
 		$(meson_feature eventfd)
+		-Dgdbus=enabled
 	)
 	meson_src_configure
 }
@@ -69,3 +70,7 @@ src_install() {
 		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" --print-errorlogs || die
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.12.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.12.4.ebuild
index 2c52d87698cf..75d319333aa9 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.12.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1+ GPL-2+ MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+asm doc +getentropy static-libs"
 IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
 IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
diff --git a/dev-libs/libgpiod/libgpiod-1.6.5.ebuild b/dev-libs/libgpiod/libgpiod-1.6.5.ebuild
index 7ba25cdfa912..80a3c34ec78d 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.5.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+tools cxx python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpiod/libgpiod-2.2.4.ebuild b/dev-libs/libgpiod/libgpiod-2.2.4.ebuild
index 151dc35d2d6c..22c57345b45d 100644
--- a/dev-libs/libgpiod/libgpiod-2.2.4.ebuild
+++ b/dev-libs/libgpiod/libgpiod-2.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+tools cxx python static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index a7fb574a7919..e038ec214c48 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,2 +1,2 @@
-DIST libgweather-4.4.2.tar.xz 2827456 BLAKE2B de53257f15b5b0e38bd41ccf69665e701065db85d144853831f409cd1a7116482bb374a858b022f9fb5eb167203bb393fa4a9087ab2c2272ba1b83dec3efcbb0 SHA512 66012af9bc50dfbb8cdb3d8b1ad7c72b5e8e012d8bbaa5a8d7a841f4bd5b2ebe0a490cc7ea256ea5e1d218f328da8826fb2345aa848fd961da271e64cdf330ad
 DIST libgweather-4.4.4.tar.xz 2843040 BLAKE2B 7caa41aeb31f4d701022fa5a17d8f47395ff5a456158b278b33a9444b70c4f125576a1db76e1685e1a6d41d17935807c34e0f61dadad349abcb47515010f6828 SHA512 2140c742a89a3816ef0e20d0eac570bbc4af058d1c94982b08819740132e7ca56eb9597b3817385310d19d7f1ab6d478fb665770f99db1eca1c0aab1c073dd2f
+DIST libgweather-4.6.0.tar.xz 347592 BLAKE2B 5fc07c0dfb2430999d66b046026eb4490d791a56e8128dcd3204f120bcdd2463c40e0657522ecca6e351e6855ea6240027bfd7c696248fe15c3233c4ad14dbdc SHA512 1ca6ffe7cc8b6cf98b39137a7bf50c3e065def32c31ba40431b82020fc8f62da5e9903a27c850d234760581430bccc0eeb9c74b495e7c7f3312252c31cbbb8d6
diff --git a/dev-libs/libgweather/libgweather-4.4.2-r1.ebuild b/dev-libs/libgweather/libgweather-4.6.0.ebuild
index 612ad462928b..4e2b13c14884 100644
--- a/dev-libs/libgweather/libgweather-4.4.2-r1.ebuild
+++ b/dev-libs/libgweather/libgweather-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,15 +11,14 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgweather"
 
 LICENSE="GPL-2+"
 SLOT="4/4-0" # subslot = 4-(libgweather-4 soname suffix)
-
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc +introspection test +vala"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	vala? ( introspection )
 	gtk-doc? ( introspection )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
@@ -28,9 +27,11 @@ RDEPEND="
 	>=dev-libs/libxml2-2.6.0:2=
 	dev-libs/json-glib
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	dev-libs/gweather-locations
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	>=dev-build/meson-1.5
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
 	>=sys-devel/gettext-0.19.8
@@ -71,7 +72,6 @@ src_configure() {
 		$(meson_use gtk-doc gtk_doc)
 		$(meson_use introspection)
 		$(meson_use test tests)
-		-Dsoup2=false
 		--native-file "${native_file}"
 	)
 	meson_src_configure
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 5e5827eadce8..682f57185d51 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,12 +1,12 @@
-DIST opencl-clang-17.0.7.tar.gz 37711 BLAKE2B d8d430b776d2138f73f2d4f8ac5be32d72458a292e88d1976a0c9fc3b70cc0fbc8f214b93d234e4873757d9e3c1887cd2d86692f5a1240f56f7676ec1ea0f5ab SHA512 79c4101d99f27d5cf9562f1a92f24ffb0762608b6c2978349d71ed9424f65864565b1029984e5b2c20c86090391367ef248dad34a762f309b36f44d5c5abd7f2
+DIST opencl-clang-17.0.10.tar.gz 60029 BLAKE2B 59229343ae8ee3c81f11dcb550bbcf09a4e80aad32438aa9f7180e316ea28a9585db40de35ac9d912ae7962ee7a896bafe27373bcfaf2da74343b99a436b8042 SHA512 c634fea76e8d44c50f998fb5761d3ac4a4d0d1847a40ad746a092f9dfb61f40fb16901a52b348c0be06b694688e2af96e37203b2c1313ca437d5996a5d0680f2
 DIST opencl-clang-17.0.8.tar.gz 41372 BLAKE2B 9c7d6b4ab277084d9731d3ccc5be918d5a2e59381050dc58f0a2c9f3b79efc3b12be69a2044db13186d484c8d1b397b4d4e8e69ca4756588c96f89c92df00190 SHA512 018003729903b2487385b94c6ea609fbef325a087dca14a4f1e4ecdcf40377df7b3bce3bf144539bca4b3018d4c32249411656a9bfa27c1c4e615068ec86165d
-DIST opencl-clang-18.1.6.tar.gz 32710 BLAKE2B c8c1d5a0834a87304717791aa80c76ffe31b24da883ab5ceb735d7c8995ed8dbcd942b8726c54efc15bbe3d6d0b8e391d6918d091714795e987194f13e3d50e3 SHA512 73599e09fa292c8d90820e13b754158f83bac4e3f02f97047a7636fe371434f6c7762e13fbf879d85c15572efb96b61300ac889dda8c9f86d3313de367847f9f
 DIST opencl-clang-18.1.7.tar.gz 36888 BLAKE2B eba2f8359c7af4e9b3919631a1e01fd94b6eec9e7bd1d593aebb4c6a43a2b7d54447c9420f2c5f2ab02adf2f4623df2cc3195084d74f9750aff5bd9a726651e2 SHA512 a8940deed549ae76021e14683cea954f5a3a55db6c4ed99e6d1b71ada7c514c2e81798668a3035a42e6bbaca13fafaa09927e31a5c7a65aa6ec0611d29b6f6fc
-DIST opencl-clang-19.1.4.tar.gz 37665 BLAKE2B dfd0615e8bc2c7f830adf14aa7b303f82a7dd3d1f3d6566deb958b4b7734bf6cacb540e41dcdbd782053e0641dfbaa9fb190ad66d7b5606c5d97d5c07a6fced9 SHA512 db804b69fc050a198abefa8fcafa912fa7ada4b18d5b6c29d77d4e392b4407431a1b9a3c976d1f110c5b0bd23dd6841120d0d12a4019b865e80544e1b31de9aa
+DIST opencl-clang-18.1.9.tar.gz 54669 BLAKE2B 7d9085b39b8d8e2756e445d4e9b5e0a6cbbf856b0591270ef00f3d2bb62f53f86a25ec55a026e99f979edab9c5cbffdaaa6d3f76dc6a47fe652be6ff5c032a22 SHA512 a2e5b30e93a6a01622e414bd56391f0292faeb89ec67e45ebe451bd5d34f7649ec50a0bacf21fd79b3463767617948e3bc99aed3350d92756526fac527a83be9
 DIST opencl-clang-19.1.5.tar.gz 41985 BLAKE2B 1dba88914fde11e95c415bd27f77ef5d38be743cb0f799888a0229c0776d5cec36b22d17da36bfbf0bf6639620843cb8b31edae9752381be59c4e75acf60f9e9 SHA512 cdfdcbd920b61bfefa40451846155d760deb176618afae4968713ebacfb323d647f54ca0ed26d753f47c894f362573b323fc52dc51cef95ed9ca525f3cc3f34e
-DIST opencl-clang-20.1.4.tar.gz 38876 BLAKE2B 9b2eb4d535a2c71f30f5e9e4a48205b7f17c3d51e478b812d212729377886097d54c0946df71ad7be7a4465975e1950cd10abd307d119219c4425d856ce57dad SHA512 febbf26fa219ce9761d76fb92e1c0dcda0cbfefdae2ab220526ae99af5fee02adf29835e2cc2f149d15dd0dd25d9224a81d4361153fd47bec398c357f2e9f9a3
+DIST opencl-clang-19.1.7.tar.gz 60979 BLAKE2B 545d100d7d27d7ae444da85be47347400066938d1b7898af1b49a75cc33b6e128f39a310270c561b0069268681fcd1b8076759d4e7d74d41e8e7e690b548de31 SHA512 1755d2c530ad88689b3a0c0cdeec3db09facef40d1ffef8bf26122387c36cce7014894d9ff79f8d50392785b1164bb587ae3bc54d44f50029dc9c3cc8451db78
 DIST opencl-clang-20.1.5.tar.gz 43134 BLAKE2B ff801e655719b85c6ec1970ef102955768b634924710af393b127d8182497a62d976321888378c996e7b76c11fed75c6f04e0e96f5fd3354aafc158bc96acdb3 SHA512 43f3e82de6eb9a3f875e99e9fb6782bcaf5415744f84abf4cf6f183bc36fb533e69eb0ae30ea1ef7588e4ed4adec2b30c617cf995daa958fd29a0bdc02e975f5
-DIST opencl-clang-21.1.4.tar.gz 38853 BLAKE2B 3196417fe84f840d89f3dbc62e8dfea3bbcd982f8e12a8b5cd607b5e7b6fc8937953df6475f6c4e315212549338adacee87896b7fe301dfea02dd7d8fbe6912f SHA512 eff8adf2a7249ca74d59fecf2179807533b79a2304e9639478ae488392d724984b2cca38b4c540ff6d211585b1e811b4333d56d0205bf81b3dbd09dcd5843617
+DIST opencl-clang-20.1.7.tar.gz 62170 BLAKE2B 8a0f556ce8622ad2b20076d8e3e3b0ebfd04237e91fe512054d4e4ffc111debd37f44942c290cd4df215c7e0f4766d6372338fe175048a7215170e65db59b187 SHA512 6f6d0f82c725727508fa3c15c4ec0c15c15bca8ca84582ea6c25373b4ba0eda80192eb93d3675ddb2ffe32c2c673e5c59874d20443a51e00ed45a36acd32b050
 DIST opencl-clang-21.1.5.tar.gz 43121 BLAKE2B 1fbc3331af1cc4b0ff3eebffaf93f8a8029bc22c9524bc8ffc4e5438677f7e1a985c10f5fecc49fcd1fc674fccf1a3ff43969938a61e7f1a4cf89af4a716e958 SHA512 d16e6072167ec2738f335e258b290f37378bfc0ae24376a988d0d2f6f5d5daac3a8326e2c74e0485ed0401e3e0cb28edce405d6762c8234b08f65487c5ac3c69
-DIST opencl-clang-22.1.1.tar.gz 35891 BLAKE2B b6a0adb66cb5430ebafe1931e66b4ee86d252f9a0d77dd753ef692b789366e2bb2294fafd8ca4938f9a79e73106a894e54ea95cf663f4fae8b5996b3ed9c6327 SHA512 ef4d61329da7db0d9491c3cb39e0870965ed47028a4e5748663722411971a620673abd10d86dde7c39413a2f1f24fe730076adcd175228406c3ece203a70fb2c
+DIST opencl-clang-21.1.7.tar.gz 62139 BLAKE2B 1390c234591a8ff0f51091b452eae78744aae80e3e44498e7b740205db5e16c04d12b571be64a8ed3c2b2746205e92f5d0763533c9d4700309d0b8d7e55acd4e SHA512 b039a0fb25881fde55e286c6f96a4334314c3b1dd77c9fa001a735bff9eda839b36cb0c9531c7f61425e02f140778acf69ead26cbd8d59f5a2a87602f814a815
 DIST opencl-clang-22.1.2.tar.gz 44224 BLAKE2B a87780c590ee626b81dc9b110af5d6dd986fa4af27c508519b29e89f803918f330e0c8396f0463a5562ee4ae4344b4c7ecdf0d90c538b56867990a3d02d07cd0 SHA512 79fbf1f5eb93215d70c300795ce3f5ad577dbaf42d1cb30e3e968ad99c558f33c24a3745aa33d7a57ed82e6e0c2533e571dd7dd371b523572b30afd0de1c18cc
+DIST opencl-clang-22.1.4.tar.gz 63211 BLAKE2B 1afd2ec63641f8ee5dcc3f58d6cfcaebabe6eb0fc4910d51209554ab131fa020e3a79f5b66d1e772ac3c4b873996a047780d649a3786bf12ed6b98d802bb5acb SHA512 fdcdd0343b1f06580bd35a8c82971ad03deb52481b0c1469f126f683b7fac7844ff58d652c8cf86d6c54a71c114901d51a2e603786aa03ca57ad503c064e843a
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.7.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.10.ebuild
index c75a49e1ee6f..2c6795f57d3a 100644
--- a/dev-libs/opencl-clang/opencl-clang-17.0.7.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-17.0.10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
index 2c6795f57d3a..c75a49e1ee6f 100644
--- a/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild b/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild
index c756463c4fc8..7c382fbfde29 100644
--- a/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-18.1.6.ebuild b/dev-libs/opencl-clang/opencl-clang-18.1.9.ebuild
index 7c382fbfde29..c756463c4fc8 100644
--- a/dev-libs/opencl-clang/opencl-clang-18.1.6.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-18.1.9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild
index 46ff5cc31d9f..7a6e850b48c6 100644
--- a/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-19.1.4.ebuild b/dev-libs/opencl-clang/opencl-clang-19.1.7.ebuild
index 7a6e850b48c6..46ff5cc31d9f 100644
--- a/dev-libs/opencl-clang/opencl-clang-19.1.4.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-19.1.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
index ae6c7936828f..1636478fc6cf 100644
--- a/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-20.1.4.ebuild b/dev-libs/opencl-clang/opencl-clang-20.1.7.ebuild
index 1636478fc6cf..ae6c7936828f 100644
--- a/dev-libs/opencl-clang/opencl-clang-20.1.4.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-20.1.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
index 60a8d36e955f..dee45d345675 100644
--- a/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-21.1.4.ebuild b/dev-libs/opencl-clang/opencl-clang-21.1.7.ebuild
index dee45d345675..60a8d36e955f 100644
--- a/dev-libs/opencl-clang/opencl-clang-21.1.4.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-21.1.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild b/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
index 4e46325bbc6f..21e6b0daa9c5 100644
--- a/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/opencl-clang/opencl-clang-22.1.1.ebuild b/dev-libs/opencl-clang/opencl-clang-22.1.4.ebuild
index 21e6b0daa9c5..4e46325bbc6f 100644
--- a/dev-libs/opencl-clang/opencl-clang-22.1.1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-22.1.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-libs/quickjs-ng/Manifest b/dev-libs/quickjs-ng/Manifest
index 06b42b7dc979..7bd80fa2cbe8 100644
--- a/dev-libs/quickjs-ng/Manifest
+++ b/dev-libs/quickjs-ng/Manifest
@@ -1 +1,2 @@
 DIST quickjs-ng-0.14.0.tar.gz 824003 BLAKE2B 79b1c8744b72a8364958c8cc3fe48a490e48f7c89a80d91e32c348c4289750a57e6c71f28ff8e8920963b02d29b7e3b07365cdafbbad82df2fbaebf4f4cd3a26 SHA512 a6679a61da1ad232afb59e6c997106f9909084b853c3c615b2410681c4272071a69fcad213374bec60fa3187569de874daa6d6bfcc2cd6e47ca5a0d978d63392
+DIST quickjs-ng-0.16.2.tar.gz 901847 BLAKE2B 4572c4c18b20f4b3a91cea7299aaeb0036a489e95820dbc42d670048170698f55ca5513a9e01b17a26d398e8ac738d172fdd123c53f428b487db3eda347a6192 SHA512 477b44986c2430c2e17c997c8bb04b1802bee03739ab8be1837771642c543ae4ac0a782598b9645f9959299ced3039e4fab2ad5c4458d76171675146a2e8bce4
diff --git a/dev-libs/quickjs-ng/quickjs-ng-0.14.0.ebuild b/dev-libs/quickjs-ng/quickjs-ng-0.14.0.ebuild
index 14f6c905bf26..039e91978afd 100644
--- a/dev-libs/quickjs-ng/quickjs-ng-0.14.0.ebuild
+++ b/dev-libs/quickjs-ng/quickjs-ng-0.14.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/quickjs-ng/quickjs-ng-0.16.2.ebuild b/dev-libs/quickjs-ng/quickjs-ng-0.16.2.ebuild
new file mode 100644
index 000000000000..50e184ec9948
--- /dev/null
+++ b/dev-libs/quickjs-ng/quickjs-ng-0.16.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="QuickJS, the Next Generation: a mighty JavaScript engine"
+HOMEPAGE="https://github.com/quickjs-ng/quickjs"
+SRC_URI="
+	https://github.com/quickjs-ng/quickjs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+MY_PN="quickjs"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared # default_library=static hardcoded.
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		"$(meson_feature test tests)"
+		-Dlibc=true
+		-Dexamples=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	# Source code files under examples.
+	docompress -x "/usr/share/doc/${PF}/examples"
+	meson_src_install
+}
diff --git a/dev-libs/wayland/wayland-1.25.0-r1.ebuild b/dev-libs/wayland/wayland-1.25.0-r1.ebuild
index 3e62b4f05e1e..532e10cfe895 100644
--- a/dev-libs/wayland/wayland-1.25.0-r1.ebuild
+++ b/dev-libs/wayland/wayland-1.25.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 inherit meson-multilib
 
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index ff833ef1c185..6b88164f69e8 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -1 +1 @@
-DIST luaossl-rel-20250929.tar.gz 505293 BLAKE2B a0c44def1adf40084ef1a050e21781b9dcb03884165c95790c7d8f0d3188f1a8a6358c06dc450d10dc0ac28910c1ca3bd0f5693932d674ae51754128061555e2 SHA512 66da276675b2fc372cfd7ab000143eee027d679dcb4f67a4a40bb413281c88ef277d6df740b46e2a038319b1eec04aee3c08880e6d7016cc94d5d232ecd9d77a
+DIST luaossl-rel-20260910.tar.gz 514962 BLAKE2B 79a6913ed487cda23cc0e11b3f475511f295f54cd0020cca378a7d1fe883e145b47dd4659ca14d6f5bf74efe90c96a68678ea54ddbbb55c77363c64ec2d425c7 SHA512 9be4e0a968f62c62b7f86f99b482bcc42d6760eaf59729f56276b71a1bccfe6c6a87f81fd504353937b0c1e7246a1c5c3d6cf7efd657095cfdc8230824cf455d
diff --git a/dev-lua/luaossl/luaossl-20250929.ebuild b/dev-lua/luaossl/luaossl-20260910.ebuild
index a0236a3bb7da..81f98b78b893 100644
--- a/dev-lua/luaossl/luaossl-20250929.ebuild
+++ b/dev-lua/luaossl/luaossl-20260910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-perl/Bytes-Random-Secure/Bytes-Random-Secure-0.290.0-r1.ebuild b/dev-perl/Bytes-Random-Secure/Bytes-Random-Secure-0.290.0-r1.ebuild
index 4d16f2f0d2b3..c3ef33e29581 100644
--- a/dev-perl/Bytes-Random-Secure/Bytes-Random-Secure-0.290.0-r1.ebuild
+++ b/dev-perl/Bytes-Random-Secure/Bytes-Random-Secure-0.290.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extension to generate cryptographically-secure random bytes"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.80.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.80.0.ebuild
index 2cf866746eb9..79e256402a32 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.80.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion for HTTP date formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=virtual/perl-Time-Local-1.280.0
diff --git a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.590.0.ebuild b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.590.0.ebuild
index cb632a045672..860294832a47 100644
--- a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.590.0.ebuild
+++ b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.590.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS implementation for List::SomeUtils"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	${RDEPEND}
diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.240.0.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.240.0.ebuild
index 1d098c601f90..de74f2c10ace 100644
--- a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.240.0.ebuild
+++ b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.240.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="Perl extension for merging IPv4 or IPv6 CIDR addresses"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 PERL_RM_FILES=( "t/podcov.t" "t/pod.t" )
diff --git a/dev-perl/Sereal-Encoder/Sereal-Encoder-5.6.0.ebuild b/dev-perl/Sereal-Encoder/Sereal-Encoder-5.6.0.ebuild
index 2246276203af..4c7f35c18d37 100644
--- a/dev-perl/Sereal-Encoder/Sereal-Encoder-5.6.0.ebuild
+++ b/dev-perl/Sereal-Encoder/Sereal-Encoder-5.6.0.ebuild
@@ -9,7 +9,7 @@ inherit edo perl-module toolchain-funcs
 
 DESCRIPTION="Fast, compact, powerful binary serialization"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Note: bundled zstd fails to compile
 RDEPEND="
diff --git a/dev-perl/String-Util/String-Util-1.360.0.ebuild b/dev-perl/String-Util/String-Util-1.360.0.ebuild
index e562e3ddc385..5df886bd0281 100644
--- a/dev-perl/String-Util/String-Util-1.360.0.ebuild
+++ b/dev-perl/String-Util/String-Util-1.360.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="String processing utility functions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/ast-serialize/Manifest b/dev-python/ast-serialize/Manifest
index 776c87decd84..202ce41d0c61 100644
--- a/dev-python/ast-serialize/Manifest
+++ b/dev-python/ast-serialize/Manifest
@@ -20,6 +20,9 @@ DIST ast_serialize-0.11.0.tar.gz.provenance 10019 BLAKE2B 8d8ba1f83b9b0f4db9526d
 DIST ast_serialize-0.11.1-crates.tar.xz 8982344 BLAKE2B 1c5a26985bbca3537808e0c49a11af37f4666194b9f757d3039d55ca895bd7932bf50d4a7944fad85973a4c88d2ea5680313241abe56dfe81c25f98a7a37ffc7 SHA512 aed9985a44ff14b227d2c67e89358d1dfdd13d728fc1347d6b139d65f1ed4a8a8c5c461a80a5862525aa12c07f8ee86162aad0a722f30221e38e26bfc4163d69
 DIST ast_serialize-0.11.1.tar.gz 953785 BLAKE2B e52bb557b4bbd9d7700f91a4cfcfb5188e4f4fdbf50fa9355df535b82af6b333068cfb4ab717ac6a01f33a177a85b82da7ff237f7311e513634bf155465bf228 SHA512 67f23270ca382aaa821bd95bc9169b648666b820fdd33dd325237d0f5e20cd136e98bc0ca0161fcb7ae3c003f9505f5aa0547a38ceaaa61aff5c82c0de07db22
 DIST ast_serialize-0.11.1.tar.gz.provenance 10074 BLAKE2B 834034ae00d3c4c9c85ae032365adb6bf219a5e15212096b6cb05b6d8325707c58872f1bf4ecaaf5dca53aafea4336b4bc904e24971a84e4e8c2e3eaed8129ee SHA512 3cfbb8c3d1e1f923140744067e89425ea2a51b7bf1ce279ecaf20826b67a6b106e8768b745ad22333f4ef0041c1f37c2185a91050a6ef7c5841dd297f2eb38c0
+DIST ast_serialize-0.11.2-crates.tar.xz 8982344 BLAKE2B 1c5a26985bbca3537808e0c49a11af37f4666194b9f757d3039d55ca895bd7932bf50d4a7944fad85973a4c88d2ea5680313241abe56dfe81c25f98a7a37ffc7 SHA512 aed9985a44ff14b227d2c67e89358d1dfdd13d728fc1347d6b139d65f1ed4a8a8c5c461a80a5862525aa12c07f8ee86162aad0a722f30221e38e26bfc4163d69
+DIST ast_serialize-0.11.2.tar.gz 954387 BLAKE2B cbaadfb641ce65e26c65f0b10348591f4b4e6dc4282b3eb292018348d8719c80e3c60f345554bb439f212493231d2022796262d452a2a2c857f847b1165d511d SHA512 ec0ba26321f3fa1622444abe6ee26e604434477398746122b2414b6851fc053d527dde6ae26880a5ab6b506070437206337018e5f49d57854f593e6a31759348
+DIST ast_serialize-0.11.2.tar.gz.provenance 9835 BLAKE2B a92d1307c050d3c757bd5c7aa01b18fdb4f9f81b7616d0f0b60e2bc88b8402cb596c8ebda0e43aca05e7a725010f3ae58d167ed2da393fd6a01c4a0e13c82af6 SHA512 9a1770038629de5d9d88eaadef1ea4398c0ce908f302eb9764a1523eec21ccac7a3b5fd88a3fdf5320f7b649169dc9b7d538c8b192b40add6ebcfa6108240c16
 DIST ast_serialize-0.7.0.tar.gz 845507 BLAKE2B 2ae173ce25210a8fa69917acef2eb6de3dec5f3bc3ea0cddf1fd962f654b5ed9b7fb3ac3d39f089fa8c9c058dd366d48a49543d97f706164b8459f243259fdb3 SHA512 b50d29b37640939e0b7e6f05ee46e7f8fb0e5f2e7a2cdec91c7093e01015d0ce9d23e1734594be2435fb17e6111ec88f40c3d8297a520edd7e95516b17ca6940
 DIST ast_serialize-0.7.0.tar.gz.provenance 9942 BLAKE2B b6c2a9796d9079900d1b1b729c3488a8bed445d3f22410112dceb7c2991d699e29dac56e3674fa059064d6908f28401e442b2dc7e6bb00ba01871d085726a68a SHA512 4775c8a45e5c5cfaf87486fe468c1b115172dcfd21e5fe459033c8d604b157158d12689d7a0ea4134ef4c91a0fb5ac934d51f11e47f6cf51d995e82122b5d202
 DIST ast_serialize-0.8.0.tar.gz 845638 BLAKE2B 9b09fb82f073c3ae73486dab703c22e80cb2c5973adc94faa747d01923221d79b06f17b5b300adf13e59fa5e64b3d0fb31d7beecf1e84b0a7b692d1ae79ae8ea SHA512 5ccb2f87da07e432e6f7f3790c6c9adb9403fb90c60a223a2fc598c6a931e44b88b504b1f3e45bcef5b51f2f75349fd0e3718d7f484addd046f566b3b1045315
diff --git a/dev-python/ast-serialize/ast-serialize-0.11.2.ebuild b/dev-python/ast-serialize/ast-serialize-0.11.2.ebuild
new file mode 100644
index 000000000000..7142c24913c5
--- /dev/null
+++ b/dev-python/ast-serialize/ast-serialize-0.11.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYPI_VERIFY_REPO=https://github.com/mypyc/ast_serialize
+PYTHON_COMPAT=( python3_{13..14} )
+
+RUST_MIN_VER="1.95.0"
+CRATES="
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Python bindings for mypy AST serialization"
+HOMEPAGE="
+	https://github.com/mypyc/ast_serialize/
+	https://pypi.org/project/ast-serialize/
+"
+SRC_URI+="
+	https://github.com/gentoo-crate-dist/ast_serialize/releases/download/v${PV}/ast_serialize-${PV}-crates.tar.xz
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0
+	Unicode-DFS-2016 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	crates
+)
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/ast_serialize/ast_serialize.*"
+
+src_unpack() {
+	pypi_src_unpack
+	cargo_gen_config
+}
diff --git a/dev-python/authheaders/authheaders-0.16.3.ebuild b/dev-python/authheaders/authheaders-0.16.3.ebuild
index ede20e825ff2..07639a19205e 100644
--- a/dev-python/authheaders/authheaders-0.16.3.ebuild
+++ b/dev-python/authheaders/authheaders-0.16.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/authres-1.2.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.43.67.ebuild b/dev-python/boto3/boto3-1.43.67.ebuild
index 93fbbe6dd59b..ffa170d43fa3 100644
--- a/dev-python/boto3/boto3-1.43.67.ebuild
+++ b/dev-python/boto3/boto3-1.43.67.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.43.67.ebuild b/dev-python/botocore/botocore-1.43.67.ebuild
index a3a161f78545..0dca2a67c593 100644
--- a/dev-python/botocore/botocore-1.43.67.ebuild
+++ b/dev-python/botocore/botocore-1.43.67.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 997e2e02627b..a881da25bfb9 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,6 +1,6 @@
-DIST coverage-7.15.2.tar.gz 927741 BLAKE2B 61b652d900901b1e2cb2b192ba95f757e5d9da830ab54d26ae1fca9c717e73f86f8e2aeeea6ab8664020d5d0c6883b051bdcc848a326282ac5a0172d6e8cdea0 SHA512 578cf91905d525343eee636fc24dbf70e0d0d249b0fd4228d750de3feef3cab344a3f24cb73cfa0af7a34d7e651e56b539b512d2cbf4ff59dce95eb03509e575
-DIST coverage-7.15.2.tar.gz.provenance 10044 BLAKE2B b4b740dad204628ab76ca8697ad816a60dd7bf73ebbc8a1682575c8dc84240fb1338e85db5a2e2c804c7a7f255188de1b14269b5f72f5024ebd7f8f7b4e1d06b SHA512 5114b7cd42289ebe32923a80f575f3badd881e7b38e17b0a9b99faf60b0aa1048239b852109b39c8435da3016f13c5d01599e18bbd843da54264595242fa7f78
 DIST coverage-7.15.4.tar.gz 936952 BLAKE2B 524db3ea1117e1d19df9d6fcbee400014f3145dd33f04e583daba49dbc2c1028ce99afdeb5c5630ab8cf344cdee974ef661f7d413a0c7c916917f899e31b376d SHA512 d0a0541e95e9e509aa8cd496a0cf1ae2da820bb3457c684e916bae18c654210d43f4919a4b72a633e48a8d5803c4e4654e2c03d07129bb5026d1ce6cbf1ef44e
 DIST coverage-7.15.4.tar.gz.provenance 9997 BLAKE2B 0c5bb2094a2b276460d6c35e8074aa4a49f4a1b9130c631e5224449bb6e93bf2cccfefe2939d8aa26f9954a51e5671704c9fa3f30354d2c673f344a1d1765199 SHA512 c6599777cfc67cdb601ddda20badf1d78de357bf7235e2ba6bd7f5a2d606694314e7cfb96d3225a1ad47a9667cb7d9047ede6de4c3fc747f5b58e4ccdadb30d5
 DIST coverage-7.16.0.tar.gz 945620 BLAKE2B 5f93ac8e2a91c354fb7dc57fc710613f639ec485a53c866288fe4a96c262af030d2657974d827ad6929bdf72f261c0937595c73650231a1536f4d36c0d20242f SHA512 2a63023d8ed89537ee20b766f07556979243f5eb72228972ad6b2f4c4cf9f79c85ec69c73fe5f8bc7120f8a358abe60b64281c96c128462b430f7ceb9f1ca83a
 DIST coverage-7.16.0.tar.gz.provenance 9905 BLAKE2B 7c9a6480d9295ea7818c83285ae379c29a255b7a8252cfe5b80dbc8cc0af289d15bd6e9306af9e656271e443994a0a867a4ac0a385b75fb612a82e997985848e SHA512 c28195e374aa4330625f979e851b4d54c6040f8a3044059a0d218254b7d66d9087129051f0e4b2a24f39effc13ddd26b76f0baa341ffd803e7d6f3dd206acd33
+DIST coverage-7.16.1.tar.gz 969651 BLAKE2B 0b33a919ba5722d9ff20c3561f096677abfbced651e9d4ac5f7c295276f777e41263c043de2e7fc7c9543403deb230ad00b2cd4b3ca46fae2136304fde25ec93 SHA512 5d5b295b3462d558656e4c1ce060c12f0e4cf20cfd4aeec51a1100d331929cfdf4e0f5fa5a7d695e817de8466f27252af92e52d43ae3bd88e7705dd5cb874d01
+DIST coverage-7.16.1.tar.gz.provenance 9764 BLAKE2B 141169c22de5d80d552c8c3af4fc75fb348ac50fa92ce18104c9bfaa46aeb53f467932d32caf89a04f6d49ec563096154ea767d3a60ff2e484c88056d629b811 SHA512 5b64badff085ff8132d8c324607d15994796a090fff39523cc341265748f265deac36005298381214ef6c8abb2ff5d0098c53b15d329fb454aaef1f9c6c8ed5d
diff --git a/dev-python/coverage/coverage-7.15.2.ebuild b/dev-python/coverage/coverage-7.16.1.ebuild
index 7c0113de2c2e..bb83b5e46e2e 100644
--- a/dev-python/coverage/coverage-7.15.2.ebuild
+++ b/dev-python/coverage/coverage-7.16.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="+native-extensions"
 
 BDEPEND="
@@ -43,8 +43,19 @@ python_compile() {
 
 test_tracer() {
 	local -x COVERAGE_CORE=${1}
+
+	if [[ ${EPYTHON} == python3.15 && ${COVERAGE_CORE} == sysmon ]] &&
+		has_version "dev-lang/python:3.15[jit]"
+	then
+		local EPYTEST_DESELECT=(
+			"${EPYTEST_DESELECT[@]}"
+			tests/test_arcs.py::LoopArcTest::test_continue
+		)
+	fi
+
 	einfo "  Testing with the ${COVERAGE_CORE} core ..."
-	epytest -o addopts= "${@:2}" tests
+	nonfatal epytest -o addopts= "${@:2}" tests ||
+		die "Tests failed with ${EPYTHON}, ${COVERAGE_CORE} core"
 }
 
 python_test() {
@@ -55,15 +66,8 @@ python_test() {
 		# COVERAGE_CORE (which breaks testing pytracer on CPython)
 		tests/test_cmdline.py::CmdLineStdoutTest::test_version
 		tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer
-		# mismatch of expected concurrency in error message
-		# TODO: report upstream?
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet_simple_code
 		# packaging tests, fragile to setuptools version
 		tests/test_setup.py
-		# looks like a difference in exit status reporting?
-		# https://github.com/nedbat/coveragepy/issues/2008
-		tests/test_process.py::ProcessTest::test_save_signal_usr1
 	)
 	local EPYTEST_IGNORE=(
 		# pip these days insists on fetching build deps from Internet
@@ -95,14 +99,8 @@ python_test() {
 
 	test_tracer pytrace "${xdist_args[@]}"
 
-	case ${EPYTHON} in
-		*3.11)
-			;;
-		*)
-			# available since Python 3.12
-			test_tracer sysmon "${xdist_args[@]}"
-			;;
-	esac
+	# available since Python 3.12
+	test_tracer sysmon "${xdist_args[@]}"
 
 	if [[ -n ${c_ext} ]]; then
 		rm coverage/*.so || die
diff --git a/dev-python/liblore/liblore-0.9.0.ebuild b/dev-python/liblore/liblore-0.9.0.ebuild
index 73c145ffd172..8d6349083516 100644
--- a/dev-python/liblore/liblore-0.9.0.ebuild
+++ b/dev-python/liblore/liblore-0.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://git.kernel.org/pub/scm/utils/${PN}/${PN}.git/snapshot/${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="auth test"
 
diff --git a/dev-python/matplotlib/matplotlib-3.11.1.ebuild b/dev-python/matplotlib/matplotlib-3.11.1.ebuild
index 12b95560925c..33334746330f 100644
--- a/dev-python/matplotlib/matplotlib-3.11.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.11.1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
 if [[ ${PV} != *_rc* ]]; then
-	KEYWORDS="~alpha ~amd64 arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~alpha amd64 arm64 ppc ~ppc64 ~riscv x86"
 fi
 IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index d1f17c1b9d9c..06ef20489e84 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,2 +1,2 @@
-DIST pdm-2.28.2.tar.gz 2703070 BLAKE2B d480ab370154264c3cad5deb2b38c4449e1b3ef2529db0253975eb0cc43678ff913de5b2df0f6f400cbf0c3da3e191b497be99a4bfe25f1705ccb572fbbe46cc SHA512 bf357d712a3b987821ecd3240b0d12cd1477d37aebe6a178e56647c2013261fb31ebf4d088c0b49d108cee4dd92bb2ed936ee4cbfd5f740cc6e6d8ab171d4195
 DIST pdm-2.29.0.tar.gz 2707949 BLAKE2B db0bd4f076b20424555ff929ad4a76988c1ca41236d1d906a8a8c386a98955de2dd8b87439340a7fb785c4b4959a640a37fd771e7233fe53c0dd45eedaeb790e SHA512 81ab404adf5bfd2f9be8b016d2cb4f0cbc32bf38aab1b4c4b999e7a29404bf3fa53fcdfb07793498d056260a16ef104bb2ee6fe8cda77ebaf5ceb7eaef276560
+DIST pdm-2.29.1.tar.gz 2713906 BLAKE2B d610993a0120f2517aa6c575f8fd9754552e1b5895f8765d58051733ac9c9d7df3de549d3c96ea04b03f3177b32914a3a725c0aee324a2ed52b47e7b955ef4ca SHA512 38d2924f0933cbb32468950bdeb4866d8c49d22f34dbcae081d9dae7f84eedae22535a9c39f2c65457abe9b9bad828050fa6808ac8940ed46da9de63ef0a254f
diff --git a/dev-python/pdm/pdm-2.28.2.ebuild b/dev-python/pdm/pdm-2.29.1.ebuild
index 818e9190aa4e..f853dc5fa0e7 100644
--- a/dev-python/pdm/pdm-2.28.2.ebuild
+++ b/dev-python/pdm/pdm-2.29.1.ebuild
@@ -80,6 +80,10 @@ python_test() {
 		# TODO
 		tests/test_formats.py::test_export_from_pylock_not_empty
 	)
+	local EPYTEST_IGNORE=(
+		# requires missing tasks file, probably irrelevant to us
+		tests/test_doc_generation.py
+	)
 
 	epytest -m "not network and not integration and not path"
 }
diff --git a/dev-python/portalocker/Manifest b/dev-python/portalocker/Manifest
index 2314022246bc..f292f3a0f51a 100644
--- a/dev-python/portalocker/Manifest
+++ b/dev-python/portalocker/Manifest
@@ -3,3 +3,4 @@ DIST portalocker-4.0.0.gh.tar.gz 88293 BLAKE2B ab96019123648cb1cd7c534e97e04377b
 DIST portalocker-4.1.0.gh.tar.gz 140338 BLAKE2B a6011fad4f9b2d4b7a870f502611d6c46b1a766eb3ae28b263da2999ec60d022293880d18da2e81185b660929fbb37e29a0e85ed3726bd04667bdd856e40ffe2 SHA512 1a6ba3cb1dc782829979fb4f0ac900d86a11d1ecc4a90b0f29b7d16a0775cc12918d349c7ff2fff2e05488045e61daa9adf3a407b771f9e134ecd1aeb3e86218
 DIST portalocker-4.2.0.gh.tar.gz 309989 BLAKE2B aa9c437ed180651e0e3ab07af736f12c8eedf7b962845e6affd13295e56609378fad41f4d0aa7b1170aa2dcde81ea9ecad43c73ef024102812b0729de2188ebe SHA512 f4bc04666a4640ca4d7a871a16b0000eceda18ebe3a8606e06ba8f5a74dfd869783467efdc1c058bcfe2b2f8b073ce518c387a6fa1a03c881829e22b57985bb6
 DIST portalocker-4.3.0.gh.tar.gz 294812 BLAKE2B 579cdcd11ddc7061f7483749a6d1556b4190aab6e675546e89ea2437f5dfd1308661dd141976d5ac2e679493fd2671b098614293deb47f3eab72665a827efe43 SHA512 a605ac16aae3b4862e7a7141835ee82e9c0a08aa8a47fb7ca3fe86a739f2de7f17ba2a5c9c1ecda36ca44d964ab5c8c89539960282b43bdb0a6a2549f46a67d8
+DIST portalocker-4.3.2.gh.tar.gz 304218 BLAKE2B ca36b16fc0fecc659a8e408bc4238a40b74085508836dc3e24e9919ea6d1b25aea0b41055b459fd1693085f2a597dd3f0a12cecd645a3780ea683ea941eecd7e SHA512 92bc28b6476f0cbd09ad8454e857978b4aed16d25bf9ed7f2472ff37916ae8101a462ea63692a615c1f414c9af64e7a29dc2eb26c80b9e59885350eb71bf7f81
diff --git a/dev-python/portalocker/portalocker-4.3.2.ebuild b/dev-python/portalocker/portalocker-4.3.2.ebuild
new file mode 100644
index 000000000000..b3a42ce7d36d
--- /dev/null
+++ b/dev-python/portalocker/portalocker-4.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=uv-build
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A library for Python file locking"
+HOMEPAGE="
+	https://github.com/WoLpH/portalocker/
+	https://portalocker.readthedocs.io/
+	https://pypi.org/project/portalocker/
+"
+SRC_URI="
+	https://github.com/WoLpH/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		>=dev-python/fakeredis-2.31.0[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-6.0.0[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-{rerunfailures,timeout} )
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Disable code coverage in tests.
+	sed -i '/--cov/d' pyproject.toml || die
+}
+
+pkg_postinst() {
+	optfeature "redis support" dev-python/redis
+}
diff --git a/dev-python/psycopg/psycopg-2.9.12.ebuild b/dev-python/psycopg/psycopg-2.9.12.ebuild
index e80b772bb62e..25f6cef67517 100644
--- a/dev-python/psycopg/psycopg-2.9.12.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.12.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-db/postgresql-8.1:*"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )
+	test? ( >=dev-db/postgresql-8.1[server(+)] )
 "
 
 python_prepare_all() {
diff --git a/dev-python/psycopg/psycopg-2.9.13.ebuild b/dev-python/psycopg/psycopg-2.9.13.ebuild
index 1ad3f91a9ac1..73ea3472e314 100644
--- a/dev-python/psycopg/psycopg-2.9.13.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.13.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-db/postgresql-8.1:*"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )
+	test? ( >=dev-db/postgresql-8.1[server(+)] )
 "
 
 python_prepare_all() {
diff --git a/dev-python/psycopg/psycopg-3.3.4.ebuild b/dev-python/psycopg/psycopg-3.3.4.ebuild
index 9617f756b6fc..bc442ef1cf66 100644
--- a/dev-python/psycopg/psycopg-3.3.4.ebuild
+++ b/dev-python/psycopg/psycopg-3.3.4.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 		dev-python/cython[${PYTHON_USEDEP}]
 	)
 	test? (
-		>=dev-db/postgresql-8.1[server]
+		>=dev-db/postgresql-8.1[server(+)]
 		>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/psycopg/psycopg-3.3.5.ebuild b/dev-python/psycopg/psycopg-3.3.5.ebuild
index ee8c0e9246bc..ce6a36c2aa8d 100644
--- a/dev-python/psycopg/psycopg-3.3.5.ebuild
+++ b/dev-python/psycopg/psycopg-3.3.5.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 		dev-python/cython[${PYTHON_USEDEP}]
 	)
 	test? (
-		>=dev-db/postgresql-8.1[server]
+		>=dev-db/postgresql-8.1[server(+)]
 		>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/pyarrow/pyarrow-25.0.1.ebuild b/dev-python/pyarrow/pyarrow-25.0.1.ebuild
index 5dbf6a57b3c9..192db2d131e2 100644
--- a/dev-python/pyarrow/pyarrow-25.0.1.ebuild
+++ b/dev-python/pyarrow/pyarrow-25.0.1.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/apache-arrow-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~riscv x86"
 IUSE="+parquet +snappy ssl"
 
 RDEPEND="
diff --git a/dev-python/python-slugify/python-slugify-9.0.0.ebuild b/dev-python/python-slugify/python-slugify-9.0.0.ebuild
index 438081ec48f0..8d3e1f16b336 100644
--- a/dev-python/python-slugify/python-slugify-9.0.0.ebuild
+++ b/dev-python/python-slugify/python-slugify-9.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools-scm/Manifest b/dev-python/setuptools-scm/Manifest
index 3f3c1004ea19..955ba47ffdf7 100644
--- a/dev-python/setuptools-scm/Manifest
+++ b/dev-python/setuptools-scm/Manifest
@@ -1,8 +1,8 @@
 DIST setuptools_scm-10.2.1.tar.gz 154237 BLAKE2B 250978fc39815dc05f79aa5da3a688330c5a0a553e62e631f6781dda9551d5b077bb9bd07c70dec0fe340296f66d247a287bfe04dae60051212cd0b11bee1f65 SHA512 9ca752d7b6f56e4ba8d84d619099be04b0711719926e9e0fcbe9776bf42cb9485c78014532d0b787cf625820f664863a086dd7b600e8d1c54ae58ab6725187c0
 DIST setuptools_scm-10.2.1.tar.gz.provenance 10217 BLAKE2B 305ce26746d8239bca467956131f6d61b10084218e72e668cdee2108af9c03da6597d663d7bbc8309e056c3865d4808538ac7187c31dcfdeb9f659571754ef4c SHA512 e1620b0da56d77d6ca658e993d7663a86ac3cd5eb7d4e31ce147d156ad3365d922aa28ab42cf61c8c85f0f8e2cc350590d1f5cf4b2a63def8517d963125f870f
-DIST setuptools_scm-10.2.2.tar.gz 67111 BLAKE2B ce2f0eb600dbe7c6622bacb7307e8cc49273b516f9b907cb6cc93332c53e1ebdb5eab2e75312632931e7e81d519596dc38a40fb207341882c4aa98a05df3f347 SHA512 6b790910b6658c0843e8dd74ed21a2aa50eee67dbf20648ab7a466f020f871037f7826a0392c6398f515df5e7e57ed7c92bf855245d2e8b6275c73a5147e4dfe
-DIST setuptools_scm-10.2.2.tar.gz.provenance 10207 BLAKE2B 4d2aed3ed9bfb79eceeb1ab5dd138afd11452beca54062c7a20523eaef910225e839c3548ef268ff1533697284ccda84fd902641e7c602bb79b5ab49b2103d36 SHA512 93502cdff448756fda9ff9ca45de0480a2250745a5fd63cc57b369d4378baf42755cf942925eb03fff90433b95c603293dd6014c032ccc16fba1edabfbc1bdb7
 DIST setuptools_scm-10.2.3.tar.gz 67696 BLAKE2B 43d36a0ef3221f96d980311b5c4ac884320b7f54665fefe4f56e03ae3172954bd95f29bb881074bbb04f3c248c6140e7281b2ae5232f9fa09770449a5c7e5fcb SHA512 845403e925247c70f9399dc98da08e13fd5bbdbabb339ed380abccc07590eaf35efc592c04f5b8b44e55bbbf63d5c92e423fc12cf06534efafff20fb70c53f57
 DIST setuptools_scm-10.2.3.tar.gz.provenance 10125 BLAKE2B 581394d2844a82bd6f4eabc86a6c77d355a573573140e151a4b0d99525e51ea0df8fec8cbae2c331764f4377b3c4283620d8f1336251218f1c14b58318a2e31a SHA512 304b057feab4715373caff13d24b4599e73711a9de0833b4f0e6422914be997ad63fbb4fb15b14329c03e772c89493c5b68d97d6b0a37e6d99c5907db77c4298
+DIST setuptools_scm-10.3.0.tar.gz 71052 BLAKE2B a9b5917a7829ae994a2db34d263e8f9e062bbc1afad9114c791cba5804f92b11d280a734fbe3ef3fc03e0563b7364b3a0d2e481ebac01001daddb3c841ce20c4 SHA512 aa4c078f087eaf5d4bc2e8a05df52967bb80b87f549b80a8f48985e9a000e46d263c0345deb31da37b697e946266007b4a08d3c9d94267315406218e19126694
+DIST setuptools_scm-10.3.0.tar.gz.provenance 10262 BLAKE2B 8683cf524082d4b651ca668434e99c9330cbaff39ffd9afbd5b18f14349524c3aef785073f17ff8730a9777a5e9acf2cd153a0db833095c82c29c8781f3be353 SHA512 4d53231f8f07eee46cdda8ff227b6acdd20a77886be31fdb399318c25433e47ac35f863f6cac8489064bfc176fb1ac421f9d1e3be5d1273acd82ce78919ab773
 DIST setuptools_scm-9.2.2.tar.gz 203385 BLAKE2B 8577c4c6265ae851212be04b245b3da8b49d541174f5e675dea916c76b3cba5b5ab9f6264a97904e2d5ca02dee4e3f8eb88c9e8badbba2ed53bed531fe9f6b6c SHA512 757ca11a3d13601606b6914ea70e3d271d287f26ada976ec77334fc0f611208669585d2580994f1ddff830cd698a837d3e882dd5cdccdaf9f8eba34fdd8cb708
 DIST setuptools_scm-9.2.2.tar.gz.provenance 9705 BLAKE2B b710df7f8cbb324aa2927243ab0416869319813016d64f589b7a9f565576fff58c1aee18da4ea9bc3fb5a969cf74c1fcaa1332812bf88267ec9f2bf437876e53 SHA512 6ac563d0ab5f1afce28976eb030364a451508ec7d47b6e99668c37b8ba09e3b56500b104d62ad6047fad9f6be0b2b6ebea66b561041485b9d15b84c39fe92313
diff --git a/dev-python/setuptools-scm/setuptools-scm-10.2.2.ebuild b/dev-python/setuptools-scm/setuptools-scm-10.3.0.ebuild
index 1670599d087d..36a8bedcde9a 100644
--- a/dev-python/setuptools-scm/setuptools-scm-10.2.2.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-10.3.0.ebuild
@@ -25,11 +25,11 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-64[${PYTHON_USEDEP}]
 	=dev-python/vcs-versioning-2*[${PYTHON_USEDEP}]
-	>=dev-python/vcs-versioning-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/vcs-versioning-2.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	=dev-python/vcs-versioning-2*[${PYTHON_USEDEP}]
-	>=dev-python/vcs-versioning-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/vcs-versioning-2.4.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/build[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/syrupy/Manifest b/dev-python/syrupy/Manifest
index 7dd60920d984..c259835ed9ab 100644
--- a/dev-python/syrupy/Manifest
+++ b/dev-python/syrupy/Manifest
@@ -2,3 +2,5 @@ DIST syrupy-5.5.3.tar.gz 91614 BLAKE2B 5481efc54b256edf58a849881a7cdf4ebfa84f25f
 DIST syrupy-5.5.3.tar.gz.provenance 10174 BLAKE2B 2c903cddf3df51f8f1a325fa6a5e476ba3dad5299bd17a3e0ef8376439fc0394b8b591bfc0a204b0812754f39cfa7e84f2f807a03afc02f482469877abf36302 SHA512 56ca1a127baae757dbec0490608b67d29167355e8c3e9d2de3e78b3d01b4e825dd942b5475b2239bf6d474b04548c879011d0043bae5137b73f13778f73048fb
 DIST syrupy-6.0.0.tar.gz 99435 BLAKE2B 5780a6c085a7c78c77d41c277b2dc04b7a80a94cd60c5a7c039ce10dbdc7b50052c4f3f185c8829ae9539a6f8fe6520f5ba1dcdb68fac055ce5fa4865f5146fb SHA512 7dbb7a156b724100aae072f9316f264492b258fb1d5756b90f20c34acc453a1bafa1a0a195b0146b2ab536a27b6e6ce081976a4f9fdd7854dce10e5a50246e67
 DIST syrupy-6.0.0.tar.gz.provenance 9792 BLAKE2B 26f7f3e2cddf34d0cf25334b75abaad68983d47a7535acddc56520802d92aba43b74fbd818110a1f02d35a3d28a4f09e1705fa85baec1c6805540bfe183321be SHA512 f7b8a80151de9a300f22e90e20d501373303ddb9cfc5d1a0358c1ea12199d907aceaa0db900ab1cb6ef039f747fc323accccf034fe537fd281ad2fe5ddb7f13f
+DIST syrupy-6.1.1.tar.gz 109705 BLAKE2B ae0fc3f486515c76be8389641353a14c75f581ee8644144b6efdba9f0f1f54fb0436271dd48c60f1d0216e2588712537b47421a57faf08864fcf0f0419a3e2a4 SHA512 b4d0c35cbe13ad9d14f4d16df0bc67026e873752feae66c2138f615f7134409a2d16224b4214fecadabe217bba6c3217265880f1782e4674b8de2648adbf3cf0
+DIST syrupy-6.1.1.tar.gz.provenance 9804 BLAKE2B f6ae77399507cc879152b989973ffbd9582878f27e28e11653a3e911e8bf24f8e8716abf896bfa2a5b567d4636fca3de57e1b5c5be6593fda7ab63851a674df0 SHA512 98dfbe7c13d447609caa476dc34b7853adb0ff99273ba4fdb6452c13358d904ccf56f6659047f35af2f6fb758ffeccfd04dfb32cd31dc9ee0fac2de79892f10e
diff --git a/dev-python/syrupy/syrupy-6.1.1.ebuild b/dev-python/syrupy/syrupy-6.1.1.ebuild
new file mode 100644
index 000000000000..8835100d3b09
--- /dev/null
+++ b/dev-python/syrupy/syrupy-6.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYPI_VERIFY_REPO=https://github.com/syrupy-project/syrupy
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="The sweeter pytest snapshot plugin"
+HOMEPAGE="
+	https://github.com/syrupy-project/syrupy/
+	https://pypi.org/project/syrupy/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-8.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-26.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-2.13.4[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGIN_LOAD_VIA_ENV=1
+# pytest-xdist used inside tests
+EPYTEST_PLUGINS=( "${PN}" hypothesis pytest-xdist )
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -o xfail_strict=False
+}
diff --git a/dev-python/vcs-versioning/Manifest b/dev-python/vcs-versioning/Manifest
index ab01c2b4bd55..c8d210706d42 100644
--- a/dev-python/vcs-versioning/Manifest
+++ b/dev-python/vcs-versioning/Manifest
@@ -1,10 +1,8 @@
-DIST vcs_versioning-2.2.3.tar.gz 143653 BLAKE2B a0b1b4a923d775ca62ec60a0c006ee7b98ce047a9eaca2bbda7bdfe81fe945ac1dd4ebeec7f96bb6d8fbe45d1411e149cbbd83174e9f28f58f1937b966d3fbcf SHA512 847d97ffe3262052076876907e2564656dd6caf38ee8587ce2dd6759c22a4f1f7fd052b542ae78aa1baba25dc673e28d1ee8b984272ea25054a92dc94ff53779
-DIST vcs_versioning-2.2.3.tar.gz.provenance 10154 BLAKE2B 5fdf3e7f32c762afdcf1bb10b4b4a44c493ffa555a370a356462d54e950f28a7d91a6edf501dd2971967140b76b5356ee538e6ef1de5c26c4bc72be8265daee8 SHA512 d6b3fe687707de6ffbf7dc1036bc94cc1973c555c3e49151ba0393ef9fa13498d7005d71d38202ce0e582f785d76b70d9940f2e1be582f9c22677de4a6508153
 DIST vcs_versioning-2.2.4.tar.gz 145243 BLAKE2B 16d123f10c3152f4b544eed83810b3f3696cb0bcd393d987b33dd2fa86455275403e47866c3b3bc95f3e93752eadf3501adc0dcee948d43a944281db3b5f61e6 SHA512 f2fa4536d3f204f291341af3be4ec22c12867fe8bfe4ee5851794bf7a6847c3657f55297a8a42639916115cc4e5b2cb2a14171e3591610dd55ec0035f2c0a347
 DIST vcs_versioning-2.2.4.tar.gz.provenance 10291 BLAKE2B e72e9eb5e0d79167d096ab41c490644df810dda5294bec656a3089e46b50aa9ace2abbada783b3d2af16e076e54e836df2a15028a9657661836ad71e029aedd8 SHA512 c13a63480f0985d56a17965cff2e2b41aa1c491be153409d4dcb62a4b578d677718e4c2de98d89b4043d6a547184fda81e15f1ddf663caf95969b77981a2a3ec
 DIST vcs_versioning-2.3.1.tar.gz 156292 BLAKE2B 5d8ceee494d3d048e6e6102455123ff7b41a9ee6237d9788133189f90c77b55995f27a10a4209a87ff6f6e919ed57078b7e05bce3e271b2452d1eabf88bfe527 SHA512 31ea5d94b881eb19c709873086110498c64da4a3525f6eace82fe693ea7243b812f1434c20e08ad8c6ad9c3cb013831ecfe88834739dc60a9c1b78fb746c5dee
 DIST vcs_versioning-2.3.1.tar.gz.provenance 10199 BLAKE2B 3e9f7ba44894c8a28eadd9cf6d5398dd56ed53a60776e89d0f6eadbe379e0c0f6d973ebaa4580c96e1f7862bf711ab6e1db26f196c5bdff42f8e271ed2c053e5 SHA512 cbafe022dbcf0bc28db3d4e17a272f052ff2ab17c44a155a8e63b11fe640bdbdbec8ab4b9ba3fe8ed9028de3a756190e0b76eed1be692d7234a5086046839a3c
-DIST vcs_versioning-2.3.2.tar.gz 149377 BLAKE2B 59ef750eef0f2bfe8a23697830bd1b30aaf262a875f4926d362a71390cec5ef38e7d741587751432ae02df563ec457aff1a72ec385887dce0927bb705197d7d5 SHA512 d50d809d2062e828181180d74f983aa68bb35e3cc985e5a14cad785da47a99c390b44da66ab473bcff22b49d340338ae2027efbb70087938ba23743550eaead0
-DIST vcs_versioning-2.3.2.tar.gz.provenance 10156 BLAKE2B a4ff73c5f12f0da7c2cbd20f9eff44a60fe9e9157a040439059f0e577744b0505b4fb870ad2c9c937dce791e06a366950db382b89e4dc5930fefb91d9e78bd96 SHA512 4f0de3cf863dc730cd5d2ac0e4802fbdd0803749254c4ec0e30095d2619ebcab52bcef284c46d95c6a9c4c679150c370bcd328b611b51e81c1bf8cc28db90195
 DIST vcs_versioning-2.3.4.tar.gz 149647 BLAKE2B 1ca6aea0effd2d743140e23828ed025be1cb22190be1a971f31de912de539f70e1c6316472ed4d0535bee1dfd647771884e4297f6d58fc5f5362cfa932064c7f SHA512 6eebdf57d70f994e9f760c736fd66613eb639d72ee71737d9a8e9fb05edcc07a6532f0ee16dc4f6296f502f903300b86042892f57fe14ee4ab50fe10bc54dd8a
 DIST vcs_versioning-2.3.4.tar.gz.provenance 10246 BLAKE2B 562e356ece3ee4061fe5b55ffc9c7f67d621aa903c8cc8ac724789f4e8bae4f7a5044d49fed38130ac74afdaedc4f456af31aa9b9a24759e6580773c0d17d1fa SHA512 48e6903166bce3c2157f5c8622c07d254e3daa9ef14a404780fdc25d7d7bb9eea3a37a8c183c51df9fc1f0ee5d37cbaf8a2fb8454c4ea24f3b0b966f4651e02c
+DIST vcs_versioning-2.4.0.tar.gz 160078 BLAKE2B ed7620ec9275d1f0e98699e37792de872b0e11b8ba5776efcab8903af45e2c0507cc2bd8b4f86d8df30d8271f4d7748f04674e231ef5e343af5c1da5d9a44c57 SHA512 4749ad4e6fd2ca3112b95f35c2f2dc1da9b29a3ae4eccc654a1838c2ac5329ad34058c52c0f32cb001eafac063d0dcc594f0d644a39875f62b084b9b9157ecf4
+DIST vcs_versioning-2.4.0.tar.gz.provenance 10246 BLAKE2B 2f628fcbd6094f3b3b75bbd665854abb17cd09fa0d7f8939e7fa360ac9be5de25b8ae65a54a601790fd92fa0d2fe6b0244908f7220004a13276bc725c0343435 SHA512 939467cf501b461fa34a79c399ee14e7b49d8ae657a3c6ebc80303bc9104dd51a01b086029b43ddee9a957172dae70bada7b31240ce0a48857b2365420fdbd7b
diff --git a/dev-python/vcs-versioning/vcs-versioning-2.2.3.ebuild b/dev-python/vcs-versioning/vcs-versioning-2.2.3.ebuild
deleted file mode 100644
index 1ca84ef15ccb..000000000000
--- a/dev-python/vcs-versioning/vcs-versioning-2.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_VERIFY_REPO=https://github.com/pypa/setuptools-scm
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core VCS versioning functionality from setuptools-scm"
-HOMEPAGE="
-	https://github.com/pypa/setuptools-scm/
-	https://pypi.org/project/vcs-versioning/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-26.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/setuptools-scm-10.1.1[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=( pytest-timeout )
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# the usual nondescript gpg-agent failure
-	testing_vcs/test_git.py::test_git_getdate_signed_commit
-)
diff --git a/dev-python/vcs-versioning/vcs-versioning-2.3.2.ebuild b/dev-python/vcs-versioning/vcs-versioning-2.4.0.ebuild
index f253689d01b8..f253689d01b8 100644
--- a/dev-python/vcs-versioning/vcs-versioning-2.3.2.ebuild
+++ b/dev-python/vcs-versioning/vcs-versioning-2.4.0.ebuild
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index 820c2d32754d..a1d23ef38e7b 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,3 +1,2 @@
-DIST xvfbwrapper-0.2.27.tar.gz 12716 BLAKE2B ae79a18c0bce0ce2ba48242b845370083b3db70411c22b59deacbba1dc727a320f27c93613b71002c3dcbb0ecb3ac2b9b1590d9f01c1b77b8817a676672b7d15 SHA512 4cf5254767d483dad45d9365e9cc09c98a1bce0ea730994d5db0516f7ff84596d06d7ca0fde884687920052742390ee981af2241b8db4c95e850aada7c23575c
-DIST xvfbwrapper-0.2.28.tar.gz 12830 BLAKE2B df12edac5361cdbbfedd148041a123d156ac43e9ac181396e7cf3caf20646173277f38726b1e8bfbb8630fbbf03dd8367d0f29bb3e77f41f35511dcd0d2296d1 SHA512 04638b5d0724ef60a6ae182b597279c46d8814bb86e5318de43241130e0c7a57d0a46f8a836c103cebaaf4fa56663fd9727d638d3e2770f76fadefddcf8d4381
 DIST xvfbwrapper-0.2.29.tar.gz 12853 BLAKE2B d6d931a9742e29e34bc1506da2121c67eaf3bbcaa61f2c14c61fc2a7baaf4424949f836248917903264a7f64c425e8f20a6fa631a789fbff4a0c071a8d59dd47 SHA512 c546c7db922dc0027450a9526e94102cdcc0ac322c106574fb35ff70315daa6b4c1d1319aa240259fb1574af129227835cd3a0670dccf89b5d81f6e7b9a643c5
+DIST xvfbwrapper-0.2.32.tar.gz 13308 BLAKE2B 2bc2a5d5c681a7ff898c09803b1fd16c8550bbd0871705ac950c0daec64df58525dc249c3d475e28266d0ea3fdb6c0b5d0c681fb9b4bcecca8846dad7db162c1 SHA512 0c4cf35816e325de2688b3781d4a96518d97ac1c2654a5c422ac5787bf6306cfb3af2b57a526823715286c0cba0a0b3b02694c29c14995f5f5ff59a189b2e802
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.27.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.27.ebuild
deleted file mode 100644
index 08ba139152c5..000000000000
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.27.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
-HOMEPAGE="
-	https://github.com/cgoldberg/xvfbwrapper/
-	https://pypi.org/project/xvfbwrapper/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	x11-base/xorg-server[xvfb]
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.28.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.32.ebuild
index 787856574075..787856574075 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.28.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.32.ebuild
diff --git a/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild b/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild
index 584f4a590256..686251d2e718 100644
--- a/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 IUSE="+examples +html +qch"
 REQUIRED_USE="|| ( examples html qch )"
 
diff --git a/dev-qt/qt3d/qt3d-6.11.2.ebuild b/dev-qt/qt3d/qt3d-6.11.2.ebuild
index 5957907bde31..ba584b915185 100644
--- a/dev-qt/qt3d/qt3d-6.11.2.ebuild
+++ b/dev-qt/qt3d/qt3d-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt5compat/qt5compat-6.11.2.ebuild b/dev-qt/qt5compat/qt5compat-6.11.2.ebuild
index 736fef3686c5..a449ab4e8db1 100644
--- a/dev-qt/qt5compat/qt5compat-6.11.2.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="+gui icu qml"
diff --git a/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild
index c30083299097..f9d710f2e646 100644
--- a/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 declare -gA QT6_IUSE=(
diff --git a/dev-qt/qtcharts/qtcharts-6.11.2.ebuild b/dev-qt/qtcharts/qtcharts-6.11.2.ebuild
index 6c11cea736a2..4136563be89b 100644
--- a/dev-qt/qtcharts/qtcharts-6.11.2.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Chart component library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild
index 79709c841225..c64eaa7cf44b 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="+bluetooth neard nfc smartcard"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild
index 61d15f4100dd..029fa6b590b0 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild
@@ -13,7 +13,7 @@ inherit python-any-r1 qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild b/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild
index 65c441229f45..0d99cbdf5f3e 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 x86"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild
index ba45fab241a7..347ec2fc45b5 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/qtlocation-6.11.2.ebuild b/dev-qt/qtlocation/qtlocation-6.11.2.ebuild
index f45e5eba626b..ccacdaaf00c7 100644
--- a/dev-qt/qtlocation/qtlocation-6.11.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild
index 24193b59dfaa..8c0bf1e0fdcc 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild
index da29b54ab212..e31924aa8c2c 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
diff --git a/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild
index 71a62d763abe..7ebedb0937e4 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Physical position determination library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="geoclue nmea +qml"
diff --git a/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild
index 5a4d0d30fbb6..77359a402054 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild
index b8b579b8cc27..394b3826c8cd 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtscxml/qtscxml-6.11.2.ebuild b/dev-qt/qtscxml/qtscxml-6.11.2.ebuild
index 1fddc362dc3f..ed22fee44c7f 100644
--- a/dev-qt/qtscxml/qtscxml-6.11.2.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtsensors/qtsensors-6.11.2.ebuild b/dev-qt/qtsensors/qtsensors-6.11.2.ebuild
index d9ed04c361e1..475a107a278e 100644
--- a/dev-qt/qtsensors/qtsensors-6.11.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Hardware sensor access library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtserialbus/qtserialbus-6.11.2.ebuild b/dev-qt/qtserialbus/qtserialbus-6.11.2.ebuild
index 116247f3bb0b..0639ef49ade9 100644
--- a/dev-qt/qtserialbus/qtserialbus-6.11.2.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtserialport/qtserialport-6.11.2.ebuild b/dev-qt/qtserialport/qtserialport-6.11.2.ebuild
index cfac09635f1a..107e9d135791 100644
--- a/dev-qt/qtserialport/qtserialport-6.11.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Serial port abstraction library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild
index 22459523d23e..d3233244f119 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtspeech/qtspeech-6.11.2.ebuild b/dev-qt/qtspeech/qtspeech-6.11.2.ebuild
index 3c7c6a3f1316..2b2f45545c44 100644
--- a/dev-qt/qtspeech/qtspeech-6.11.2.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.11.2.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtsvg/qtsvg-6.11.2.ebuild b/dev-qt/qtsvg/qtsvg-6.11.2.ebuild
index 929ff37ace4a..98f1e1541027 100644
--- a/dev-qt/qtsvg/qtsvg-6.11.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qttools/qttools-6.11.2.ebuild b/dev-qt/qttools/qttools-6.11.2.ebuild
index 943e44a29d87..83162bff9f11 100644
--- a/dev-qt/qttools/qttools-6.11.2.ebuild
+++ b/dev-qt/qttools/qttools-6.11.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qttranslations/qttranslations-6.11.2.ebuild b/dev-qt/qttranslations/qttranslations-6.11.2.ebuild
index b18b2c945bb0..f6d53f0175fd 100644
--- a/dev-qt/qttranslations/qttranslations-6.11.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Translation files for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 DEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild
index a19423946286..e8870bad1102 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="+sound +spell"
diff --git a/dev-qt/qtwayland/qtwayland-6.11.2.ebuild b/dev-qt/qtwayland/qtwayland-6.11.2.ebuild
index 38fc85e340ad..27cd1736af9d 100644
--- a/dev-qt/qtwayland/qtwayland-6.11.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Toolbox for making Qt based Wayland compositors"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="gnome qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild
index ce945638a29b..7b40ef4641c0 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt WebChannel"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild
index 51296a75e242..c279739faa88 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild b/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild
index 5032699b3cf5..25cffaddf551 100644
--- a/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild
+++ b/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34 ruby40"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md HISTORY.md README.md"
diff --git a/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild b/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild
index 23194b96360e..ba7afd91a436 100644
--- a/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild
+++ b/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34 ruby40"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md HISTORY.md README.md"
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index da9ca24a6650..baf6ebfb57a5 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-builder-48.2.tar.xz 10695900 BLAKE2B 69b1aa647f8a8e337315ea2ba506c5c8f404b36a90b4ccfdc7c070fb03430f8385d7928f75c2d2c5148c8904e00cda87eec1e7e6ae2809dfb1868bd267aaae79 SHA512 610aebc5c314f0f4078ce92d79fdcc369e1b3c4ed9ef2aec5eba890035456ea522377e69a1b737364909abbc71243d3f310896ea16559905cfbe9e02de69b72d
 DIST gnome-builder-49.1.tar.xz 11354544 BLAKE2B b097ec9c89d1c132ba4cba991d8751023079d97b33bbfb92e1cadd74138db1ea1607b94457a63da831b05926b81c75629a4ad6bdfc8eae304e4e8aedbde57a2f SHA512 4666e327d814f228d700608176c9f91daf34b183e00824d4ccfdf1cb0407d90c09e606369050a0240576b5b18e635e52da62c9ac9219a88891967ac15173a40f
+DIST gnome-builder-50.0.tar.xz 11371712 BLAKE2B 141e03937138e23b6f926088b1b405d8fd20498c22a4fa0e9b87d0b641aa71946cd0159a4506e22d6e9da9c553a69f791fbb472122b18320f3d03e2b8fd9fe15 SHA512 08dc1489ede032e3739278a9de38a6dd8cb0fd5dd6129b3615b99d8b52b13c9e2dc8e37f91547b8b0d690d895a1af97a14a355aafb8029c264aa792aa11227ca
diff --git a/dev-util/gnome-builder/gnome-builder-48.2-r2.ebuild b/dev-util/gnome-builder/gnome-builder-50.0.ebuild
index 0eee8cce858f..d54b70bdf411 100644
--- a/dev-util/gnome-builder/gnome-builder-48.2-r2.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-50.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 LLVM_COMPAT=( {18..20} )
 PYTHON_COMPAT=( python3_{13..14} )
 DISABLE_AUTOFORMATTING=1
@@ -15,36 +16,39 @@ HOMEPAGE="https://apps.gnome.org/Builder/ https://gitlab.gnome.org/GNOME/gnome-b
 # FIXME: Review licenses at some point
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	flatpak? ( git )
 "
 
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements
+# within. `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their
+# double checking. The listed RDEPEND order should roughly match that output as well, with toplevel one first then
+# sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements.
+# Many of them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but
+# not all small things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports
+# in try/except.
 
 # Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for
+# gi.repository).
 
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
 RDEPEND="
-	>=dev-libs/glib-2.75:2
+	>=dev-libs/glib-2.85:2[introspection]
 	>=gui-libs/gtk-4.15.5:4[introspection]
-	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gui-libs/gtksourceview-5.17:5[introspection]
+	>=gui-libs/libadwaita-1.8_alpha:1
 	>=gui-libs/libpanel-1.7.0:1
-	>=gui-libs/gtksourceview-5.15:5[introspection]
 	>=dev-libs/json-glib-1.2.0
 	>=dev-libs/jsonrpc-glib-3.43.0:=
 	>=dev-libs/libdex-0.7:=
 	>=dev-libs/libpeas-1.99.0:2[python,${PYTHON_SINGLE_USEDEP}]
 	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.1:=[introspection]
+	dev-libs/libyaml
+	>=dev-libs/template-glib-3.37.1:=[introspection]
 	>=gui-libs/vte-0.75.0:2.91-gtk4[introspection]
 	>=dev-libs/libxml2-2.9.0:=
 	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
@@ -60,7 +64,6 @@ RDEPEND="
 		>=dev-libs/libgit2-glib-1.1.0[ssh]
 	)
 
-	>=dev-libs/gobject-introspection-1.82.0-r2:=
 	${PYTHON_DEPS}
 	clang? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}=') )
 	spell? (
@@ -73,8 +76,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # TODO: runtime ctags path finding..
 
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be
+# explicit and unconditional.
+# appstream-glib needed for validation with appstream-util with FEATURES=test.
 BDEPEND="
 	doc? (
 		$(python_gen_cond_dep '
@@ -113,12 +117,14 @@ support.
 * net-libs/nodejs[npm] for integration with the NPM package system.
 '
 # FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather
+# important.
 # eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
+# jhbuild support.
 # rust support via rust-analyzer; Go via go-langserver
 # autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside
+# IDE.
 # stylelint for stylesheet (CSS and co) linting
 # gvls for vala language-server integration
 
@@ -143,6 +149,8 @@ src_configure() {
 		-Dctags_path=''
 		$(meson_feature webkit)
 
+		-Dplugin_arduino=true
+		-Dplugin_astro_language_server=true
 		-Dplugin_autotools=true
 		-Dplugin_bash_language_server=true
 		-Dplugin_blueprint=true
@@ -158,6 +166,7 @@ src_configure() {
 		-Dplugin_codespell=true
 		-Dplugin_code_index=true
 		-Dplugin_copyright=true
+		-Dplugin_css_preview=true
 		-Dplugin_ctags=true
 		-Dplugin_deviced=false # libdeviced not packaged?
 		$(meson_use d-spy plugin_dspy)
@@ -208,7 +217,8 @@ src_configure() {
 		-Dplugin_retab=true
 		-Dplugin_rstcheck=true
 		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_ruff=true
+		-Dplugin_rust_analyzer=true
 		-Dplugin_serve_d=true
 		-Dplugin_shellcheck=true
 		-Dplugin_shellcmd=true
@@ -244,9 +254,15 @@ src_install() {
 		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
 		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
 		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source".
+		# Additionally default docompress exclusion of /html/ already ensures they aren't compressed,
+		# thus linkable as-is.
 		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
 	fi
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || diemkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/libide "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
 	readme.gentoo_create_doc
 }
 
@@ -268,5 +284,5 @@ pkg_postrm() {
 }
 
 src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" --print-errorlogs || die
 }
diff --git a/dev-util/hip/files/hip-7.2.0-local-fixes.patch b/dev-util/hip/files/hip-7.2.0-local-fixes.patch
new file mode 100644
index 000000000000..1d1a5c2633e0
--- /dev/null
+++ b/dev-util/hip/files/hip-7.2.0-local-fixes.patch
@@ -0,0 +1,21 @@
+Defining __local before inclusion of libc++ <ranges> or <deque> causes compilation errors.
+
+Upstream bug: https://github.com/ROCm/rocm-systems/issues/1874
+--- a/hipamd/include/hip/amd_detail/device_library_decls.h
++++ b/hipamd/include/hip/amd_detail/device_library_decls.h
+@@ -120,6 +120,15 @@ extern "C" __device__ __hip_uint64_t __ockl_fprintf_append_string_n(__hip_uint64
+                                                                     __hip_uint64_t length,
+                                                                     __hip_uint32_t is_last);
+ 
++// libc++ <ranges> uses __local as function name; include one file, before defining __local macro
++#if defined(__cplusplus) && defined(_LIBCPP_VERSION) && defined(__has_include)
++#  if __has_include (<__ranges/join_view.h>)
++#    include <__ranges/join_view.h>
++#  endif
++// Deque also uses __local function name; include should be safe, as it is autoincluded anyways
++#  include <deque>
++#endif
++
+ // Introduce local address space
+ #define __local __attribute__((address_space(3)))
+ 
diff --git a/dev-util/hip/files/hip-7.2.0-noinline-fixes.patch b/dev-util/hip/files/hip-7.2.0-noinline-fixes.patch
new file mode 100644
index 000000000000..ee5d17a7b15c
--- /dev/null
+++ b/dev-util/hip/files/hip-7.2.0-noinline-fixes.patch
@@ -0,0 +1,26 @@
+Unsetting __noinline__ before inclusion of libc++ __config breaks libc++ headers.
+
+Additionally, `[[__gnu__::__noinline__]]` is used in libstdc++-16 `#include <format>`,
+causing build failures in libstdc++ as well.
+
+Bug: https://github.com/ROCm/rocm-systems/issues/1874
+--- a/hipamd/include/hip/amd_detail/host_defines.h
++++ b/hipamd/include/hip/amd_detail/host_defines.h
+@@ -250,6 +250,17 @@ typedef __hip_internal::int64_t __hip_int64_t;
+ 
+ #define __global__
+ 
++// __config in libc++ fails on `__has_attribute(__noinline__)` if __noinline__ is emptied
++#if defined(__cplusplus) && defined(__has_include)
++#  if __has_include(<__config>)
++#    include <__config>
++#  else
++// format in libstdc++-16 fails on `[[__gnu__::__noinline__]]` if __noinline__ is emptied
++// https://github.com/ROCm/rocm-systems/issues/1874#issuecomment-5550937256
++#    include <format>
++#  endif
++#endif
++
+ #define __noinline__
+ #define __forceinline__ inline
+ 
diff --git a/dev-util/hip/hip-7.2.0-r1.ebuild b/dev-util/hip/hip-7.2.0-r2.ebuild
index 7adb39306caa..272781d82d9d 100644
--- a/dev-util/hip/hip-7.2.0-r1.ebuild
+++ b/dev-util/hip/hip-7.2.0-r2.ebuild
@@ -87,9 +87,9 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-6.3.0-no-isystem-usr-include.patch"
 	"${FILESDIR}/${PN}-6.3.0-clr-fix-libcxx.patch"
-	"${FILESDIR}/${PN}-7.0.2-fix-libcxx-noinline.patch"
-	"${FILESDIR}/${PN}-7.0.2-fix-libcxx-ranges.patch"
 	"${FILESDIR}/${PN}-7.1.0-no-hipother-install.patch"
+	"${FILESDIR}/${PN}-7.2.0-noinline-fixes.patch"
+	"${FILESDIR}/${PN}-7.2.0-local-fixes.patch"
 )
 
 QA_FLAGS_IGNORED="usr/lib.*/libhiprtc-builtins.*"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 2b1183415db9..8e17c8a5973c 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
 DIST intel-graphics-compiler-2.37.1.tar.gz 12508039 BLAKE2B 9555401482133ab6efa6b214179d8c2986efe261c03613684f3db3b5f8482b53310f70682dc2fc7b69ae3d8dc6bb93c26a24a64a29b3b0069f4a860f86e50084 SHA512 27a69e8f08527d6a1f1f88a6b326d151da2806085a7c23984a8dc2d3edf33342005d4931ffc84a502b64b9f45405d50df856258caae4ff8372373cf434b7d659
+DIST intel-graphics-compiler-2.41.5.tar.gz 12949463 BLAKE2B cc56aad8f09ff22f341bf7156eceb3cb3bfae603d420a18dde45b47446645eca790c894b53250b608c1fd7587d86e804f8c051a770d61f656bbecc9dd86fd515 SHA512 c474597e61770dbfb5d6e0b3d7c2b675fef0c4f6f29c5548681ce83328c725a150c71720756344c603e8e8bc09f4c8701cac21940289909c33a6ca26db1217d6
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-2.41.5-guard-debug.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-2.41.5-guard-debug.patch
new file mode 100644
index 000000000000..037b39dc89c7
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-2.41.5-guard-debug.patch
@@ -0,0 +1,25 @@
+From d5f71e598ef63dadf718413b9d8d6e6dffd98d26 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 13 Sep 2026 17:21:44 +0200
+Subject: [PATCH] IGC/AdaptorOCL/dllInterfaceCompute.cpp: guard
+ LLVMModule->dump();
+
+---
+ IGC/AdaptorOCL/dllInterfaceCompute.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/IGC/AdaptorOCL/dllInterfaceCompute.cpp b/IGC/AdaptorOCL/dllInterfaceCompute.cpp
+index 01bc19e421ad..c2be50bf7746 100644
+--- a/IGC/AdaptorOCL/dllInterfaceCompute.cpp
++++ b/IGC/AdaptorOCL/dllInterfaceCompute.cpp
+@@ -454,8 +454,10 @@ bool TranslateSPIRVToLLVM(const STB_TranslateInputArgs &InputArgs, llvm::LLVMCon
+     // Parse SPIRV extensions and encode them as 'igc.spirv.extensions' metadata
+     GenerateSPIRVExtensionsMD(Context, *LLVMModule, SPIRVBinary.str());
+ 
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
+     if (IGC_IS_FLAG_ENABLED(ShaderDumpTranslationOnly))
+       LLVMModule->dump();
++#endif
+   }
+ 
+   return success;
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.41.5.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.41.5.ebuild
new file mode 100644
index 000000000000..30780c3c7cbb
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-2.41.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_COMPAT=( 22 )
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit cmake flag-o-matic llvm-r2 python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:22[${LLVM_USEDEP}]
+	dev-util/spirv-tools
+	$(llvm_gen_dep '
+		llvm-core/lld:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.25.0[${LLVM_USEDEP}]
+		dev-util/spirv-llvm-translator:22=
+	)
+"
+
+RDEPEND="
+	!dev-util/intel-graphics-compiler:legacy
+	${DEPEND}
+"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	$(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-2.30.1-Werror.patch"
+	"${FILESDIR}/${PN}-2.41.5-guard-debug.patch"
+)
+
+pkg_setup() {
+	llvm-r2_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #938519 and https://github.com/intel/intel-graphics-compiler/issues/362
+	filter-lto
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="OFF"
+		-DCCLANG_FROM_SYSTEM="ON"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__ENABLE_BF16_BIF="ON"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="$(get_llvm_prefix)/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${LLVM_SLOT}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index 281194bd9747..19b97f3dc68f 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,2 +1,2 @@
-DIST intel-graphics-system-controller-1.3.0.tar.gz 208522 BLAKE2B 1ea3e37a0bb451d8cdc1e47c68ca44af9dd8354d43dc96532ff842ea0c41b1e1b0babd07e53c841ccf2932253eba87486c312514e2272000f8acd5985d004638 SHA512 e55b084e6bad8b9eda53fdbcd8872786a6ed4aa4332ac171b54e661abd0bcbb4d891baf95716058f076c0d5dd5baa9628254b80631f7a844b90b93a5392dde7b
 DIST intel-graphics-system-controller-1.3.1.tar.gz 209189 BLAKE2B 70c67ceb9d1c6de4d64cd229eb11ca172ae2167f6ef8f650f1de3bd5b8bb5984a7c385ee0a0d2cada1ef253eb1326b45924cc83a83e30f61337ef938bb6026e9 SHA512 62490aab0bcee4efd67e76293b9b5ee0b5bb92431dd5aeb042cfee352a767ed00d8e424cbff4ec60aaca19e758c50a13ebb222bf4520c74741d6eee3f40b932c
+DIST intel-graphics-system-controller-1.3.2.tar.gz 209256 BLAKE2B 4a53c1ad69b665d992df8511eca3ea87df33a5ac2b3b03291e5c0f7596fc596f5a5800d54c5fb1a7db1ddcbd62881dcb2618a9add915a5289d02a1f951b7ec32 SHA512 c7027540a689bd97235c4f73e11820e93d1612a6d357c4443e7eb4ba6d5cd8039fef24ec008eea5f77439d8778fff4aa61b35a1f31cfd5479d5dccbbd3fc9ab3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.1.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.1.ebuild
index f1b197c67853..9c57478eb4f0 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.1.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+cli doc"
 
 RDEPEND=">=dev-libs/metee-6.2.5:="
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.0.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.2.ebuild
index f87e023fe433..f1b197c67853 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.0.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-1.3.2.ebuild
@@ -16,10 +16,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+cli doc"
 
-RDEPEND=">=dev-libs/metee-6.2.4:="
+RDEPEND=">=dev-libs/metee-6.2.5:="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-2.4.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-2.4.0.ebuild
index 56f44ae1ce12..723f9da4f42b 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-2.4.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-2.4.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~hppa ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/nsight-compute/Manifest b/dev-util/nsight-compute/Manifest
index 2751aeb58c22..980e720977b2 100644
--- a/dev-util/nsight-compute/Manifest
+++ b/dev-util/nsight-compute/Manifest
@@ -1,7 +1,3 @@
-DIST nsight-compute-armserver-2025.1.1.2-35528883.run 159558687 BLAKE2B c331393081a26c2d66d5f2f022f3aa422a453802d7d54d48bb39033d7d7fb902a2ee0347608baf10091b56383c1fab689493882356f7dae232b8bad691c1cbe0 SHA512 092d2f20738570ae01f3942d472879f5f13cb9d864532314b432cfa81205976d114cd55c69d207b290abb917195b26068c27bc4c1440ff0bd0fd3b2c636c9cb8
-DIST nsight-compute-armserver-2025.2.0.11-35613519.run 151634412 BLAKE2B dbc2567459a3d369b69188e760cfc77a3814018dab2aba1705ff7f36794c425b556435d4f083caee0d76cb9b69d5c8a77daa64d4d9dce4910957f5e8dfcc17aa SHA512 169a474bc47c8603093b2668652b4277659cd61f074a25bd017e90b804822c5dc20238be6af51cc2f2edff41d36487bed7bfab5657849fb373459b4323035e30
-DIST nsight-compute-linux-2025.1.1.2-35528883.run 433112184 BLAKE2B d657aa7b8e3b075ef25e04318ff34c0eeac2bd60b881524d922aee8aa955e01ece740b3c2b5b4cfb993046999894610ecf1fc2443f36bfefa6b6882baf5328a2 SHA512 bd42323f3e22713386db4a29e422ef4ae1322d030b5705ba50b52b04a532e3e19f7b9af6731a3b47ec023460bb09b286bc2752a8838d6f2d8077ce43970f3670
-DIST nsight-compute-linux-2025.2.0.11-35613519.run 437421991 BLAKE2B 7ece25195f733a83fad8511e7aa850c5652a9f958c2b2644d737f9dfd70120fc64c40fab9b63c0b26b78de8a29b6fc59d2db2e8fb33c2474792a5b8eb0bfb0ab SHA512 3af3894c1f5825dd339b0c4b57ba219988fff46a80a363be8d5835ff467272899d53e7c5d429ea08f2bf9be1ff62c6185a5bfec36b9a0cf3e9851f99a8b0d626
 DIST nsight_compute-linux-sbsa-2026.3.0.13.run 284988987 BLAKE2B 1db24ea9eca3d37e47ec9b4b8c5219bee1d1515ea8e11cef8b7e0c631d61213a76b5151ec7e391f412ca11401a5e342b29704c5783f3a1927d4fba1e9ab5c457 SHA512 1a3971dba72bffc72184bafb829361fe6f3c190c18e1a85b640cd1204396b8c93e4062927425a8d076ec241aedf616f60e63ac99f444afb6de95d97527201a56
 DIST nsight_compute-linux-x86_64-2026.3.0.13.run 565748557 BLAKE2B 6581104f4a1211b5eabd687085c642250fe79737858da918c4d3106d9ab16188c1843cfb740842cb6967ad6d30c7de009bafd438c321643f20e281fb3407040d SHA512 7a547ee132759d642a186222e2c09d7ef3664276e8917c30caa3ce8e86e732aae7b35ee4eb9a919dc1776a16739c2bf66e70d1dac52f24ff3c55609363f2dc44
 DIST nvidia-nsight-compute-icon-gbp-shaded-128.20231126.png 17468 BLAKE2B 2150f8c31ad12945614d07c33aafce838b381e40025ed72b77cbd2bcc42e532d82a9159f7ce9b51b2f8b8cddd49433c8ba9bebffb8c29b77560a476df8632025 SHA512 1e5a08b4b02ea7f1a3eb1dc4fe340fbe887eff70b663c61f5a3ffedef0ed7f6c6478ac70e05d90b11c070959529cfcdd899735409e92f5d4fedc6785f993db2b
diff --git a/dev-util/nsight-compute/nsight-compute-2025.2.0.11.ebuild b/dev-util/nsight-compute/nsight-compute-2025.2.0.11.ebuild
deleted file mode 100644
index 4887e2bb3741..000000000000
--- a/dev-util/nsight-compute/nsight-compute-2025.2.0.11.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop edo unpacker
-
-DESCRIPTION="performance analysis tool designed to visualize an application's algorithms"
-HOMEPAGE="https://developer.nvidia.com/nsight-systems"
-
-MY_PV="$(ver_rs 1-3 '_' "$(ver_cut 1-3)")"
-MY_PN="${PN//nsight-}"
-MY_PN_SHORT="cu"
-
-PV_BUILD="35613519"
-SRC_URI="
-	amd64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-linux-${PV}-${PV_BUILD}.run
-	)
-	arm64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-armserver-${PV}-${PV_BUILD}.run
-	)
-	mirror+https://developer.download.nvidia.com/images/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.png
-		-> nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png
-"
-
-S="${WORKDIR}/pkg"
-
-LICENSE="NVIDIA-r2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64"
-
-RESTRICT="bindist mirror strip test"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	dev-qt/qtdeclarative:6
-	dev-qt/qtpositioning:6
-	dev-qt/qtwayland:6
-	dev-qt/qtwebchannel:6
-	dev-qt/qtwebengine:6
-	media-libs/fontconfig
-	media-libs/libglvnd
-	media-libs/tiff-compat:4
-	sys-apps/dbus
-	sys-cluster/rdma-core
-	x11-drivers/nvidia-drivers
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libdrm
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libxshmfence
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-"
-
-BDEPEND="
-	dev-util/patchelf
-"
-
-QA_PREBUILT="/opt/nvidia/${PN}/$(ver_cut 1-2)"
-
-src_prepare() {
-	if [[ -n "${EPREFIX}" ]]; then
-		sed  -e "s#=/#=${EPREFIX}/#g" -i usr/share/applications/*.desktop || die
-	fi
-
-	pushd host/linux-desktop-* >/dev/null || die
-
-	local rpaths rpath
-	readarray -t rpaths < <(find . -maxdepth 1 -name '*.bin')
-	for rpath in "${rpaths[@]}"; do
-		edob -m "fixing rpath for ${rpath}" \
-			patchelf --set-rpath '$ORIGIN' "${rpath}"
-
-		# OpenGLVersionChecker stumbles on "OpenGL ES profile version string" so disable the check
-		sed \
-			-e "s/NV_AGORA_PATH/NV_AGORA_PATH_/g" \
-			-e "4i export QT_PLUGIN_PATH=\"\${NV_AGORA_PATH_}/Plugins\"" \
-			-e "s/AGORA_USE_MESA_FALLBACK=true/AGORA_USE_MESA_FALLBACK=false/" \
-			-i "$(basename "${rpath}" .bin)" \
-			|| die
-	done
-
-	popd &>/dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local dir
-	dir="/opt/nvidia/${PN}/$(ver_cut 1-2)"
-
-	dodir "${dir}"
-	mv ./* "${ED}${dir}" || die
-
-	local arch_dirs
-	readarray -t arch_dirs < <(find "${ED}${dir}/host" -mindepth 1 -maxdepth 1 -name 'linux-*' -exec basename {} \;)
-	if [[ -z "${arch_dirs[*]}" ]]; then
-		die "failed to find arch dir"
-	fi
-	if [[ "$(echo "${#arch_dirs[@]}" | wc -l )" -gt 1 ]]; then
-		eerror "${arch_dirs[*]}"
-		die "found ${#arch_dirs[*]} arch dirs"
-	fi
-
-	cp \
-		"${DISTDIR}/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png" \
-		"${ED}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui.png" \
-			|| die
-
-	newmenu - "${P}.desktop" <<-EOF || die
-		[Desktop Entry]
-		Type=Application
-		Name=NVIDIA Nsight ${MY_PN^} ${PV}
-		GenericName=NVIDIA Nsight ${MY_PN^}
-		Icon=${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui.png
-		Exec=env WAYLAND_DISPLAY= ${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui
-		TryExec=${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui
-		Keywords=cuda;gpu;nvidia;nsight;
-		X-AppInstall-Keywords=cuda;gpu;nvidia;nsight;
-		X-GNOME-Keywords=cuda;gpu;nvidia;nsight;
-		Terminal=false
-		Categories=Development;Profiling;ParallelComputing
-	EOF
-}
diff --git a/dev-util/nsight-graphics/Manifest b/dev-util/nsight-graphics/Manifest
index d3771f468e86..153ad84aba98 100644
--- a/dev-util/nsight-graphics/Manifest
+++ b/dev-util/nsight-graphics/Manifest
@@ -1,2 +1,3 @@
 DIST NVIDIA_Nsight_Graphics_2025.2.0.25073.run 316645004 BLAKE2B 6ab8e7914a2dc881775e121c8222936ceb57711a6a8b62b58fa5260529b6dd298c2fc1b8ac85abf01b752986444b365b6baf111ecd9081470c606a729a41da64 SHA512 c295512e7871b80dc03fc9f597073fe8b0decbc0c2cbc9e97877a112c4479a5a00c9329d85edba298864f1ab874f2535d8ec96feae0720802240f0d958e30de2
 DIST nvidia-nsight-graphics-icon-gbp-shaded-128.20231126.png 17306 BLAKE2B c00c18ff9a67437dfd5a4575ce1cb27804ae973f87c11ff2c8870753091dd132dc17b8ce897fb2d8139e4e047187d38ea84ca53aa4c14def096d0cb60364d936 SHA512 81d9682fb9b190698418fd110d02f6f32776a9b013600152b3241b9811194a7ec18bb3d8e823b1f3f857e7ff12a4b3a1801b8cd886f7677f4adf451440e52639
+DIST nvidia_nsight_graphics_2026.3.1.26224-linux_x64.run 436114142 BLAKE2B 683998a8e60d31ef5febc3f105989b730d5ecf234865f65ff5e152f00d6c47e6d79ffd04e05dd009f36b43f54ae323efd5d18bdcc07bd4ac0c0f9f5de6aef0b8 SHA512 3634acc1523c2871e8417685f934927f799f1a303873a4341683459b025f11eb495a0dfad56348311f6478817ddd0fc55de25116383bd94b7d1c9dc20c2e631f
diff --git a/dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild b/dev-util/nsight-graphics/nsight-graphics-2026.3.1.ebuild
index aa3c6f254142..4734371fbca5 100644
--- a/dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild
+++ b/dev-util/nsight-graphics/nsight-graphics-2026.3.1.ebuild
@@ -1,25 +1,21 @@
-# Copyright 2024-2025 Gentoo Authors
+# Copyright 2024-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit desktop edo unpacker
 
-DESCRIPTION="performance analysis tool designed to visualize an application's algorithms"
-HOMEPAGE="https://developer.nvidia.com/nsight-systems"
+DESCRIPTION="standalone developer tool with ray-tracing support"
+HOMEPAGE="https://developer.nvidia.com/nsight-graphics"
 
-MY_PV="$(ver_rs 1-3 '_' "$(ver_cut 1-3)")"
+MY_PV="$(ver_rs 1-3 '_')"
 MY_PN="${PN//nsight-}"
-MY_PN_SHORT="cu"
+MY_PN_SHORT="gfx"
+
+PV_BUILD="26224"
 
-PV_BUILD="35528883"
 SRC_URI="
-	amd64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-linux-${PV}-${PV_BUILD}.run
-	)
-	arm64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-armserver-${PV}-${PV_BUILD}.run
-	)
+	https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/linux_x64/nvidia_${PN//-/_}_${PV}.${PV_BUILD}-linux_x64.run
 	mirror+https://developer.download.nvidia.com/images/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.png
 		-> nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png
 "
@@ -27,16 +23,13 @@ SRC_URI="
 S="${WORKDIR}/pkg"
 
 LICENSE="NVIDIA-r2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
 
 RESTRICT="bindist mirror strip test"
 
 RDEPEND="
-	dev-libs/expat
 	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
 	dev-libs/wayland
 	dev-qt/qtdeclarative:6
 	dev-qt/qtpositioning:6
@@ -47,22 +40,11 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/tiff-compat:4
 	sys-apps/dbus
-	sys-cluster/rdma-core
+	sys-apps/util-linux
 	x11-drivers/nvidia-drivers
 	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libdrm
-	x11-libs/libxcb:=
+	x11-libs/libxcb
 	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libxshmfence
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-keysyms
@@ -74,14 +56,12 @@ BDEPEND="
 	dev-util/patchelf
 "
 
-QA_PREBUILT="/opt/nvidia/${PN}/$(ver_cut 1-2)"
+QA_PREBUILT="/opt/nvidia/*"
 
 src_prepare() {
-	if [[ -n "${EPREFIX}" ]]; then
-		sed  -e "s#=/#=${EPREFIX}/#g" -i usr/share/applications/*.desktop || die
-	fi
+	rm EULA.txt || die
 
-	pushd host/linux-desktop-* >/dev/null || die
+	pushd host/linux-desktop-nomad-* >/dev/null || die
 
 	local rpaths rpath
 	readarray -t rpaths < <(find . -maxdepth 1 -name '*.bin')
@@ -89,11 +69,10 @@ src_prepare() {
 		edob -m "fixing rpath for ${rpath}" \
 			patchelf --set-rpath '$ORIGIN' "${rpath}"
 
-		# OpenGLVersionChecker stumbles on "OpenGL ES profile version string" so disable the check
+		# the launcher never exports QT_PLUGIN_PATH, so the bundled Qt plugins
+		# (Plugins/platforms in particular) are not found without this
 		sed \
-			-e "s/NV_AGORA_PATH/NV_AGORA_PATH_/g" \
-			-e "4i export QT_PLUGIN_PATH=\"\${NV_AGORA_PATH_}/Plugins\"" \
-			-e "s/AGORA_USE_MESA_FALLBACK=true/AGORA_USE_MESA_FALLBACK=false/" \
+			-e "4i export QT_PLUGIN_PATH=\"\${NV_AGORA_PATH}/Plugins\"" \
 			-i "$(basename "${rpath}" .bin)" \
 			|| die
 	done
@@ -103,14 +82,6 @@ src_prepare() {
 	eapply_user
 }
 
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
 src_install() {
 	local dir
 	dir="/opt/nvidia/${PN}/$(ver_cut 1-2)"
diff --git a/dev-util/nsight-systems/Manifest b/dev-util/nsight-systems/Manifest
index 4b1b96d5d9c8..e3522f916fd8 100644
--- a/dev-util/nsight-systems/Manifest
+++ b/dev-util/nsight-systems/Manifest
@@ -1,6 +1,2 @@
-DIST nsight-systems-2025.2.1_2025.2.1.130-1_amd64.deb 428406244 BLAKE2B d7831f8adbef228d9ca7308b5466dfacc064560885980e59e5d6d25df64a6cc901bb9c58ffbe2734a9c57fd249f6809d52b7a8f3ed10516a398d8cbdc4b2d214 SHA512 74d407e12f560ff2fdb8c09d91733fa78bea8470ba181253ad9946f1e770a5f5e7a15c6d27e41d133e6d670b83e527b1fd7249d1d066f7dfecd17962371e4ea3
-DIST nsight-systems-2025.2.1_2025.2.1.130-1_arm64.deb 401367200 BLAKE2B 714bff59f4779cf5b86e002bf6cd6fca24ac5f5b9cd5a5626499cd78c88e6b4ad70445869c2045b9d31e3c2c36efe253f49f9843548a75744ba074cd863e4681 SHA512 881d2f9278206187297936c875b75344302268a32514149a2e246cc7eb0c68cbcd1cc1e8dee44a305abafd8cfabe90875e296ef99450db1a58336499945b775e
-DIST nsight-systems-2025.3.1_2025.3.1.90-1_amd64.deb 429429534 BLAKE2B e50025ac05ce13682493d137b04b99d1d21fe786f69d6806aa05347dd7459a570564955222e4bef1d47885a9b035e1b92c7aef8fb27bac9bac6b001da10bb3f0 SHA512 88c95b2568d89512a8ec996aa361e56af7c2aa5a3b01ee439aed3ea8b96a7cb5823b91845aa03dfcab3147d17a725a92da7e1c81e819473da18c264607728afa
-DIST nsight-systems-2025.3.1_2025.3.1.90-1_arm64.deb 402311178 BLAKE2B a3199ba0ea0786725177e505398feb932d75517007bb44de65d0ab0ad6598d2a46261dabf0948b647a984619adb5e8140fe196fb4ebbb47b5b1ae1f4be381e03 SHA512 2e4f0572b755699d4a47825e0811ea4d96b563d443d9142dda46364596d937cc46bc140a37f005f828797982767126f2dcaee658971d002df1f0cb58e402c5b5
 DIST nsight-systems-2026.5.1_2026.5.1.161-1_amd64.deb 461434380 BLAKE2B 186af0e80f1ff90ac55e40c16a1c6520965d014deb10c60a5f05f9b4d0540b4bb95ff4540e8944c0c7296feb13abdcde99efb74948a5061a744ca4992cecc795 SHA512 addc0a6f45a85c9f9e4aceb538f82a66083f69c6d5acb201e671af1db0644a0a459bb0859a198e25d3a58405d7ca941b87260acaf1d1f1b404d0b7d929c3be71
 DIST nsight-systems-2026.5.1_2026.5.1.161-1_arm64.deb 470289134 BLAKE2B 777ef0e112a36d71b07da2cfe3d574fcaabb2640dbaaa902b26cdb4623655ec8c557336e6763699a43ff80cbf3e74724df1a229846f6a328cb766df3dd110d85 SHA512 2dabf999d6d677d9f21c07a55d46665a55497a1ce310d8790df8b60a442085ad13b37540f551a73f6eabfb3f6a0242a6fe0f02f224f3fcf26e54b1ae7b2a9b21
diff --git a/dev-util/nsight-systems/nsight-systems-2025.2.1.ebuild b/dev-util/nsight-systems/nsight-systems-2025.2.1.ebuild
deleted file mode 100644
index 987c6c649c23..000000000000
--- a/dev-util/nsight-systems/nsight-systems-2025.2.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo unpacker
-
-DESCRIPTION="performance analysis tool designed to visualize an application's algorithms"
-HOMEPAGE="https://developer.nvidia.com/nsight-systems"
-
-MY_PV="$(ver_rs 1-2 '_' "$(ver_cut 1-2)")"
-MY_PN="${PN//nsight-}"
-MY_PN_SHORT="sys"
-
-PV_BUILD="130-1"
-
-SRC_URI="
-	amd64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-${PV}_${PV}.${PV_BUILD}_amd64.deb
-	)
-	arm64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-${PV}_${PV}.${PV_BUILD}_arm64.deb
-	)
-"
-
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64"
-
-RESTRICT="bindist mirror strip test"
-
-RDEPEND="
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	dev-qt/qtwayland:6
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libglvnd
-	media-libs/tiff-compat:4
-	sys-apps/dbus
-	sys-cluster/rdma-core
-	x11-drivers/nvidia-drivers
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libxshmfence
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	arm64? (
-		media-libs/gst-plugins-bad:1.0
-	)
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-QA_PREBUILT="/opt/nvidia/${PN}/$(ver_cut 1-2)"
-
-src_prepare() {
-	if use amd64; then
-		sed \
-			-e "/Terminal/s/=No/=false/" \
-			-e "/Categories/s/Application;//" \
-			-i usr/share/applications/*.desktop || die
-
-		if [[ -n "${EPREFIX}" ]]; then
-			sed  -e "s#=/#=${EPREFIX}/#g" -i usr/share/applications/*.desktop || die
-		fi
-	fi
-
-	local rpaths rpath
-	readarray -t rpaths < <(
-		find "${S}/opt/nvidia/${PN}/${PV}/host-linux-"* \
-			-name 'libparquet*.so*.0.0' -o \
-			-name 'libarrow*.so*.0.0' -o \
-			-name 'libssh.so'|| die
-	)
-	for rpath in "${rpaths[@]}"; do
-		edob -m "fixing rpath for ${rpath}" \
-			patchelf --set-rpath '$ORIGIN' "${rpath}"
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	rm -r usr/local || die
-	mv ./* "${ED}" || die
-
-	# TODO install desktop file for arm64
-}
diff --git a/dev-util/nsight-systems/nsight-systems-2025.3.1.ebuild b/dev-util/nsight-systems/nsight-systems-2025.3.1.ebuild
deleted file mode 100644
index 32cd43c231c3..000000000000
--- a/dev-util/nsight-systems/nsight-systems-2025.3.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo unpacker
-
-DESCRIPTION="performance analysis tool designed to visualize an application's algorithms"
-HOMEPAGE="https://developer.nvidia.com/nsight-systems"
-
-MY_PV="$(ver_rs 1-2 '_' "$(ver_cut 1-2)")"
-MY_PN="${PN//nsight-}"
-MY_PN_SHORT="sys"
-PV_BUILD="90-1"
-
-SRC_URI="
-	amd64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-${PV}_${PV}.${PV_BUILD}_amd64.deb
-	)
-	arm64? (
-		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-${PV}_${PV}.${PV_BUILD}_arm64.deb
-	)
-"
-
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64"
-
-RESTRICT="bindist mirror strip test"
-
-RDEPEND="
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	dev-qt/qtwayland:6
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libglvnd
-	media-libs/tiff-compat:4
-	sys-apps/dbus
-	sys-cluster/rdma-core
-	x11-drivers/nvidia-drivers
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libxshmfence
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	arm64? (
-		media-libs/gst-plugins-bad:1.0
-	)
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-QA_PREBUILT="/opt/nvidia/${PN}/$(ver_cut 1-2)"
-
-src_prepare() {
-	if use amd64; then
-		sed \
-			-e "/Terminal/s/=No/=false/" \
-			-e "/Categories/s/Application;//" \
-			-i usr/share/applications/*.desktop || die
-
-		if [[ -n "${EPREFIX}" ]]; then
-			sed  -e "s#=/#=${EPREFIX}/#g" -i usr/share/applications/*.desktop || die
-		fi
-	fi
-
-	local rpaths rpath
-	readarray -t rpaths < <(
-		find "${S}/opt/nvidia/${PN}/${PV}/host-linux-"* \
-			-name 'libparquet*.so*.0.0' -o \
-			-name 'libarrow*.so*.0.0' -o \
-			-name 'libssh.so'|| die
-	)
-	for rpath in "${rpaths[@]}"; do
-		edob -m "fixing rpath for ${rpath}" \
-			patchelf --set-rpath '$ORIGIN' "${rpath}"
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	rm -r usr/local || die
-	mv ./* "${ED}" || die
-
-	# TODO install desktop file for arm64
-}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 7770b0f24340..8cccf88234fe 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,21 +1,29 @@
 DIST SPIRV-LLVM-Translator-cea7c0e5fa6114f2e3ae83a6652bda7a6bccbc2b.tar.gz 1939159 BLAKE2B 800445bac3d1f26e26db2e7dae77f0163bac67af6094a7e6781465bea829e6f15c2423c89d8b0d26f10caeebc93c7e136ef7c2746e763be8a9f1f7b00c247cb2 SHA512 8ffc7011576c8a66c5d4df7cc69288791f9905aa379226a3bba304f9a603275fbe77f80bed1326ac63015b4fd731b8594143be37449b74c50287695b13b7d5d3
 DIST spirv-headers-02c0394e57af6dfdda7f68973df6aa20fc3f5def.tar.gz 571736 BLAKE2B d09500d508e142fa51781cec6322f8fad603f3a70ee70748db135c5d112ed0a10e5f659d37fa0b51db11402a2b90f899f4fa8dda74c0811baca5d6a3418601c4 SHA512 6cb7a0973c6a6f8a491bd59ba2b35d0a0d1d06ee84696e609d42b53728ecd6d40ca0b5fb71a88f883154acec3594668aab4b22a8f8ea25434b17592583ba8f2c
+DIST spirv-headers-04fd3caa1e8267e4d95c806cad901181728e1006.tar.gz 594644 BLAKE2B aea93e501716e73c116fb842211a7e761a1f81f5c98154fc2b3cf17757135157418d5fe01b40f0a3328a670b1823879dbac5076d48b542244b22a3ea8f3cc18f SHA512 90a60f8538b704b9c4e799d044c2e14673d6a42742d17315cd65e2ef7870fb094eb74450bf12a768a539c920d2cb9962fc83e328594ef72507f6b882915eb5ab
 DIST spirv-headers-575b6512579ebde466ed3dfc04e413439d14d95d.tar.gz 570306 BLAKE2B dc9b2d8defe195fe60f6ec92f1f55c52f108fdec32bbe6761e3e70d0906245cfdd92aa69a1e3490b6a3aa661b2870d38749598dbc1047ac6ff84c22b30ebd5f6 SHA512 bbff94d40149d529d4c329f0d73597d8f404202198fd4f35316585915919254e7ead5a1caa928dba9f04591423da6bc33f73a308fc26d95de4bfa6eecb47384c
 DIST spirv-llvm-translator-17.0.18.tar.gz 1683963 BLAKE2B 93520bb57916a5e22f53dbe33b85f6835bfbe4e0fb868f412857e7659477862d5bb4dcc1fd75b5445dbb4f1248d50770173802e166fe45932f7aba110885e12a SHA512 acef3bd4a230425b274fad9f6e12b0a792cfc47f3f89a826b7ad66487345cc25fcb8f39ff252053624a450b0652de691f2ffd20046af073c848fa18ff4936bce
 DIST spirv-llvm-translator-17.0.23.tar.gz 1714332 BLAKE2B 3a7e13b7058dc5fbd56fe7ed8076fa4d3092c679bf63b7cadd67d4eea8edb5457df1c5bc0103a87e792ab35744d3e4abdb6e932b74668d9ce4b0aa1bde077df7 SHA512 c86fcd94600bec8b3b2657e95a0ddfce91818b3938d57ba32b5d3204e007df25f2a7768d83142f1683d11371e513590851115d7b6be721fe14b567ff87ceb501
 DIST spirv-llvm-translator-17.0.25.tar.gz 1723900 BLAKE2B dc52e2574103002fb822225842d7be1eb6f758b8cc1296dcb3679686d47c93b3cc436367f15cf3562d1b2d63d9e6127031db87ede545c9ba79ecec3044ef5cef SHA512 c0e3a731763570bdbef8c0e9462f3d0a250e639d6a641322ab50ad25c6f41a8aea19b1885beec3239a60aa621d1ae8a8a5cdd3b6c63930c0563dd947619fd48c
+DIST spirv-llvm-translator-17.0.27.tar.gz 1733122 BLAKE2B 250d42c5ee18afb677fa76b5b691adfb9136b6d8dd8b8111d91ede493317f78052c75f43edc93d551ff2498831444acfab0f688ae9a1c3c3e08beb0438d2620d SHA512 5a15067bbe4fa4efeb657e6dab77a161ea78d464b86340ed5cf906ffba30fcdce2767e2cba861afd5452a2a33e8e36809ca28528578ddc007248194926ae57f6
 DIST spirv-llvm-translator-18.1.18.tar.gz 1753615 BLAKE2B d1af64ad346b39fb3407638a23971ec517f5e69162765f11e36bae9b696c9709f4d91f81d88dc6b4772dd1d6db9c63c6b7c93dbe7dc1f038d3e71528b95d4fd7 SHA512 5abb90a3f53173af30024f95fee9eac50fcd44f9044665fccf61d99ac72e5300f9e47f11dbf7cc699994e2d68dcc38c6752074c2c57eebd92c29c78c1081a358
 DIST spirv-llvm-translator-18.1.23.tar.gz 1778523 BLAKE2B f672747b08f1214bf2a228a4b41188b710eda5bc78e294df1d399b5a544836fe166ae547c0fe67bb0f2bc04d82fa62a8b5964dc8e9e9361638ce381ca5d61341 SHA512 a8216c6c78d526c2382bdcb16437d8895d881fb7a125e98d5198b448ee58b417033aa144008a10a22c2c1a6d57c7faa290a7f558df6b4787c4ccea2c2fbb9030
 DIST spirv-llvm-translator-18.1.25.tar.gz 1790275 BLAKE2B b4369129bbe55e19a9e7fcc5c715acbfb11b3a48d3071cb0abfc19633fcf5d9f5cd1a4d5fd8f053821c6b6f559f9951def82b671f6b1bb46bb131791be2765d8 SHA512 5ad9130cd7ef855fd9204083c1b1175e433c3bea6735287fb4ba119f52fc71571ecd1de9f93173ed4bf5d44ee609e07f3151566d54935c86c283fb36a83fe47b
+DIST spirv-llvm-translator-18.1.27.tar.gz 1799453 BLAKE2B 72561f246d61e77a723f6ca7b4bd2e3a235317153ad80e3f90e397d672178e89b2ef3695b84cdf061c549bab6d9b6b1a0b208b6ad9bbd87a0c222e0485e6eeaa SHA512 245f3e5ec1d89fb0339293b9d631b5b2f7226c152196b5777ed607d786b685392d0f5e6ee2f5778293e850830bd3f420884bfb4c7d0273032595a83574ec96f6
 DIST spirv-llvm-translator-19.1.13.tar.gz 1798150 BLAKE2B f28e6476f744cd3732784147714f6f65883a2192702777643648e46d2996e6eb35770e187e826b0821dcf50e78b57850dcf4f27a5d88fce3600d354184138148 SHA512 34dc723ae88dfe6e24495e424e31b319debdbe8d8580ce89a8485d8b4ffce16d060def5f1eab5eef2e2cfb9744fd14f7c3e742b308bbec7bb0b4b319edca861b
 DIST spirv-llvm-translator-19.1.18.tar.gz 1820279 BLAKE2B f7e428c9d7e0e9564657ca5c496b73d875c24213c9dcfc2fa2cea284c9405649cca7f5cdee27cfd403752cf96b892a6ab6ccc01ecddfc9a561dd0160f02e7a81 SHA512 27217c6c565f2a0f58e753d18df15adaf6e53ce0ae289a5a067a3ec58cdff72eaff86b801c079c10b5203f3e17061bfb85c091b255ead711fdf1ff9a8185a447
 DIST spirv-llvm-translator-19.1.20.tar.gz 1827922 BLAKE2B bb7e4d5aac009298956eec57743c6e98e0b95e3e598f241d48d5b26fba1465e1c2fcf9845f158d7565cd11c2c6d4901ae6248bb7abb6f11ddbd5ee938912c55c SHA512 834d4bf49444bb9450b01ad97128039991cccc27b93ab6c30f945bd55fdfdbd893ae4cec11d5850564cf0f59b2407f78da21d91a48b2de0ba30235b4131876a8
+DIST spirv-llvm-translator-19.1.22.tar.gz 1838110 BLAKE2B 8ba39a996cc60a2f1a4339f667956349abb0167f0c490eaeeb3268a36edd994da6f7632f8ca851fdb6beeb2e29558d744db6f94db37241436978df42414ddef8 SHA512 f8a18d23c130b1d862c855bb458c327627842226d7cc68c9cb1cc78c1d6d59577ce2d7a759a17611cc9c2eb18d5e867231773daf3bdef6f6a46591c547235db3
 DIST spirv-llvm-translator-20.1.13.tar.gz 1853486 BLAKE2B 1652c1488541a341c952d30f55d6c854975b7d207edce7e30db78534f295286afcaf22c86764f2520ed084fe004e08d4527e41fbd635f9b2a2878bd9d5a7cbc3 SHA512 88e554dcba7b44f46c992a457e6a706c09717efd8fbdb2300d76722804fcbcc8dab6095dac2604ee8fb44af5096310996147e28591640169d0d7854af2202493
 DIST spirv-llvm-translator-20.1.15.tar.gz 1858066 BLAKE2B d427259a6dc016b61d75b0c8de8c0c2c40ba5e370cccbd15eb41eba0702809b544652f849058ad309236b93be2d20802e2da4331a35bd76ecc37b5d44580c6b2 SHA512 a8565f5b73744b7482e796f69197056a7ee70f5fafa21fce856ffb01021e241bdf8c440836b05e50ec7ebe7cb88689a0fbd193c467beba36dcc1491578055f50
+DIST spirv-llvm-translator-20.1.17.tar.gz 1864206 BLAKE2B a4253682d633fbf0b35c335df397ce5a5c71c1a896617a184e2aac438ee909b9c1551f92498875d0453d1fb7d21fea2b4e8c1085e4025865d9d14a97d6a212e1 SHA512 d70b979b7144512ee6a27d00da5eeb9af9947f96e3e5f3fd2eb4c6619794408b921f8c503d62a566b0abd2282307dd1bcda71dfd517bbc80bf1e6ac0ca698d49
 DIST spirv-llvm-translator-20.1.8.tar.gz 1823253 BLAKE2B 940d548c129605c857bfb2c73ef8c67fb57462835f90fab1f5826070517b8048de2ffb2f0ce70a134d1f1c957b4506e9230729b3ec854ae2b4f14063d82ff0b7 SHA512 5fa7b5a7ade94c38faa238a350f80d514d6aabadc63882b8e4e1ac4cd62b8d77aeb46941f8dd9a083ae4705ee4e3dee9eff6ca56a9936eb336827755aaee9f18
+DIST spirv-llvm-translator-21.1.11.tar.gz 1869220 BLAKE2B a2a5a9c59669fe533b3aaf7e87c82a4cfafb75cfa30429da8d2993108c098b9d51224796188ad43205a1052393aefe3667b0ce7e3f8d897cd8470c121bfe61ff SHA512 ec3eeae0a441cf67afd0fcf4cd2091d247444164e4393318cfcc4f824d282c25c5ff533121a1f77bb79014d7f83f70d46977e0dc38944976ef9657d2b322ae02
 DIST spirv-llvm-translator-21.1.3.tar.gz 1848611 BLAKE2B c40b9e4f4b4c3ce951e3b981069216383c82169bc6294b9d52e9c8d80be6dfbc98d4148b22cf61f1c6118f0f253bcef7ec9dc6ba5ef3e29a38145eebd733ebc1 SHA512 e0dc67f213961612439fb757f5678d086fd761559ddd1afa134256b50fd6ea4c56ecc3205066cf9d933e770e0d27d6943a52dea38bd83f941883d31e701d647b
 DIST spirv-llvm-translator-21.1.7.tar.gz 1855026 BLAKE2B 7b23acfba68cbe9b2cf3094a567dc2dd3a750e1dc12591c29c321cf79323a640833b174ed7e7fa3206904a969f00cf6b7e86a2fd05c1c620619ff35fee4ed41b SHA512 30407d7c86732cbec8458d63a251c2d8ff1b2ccf1e2ca529cb3851cdf2a69204a8f10ed4aad0fb111759986ac956a99687550905c4711552d38830bf2127ebe8
 DIST spirv-llvm-translator-21.1.9.tar.gz 1862146 BLAKE2B c54db44033a8e8c658b5ff8c84cbd9ddc659d7677f1920f07983c4e03feb6bbf38d0cd392284de23022bf324d81db88ca21be4bf88ea2048a7deda650681ed51 SHA512 4dc8e6257f3b1c98ac6289b442b870bf6115fa6f1d5ae4b8c906948706a08ee959f8a409a8d0a20c0895330b50d541f761f5ed953902e8c17586356c1c03bdd3
 DIST spirv-llvm-translator-22.1.2.tar.gz 1870249 BLAKE2B 56dd66732727e2d002422392b41e0d7d745f9c3866953178759f862d0155539f6be2b54519fc6be1a694036d198d50c5f778cb709bef3c83d1dbb5416c7020ac SHA512 d224b29029dae66dac430834b927a0683e3e15fb555c2ba83764403b8cdc28bfcccbe8e9ec2e3d1854c9d32b02d0b8282a3d883441c7ce33c1fc5339c0a373f0
 DIST spirv-llvm-translator-22.1.4.tar.gz 1875796 BLAKE2B af731f5ebb3b4082c11e388b038b91933a20650f6dc5f871d9a2fffbee37c15099a20a25fae7eebb77613a0c5eeaf24fbab30394cd5f2eabab150d6fb5a31775 SHA512 7a1275088a2e58040efdd64f00ded27e7f4099e3c8add9528e4bccaae827578534b31c16bd4ab590f6f9f37c5ac4899e8651dc9d66d5c1ec0bc72c3246399f90
+DIST spirv-llvm-translator-22.1.6.tar.gz 1884210 BLAKE2B b20a0bcd6df8f914936f295d36546a4ec50e4baeea0f1c7e268adfa7cf9eb59835b5d2c1b07c3e4a3d5b61f8c79c141fca560ebf025fd23c65bf0c55bad4f273 SHA512 da0326c93a3988c11a32a298e82b07b33978e2d5ae080d65a243a8125017d63824d1d42d759232f7bf138663eba25e57e45b2d4b2e9f77c01f1e21b80353f461
 DIST spirv-llvm-translator-23.1.0.tar.gz 1928907 BLAKE2B 98a749adc36d38b54a28ef26db0321244a9c68e70e367092e2c5dbcb1199825233ce3e6a36c89d898dae24fb77f62da034fcbb8d5e9267731ad0b230d19b562e SHA512 86f76906d62baadce8050d46dcf0ccd8ff74e916edcdf62dcf4e5fa3245d23cff39ec1a1f21e9e853efc4090085040eb95cc86d266978d68a62d5fb9dc2b8766
+DIST spirv-llvm-translator-23.1.1.tar.gz 1928919 BLAKE2B b601d0c40e531eeb10aff3f82483ee003cee231886f23f82252cfde246507f44313644af4fd4a0d8f2cf651189af2f12069693058ac623b5ee9ae9632d5fb530 SHA512 fe2de5bfaffa95d20b81a15a11e6fdf6f7f190eebb4d6991cc36cd4670235d427e764437adbb5e572e5522cdfe8f0281a38e2fa088d9cadfc01f92cc844bba69
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.27.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.27.ebuild
new file mode 100644
index 000000000000..1f9662e89eae
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.27.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HASH_SPIRV="04fd3caa1e8267e4d95c806cad901181728e1006"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools
+	llvm-core/llvm:${SLOT}=
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.350.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555
+	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.27.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.27.ebuild
new file mode 100644
index 000000000000..3653f83b786d
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.27.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HASH_SPIRV="04fd3caa1e8267e4d95c806cad901181728e1006"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.350.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555
+	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.22.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.22.ebuild
new file mode 100644
index 000000000000..e1805a33ad6d
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.22.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HASH_SPIRV="04fd3caa1e8267e4d95c806cad901181728e1006"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.350.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.17.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.17.ebuild
new file mode 100644
index 000000000000..29155674b9d7
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.17.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HASH_SPIRV="04fd3caa1e8267e4d95c806cad901181728e1006"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.350.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.1.3-option-registered.patch )
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# do not force a specific LLVM version to find_package(), this only
+	# causes issues and we force a specific path anyway
+	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.11.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.11.ebuild
new file mode 100644
index 000000000000..7e0646d6bf78
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.11.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HASH_SPIRV="04fd3caa1e8267e4d95c806cad901181728e1006"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.350.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# do not force a specific LLVM version to find_package(), this only
+	# causes issues and we force a specific path anyway
+	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.6.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.6.ebuild
new file mode 100644
index 000000000000..7e0646d6bf78
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HASH_SPIRV="04fd3caa1e8267e4d95c806cad901181728e1006"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+		-> spirv-headers-${HASH_SPIRV}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+# We need to use currently newer spirv-headers, as stable release is too old..
+# DEPEND="${RDEPEND}
+#	>=dev-util/spirv-headers-1.4.350.0
+# "
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# do not force a specific LLVM version to find_package(), this only
+	# causes issues and we force a specific path anyway
+	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
+		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-23.1.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-23.1.1.ebuild
new file mode 100644
index 000000000000..a9f3241a974d
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-23.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake-multilib flag-o-matic multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="
+	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+IUSE="test"
+RESTRICT="
+	!test? ( test )
+	arm? ( test )
+	arm64? ( test )
+	loong? ( test )
+	riscv? ( test )
+"
+
+RDEPEND="
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/spirv-headers-1.4.357.0
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		llvm-core/clang:${SLOT}
+	)
+"
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+
+	# do not force a specific LLVM version to find_package(), this only
+	# causes issues and we force a specific path anyway
+	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.25.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.25.0.ebuild
index d3ab55ec249b..6de88652c29f 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.25.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.25.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index b119b6ea3527..2d7d2aa60406 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,3 +1,4 @@
 DIST atari800-7.1.2-src.tgz 1957587 BLAKE2B 95c0f2871a6654587f79d94d4ce05dffcaa6ed254199deac0096ffcb83fed0d7d5f5db5600cf110fe8942b10fd032ad33faf54de6d269a9509e30c18ceadbf9e SHA512 473e3560e21dec6605d09af1cefd673677e8151bd29e773492627c9a122274c0e44fa73ed01a786f77c242bb4ff3a85e6fc418dcef8f4c3f7b9a7414edf98a66
 DIST atari800-7.2.0-src.tgz 2018244 BLAKE2B 7dcd0eedee93bf73d6d5c4b1756f488fcfce001e56444e07f78f3094d1165ff55009c482349ed4d4524767e6c8e85fbbdafb5c688ad418b3efca999f9b63e389 SHA512 75249124bbab5752ec09cc3bab85492180b590659adfc1a171248b74f7776fd863cdfb84115282a85cfbed580793ac7441b5279503935de9a2f4ec87ed75a120
+DIST atari800-7.2.1-src.tgz 2020043 BLAKE2B 47d131c905a433c562e6f81fe1b8f15ec329e42a7320816766b1d8fc25e3a900ffb6a06be394900bdb7d56983b9566b222ad95ad34a0c83f5bfe8c254d7a858b SHA512 dcbcc85d6ab2225d4c6c6bc9b9d99c244604c104786ead349f5bb7b0c22c4d735837d180afcff17d8e8c1402a5a2529732c48d02bea8b37c7d5b7024153bb72d
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
diff --git a/games-emulation/atari800/atari800-7.2.1.ebuild b/games-emulation/atari800/atari800-7.2.1.ebuild
new file mode 100644
index 000000000000..35dcc2101b82
--- /dev/null
+++ b/games-emulation/atari800/atari800-7.2.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit autotools desktop
+
+DESCRIPTION="Emulator of Atari 8-bit computer systems and 5200 game console"
+HOMEPAGE="
+	https://atari800.github.io/
+	https://github.com/atari800/atari800/
+"
+SRC_URI="
+	https://github.com/atari800/atari800/releases/download/ATARI800_${PV//./_}/${P}-src.tgz
+	https://sourceforge.net/projects/atari800/files/ROM/Original%20XL%20ROM/xf25.zip
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="download encode-mp3 opengl readline +sdl +sound"
+REQUIRED_USE="
+	encode-mp3? ( sound )
+	opengl? ( sdl )
+"
+
+DEPEND="
+	download? (
+		net-misc/curl
+	)
+	encode-mp3? (
+		media-sound/lame
+	)
+	sdl? (
+		>=media-libs/libsdl2-2.26.0[joystick,opengl?,sound?,video]
+	)
+	!sdl? (
+		sys-libs/ncurses:=
+	)
+	readline? (
+		sys-libs/readline:=
+	)
+	media-libs/libpng:=
+	virtual/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+src_prepare() {
+	local PATCHES=(
+		# Bug 544608
+		"${FILESDIR}"/atari800-3.1.0-tgetent-detection.patch
+	)
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local video=ncurses
+	local sound=no
+
+	if use sdl; then
+		video=sdl2
+		use sound && sound=sdl2
+	elif use sound; then
+		sound=oss
+	fi
+
+	local myconf=(
+		$(use_enable download)
+		$(use_with opengl)
+		$(use_with readline)
+		$(use_with encode-mp3 mp3)
+		--with-video=${video}
+		--with-sound=${sound}
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	insinto "/usr/share/${PN}"
+	doins "${WORKDIR}/"*.ROM
+	insinto /etc
+	newins "${FILESDIR}"/atari800-4.2.0.cfg atari800.cfg
+	newicon data/atari2.svg ${PN}.svg
+	make_desktop_entry ${PN} -n "Atari 800 emulator"
+}
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index a847e35a1163..6101ff23824e 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,9 +1,7 @@
-DIST openrct2-0.4.32.tar.gz 24694264 BLAKE2B 6385834c18cb6986c788fdcd724b67807b2abb657e0deb368ee24fbeb33f77551d04ece325562d827437088aa25fc806a67d0bc35edbac0c7303121cc168cbd8 SHA512 f7f0fda752567dd16d76639b47dc26da0c3239619145ced6dc8e0619d19b69ed5e56ea2fb902d530ae1aad79e74eec3c9dad019735800cb1c7a6f2b43b424879
 DIST openrct2-0.5.4.tar.gz 24954384 BLAKE2B 9f50700dc3acaae1802dda41d69e85e4a2646a949e8297e07cdf79c35e42c90de609a788319d4b45b83fb2b073858560551886e91e72f500a1ce4d8c7c0b8a1b SHA512 69fb69ee6387d12ac9bd17c20e3096054ce0ef9f78e7ec90caffc379e029cc0f9534375300d22fc836695e9e6dece8e94a38f7f718e37375aa5d0c24d7b71df1
+DIST openrct2-0.5.5.tar.gz 31396987 BLAKE2B 165369b585cde0b6a322f90a4a6910df5494282005c610702fbf83e0fdb0f82d93470c5fad92252f15a3bdff204ce41d9618eb33861f23d15847dd1818907572 SHA512 812c850bb831ab1635411cd47334d4dd75c2efc5056de070f37a319df6ffcaa4753f9cb58e8d7ce0eb0095f00587e2b8b316f1346029fca62659973e0dd3e47c
 DIST openrct2-objects-1.7.11.zip 11071539 BLAKE2B 8ccb9a52ba20d729980bcb826e5ad868cf24d86270c759118e85d0fb4662b4ef5be1c1e17bb92a7b6b48e8d765828e9dfc755a3aa047caaddf3e1023f22e0fbd SHA512 7c679f17af23fdd861867939aa46df4a89336d27668e7c0ffa956cc61a6f4572a20b7c5b83a4e2a705d4f989af64207842cbb428d0bf13510206ea03fbfe6f6d
-DIST openrct2-objects-1.7.6.zip 11027399 BLAKE2B aa291cb408a5739f3678df904cbe7146628c3918b87acc64ec77f5ce78116a3e6c64a1ff82fb1fa2e8cd241007b0d071b3fc33c173f753a633d0da9462fa61d9 SHA512 3149a0ef91bc5679d808157e41b8fcdb0bff01ddb0e070d3e4e5c8e9cd4cecd4eec17b76d4fa4a442130e004a3192636e504a0c39ff8ef333e36e0c44d988cd8
 DIST openrct2-openmusic-1.6.1.zip 42921420 BLAKE2B cdec26dda1797b27a57d0ffd87c44c740869dff8cffc1ac077d6ce1eee747d32ce09547dc9a70256106b48126e08f04c04668c7fb8b3df2e04db72ef5f0cc344 SHA512 bc524b20ab72696a5f38bd65d96a4a83f29a0e65884d9b847540631d31aae42f3bdc4a6db5fa5fe34869012e598543b9327ad92d34e8f4f0f274c7f04d4a2e7f
 DIST openrct2-opensound-1.0.6.zip 4273495 BLAKE2B ae92336d8b4a1793a01dda701a2bfdbd5efad285029d6c199f657caaade3a6341c2cb7f1a4a9f420e399b6a7763ed2a50a4c2663dadfea3e3079e374b8d2f707 SHA512 8ae2d31687c29cfcdc7630da5addc3bed4b94ed1712891bb1e22d2747f2f8435b7fda843b4490543dbd9d63d392c8b3e4863cd3e669df9ca34f9780c8d9e5485
-DIST openrct2-replays-0.0.92.zip 1356796 BLAKE2B 39288339151b7fde605f9c9d036f39959e5525fe1d7a234b58b1ec453b45eb8d220a74f784f00d6d6a203fb14aff101bed8b860abc6e49b539206b9038cd6b38 SHA512 8ab2f6a776191c869adec69f1d014fd3b18c17492b9f767a62b8bb3c4aa74b6f527e0e721f18df838b6a9f82a24036c3ed2726da6469744b72b11785201fadf5
 DIST openrct2-replays-0.0.97.zip 1356551 BLAKE2B 542dbc79ae3c4c22e9fdc90f06868a9c042b21c58807455df327245854a18af02020e26bfa3e417c234bc3df38c7f132759dd25918c0c549976d9169d2c6ecbe SHA512 435a48149f2c03a4854e30edf4bf901f8370a035fe988cab6cf2260143c5904c2057b5f7e541bb4b3bb7b88d0255d087577208e3c201bc1c368aec0528d68acd
 DIST openrct2-title-sequences-0.4.26.zip 8751039 BLAKE2B d01ae8952f482c34166e593f774c0e195daa1586d295a0129ecbae2d59e3d8d5cac18640041eece3f72a223cc19cbf62a9a367dcb1355db7b7cfc32f9d07692e SHA512 7faa5afcebd0f95e184862bcb77f3ef41b59b900ad55eadbf4373b16fac315470734a854a4bd15496e832478ca0de6ea6f8f42f20c8f5d8f0403cbaae71338c5
diff --git a/games-simulation/openrct2/files/openrct2-0.4.16-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.16-include-additional-paths.patch
deleted file mode 100644
index 4391ea90e00b..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.4.16-include-additional-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/openrct2/platform/Platform.Linux.cpp
-+++ b/src/openrct2/platform/Platform.Linux.cpp
-@@ -336,6 +336,7 @@
-     std::vector<std::string_view> GetSearchablePathsRCT1()
-     {
-         return {
-+            "/usr/share/openrct2/rct1_data",
-             // game-data-packager uses this path when installing game files
-             "/usr/share/games/roller-coaster-tycoon",
-         };
-@@ -344,6 +345,7 @@
-     std::vector<std::string_view> GetSearchablePathsRCT2()
-     {
-         return {
-+            "/usr/share/openrct2/rct2_data",
-             // game-data-packager uses this path when installing game files
-             "/usr/share/games/roller-coaster-tycoon2",
-         };
diff --git a/games-simulation/openrct2/openrct2-0.5.4.ebuild b/games-simulation/openrct2/openrct2-0.5.4.ebuild
index 636811b90775..918ca9e8f1dc 100644
--- a/games-simulation/openrct2/openrct2-0.5.4.ebuild
+++ b/games-simulation/openrct2/openrct2-0.5.4.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/games-simulation/openrct2/openrct2-0.4.32.ebuild b/games-simulation/openrct2/openrct2-0.5.5.ebuild
index a23a1f69c4e0..636811b90775 100644
--- a/games-simulation/openrct2/openrct2-0.4.32.ebuild
+++ b/games-simulation/openrct2/openrct2-0.5.5.ebuild
@@ -12,8 +12,8 @@ MY_PN_RPL="replays"
 MY_PN_SFX="opensound"
 MY_PN_TS="title-sequences"
 MY_PV_MSX="1.6.1"
-MY_PV_OBJ="1.7.6"
-MY_PV_RPL="0.0.92"
+MY_PV_OBJ="1.7.11"
+MY_PV_RPL="0.0.97"
 MY_PV_SFX="1.0.6"
 MY_PV_TS="0.4.26"
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 		vorbis? ( media-libs/libvorbis )
 	)
 	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
+	scripting? ( dev-libs/quickjs-ng:= )
 	truetype? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
@@ -78,7 +78,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.4.16-include-additional-paths.patch"
+	"${FILESDIR}/${PN}-0.5.3-include-additional-paths.patch"
 )
 
 src_unpack() {
@@ -153,7 +153,7 @@ src_test() {
 }
 
 src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
+	use scripting && DOCS+=( "distribution/scripting/scripting.md" "distribution/scripting/openrct2.d.ts" )
 
 	cmake_src_install
 
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-48.0-r1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-48.0-r1.ebuild
new file mode 100644
index 000000000000..ed0ae3d1d27b
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-48.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sub-meta package for the applications of GNOME"
+HOMEPAGE="https://www.gnome.org/"
+
+S="${WORKDIR}"
+
+LICENSE="metapackage"
+SLOT="3.0"
+KEYWORDS="~amd64"
+
+IUSE="+games share +shotwell +tracker"
+
+# Note to developers:
+# This is a wrapper for the extra apps integrated with GNOME
+# Keep pkg order within a USE flag as upstream releng versions file
+# TODO: Replace cheese with Snapshot once we have it packaged
+DEPEND=""
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}
+
+	>=sys-apps/baobab-${PV}
+
+	>=media-video/cheese-44.1
+
+	>=www-client/epiphany-${PV}
+	>=app-arch/file-roller-44.5
+	>=gnome-extra/gnome-calculator-${PV}
+	>=gnome-extra/gnome-calendar-${PV}
+	>=gnome-extra/gnome-characters-${PV}
+	>=gnome-extra/gnome-clocks-${PV}
+	>=sys-apps/gnome-disk-utility-46.1
+	>=media-gfx/gnome-font-viewer-${PV}
+	>=gnome-extra/gnome-system-monitor-${PV}
+	>=gnome-extra/gnome-weather-${PV}
+	>=gnome-extra/sushi-46.0
+	>=net-misc/gnome-remote-desktop-${PV}
+
+	>=gnome-base/dconf-editor-45.0.1
+	>=mail-client/evolution-3.56
+	>=gnome-extra/gnome-tweaks-46.1-r1
+	>=app-crypt/seahorse-47.0.1-r1
+	>=net-misc/gnome-connections-${PV}
+
+	games? (
+		>=games-puzzle/five-or-more-${PV}
+		>=games-board/four-in-a-row-3.38.1
+		>=games-board/gnome-chess-${PV}
+		>=games-puzzle/gnome-klotski-3.38.2
+		>=games-board/gnome-mahjongg-${PV}
+		>=games-board/gnome-mines-${PV}
+		>=games-arcade/gnome-nibbles-4.2
+		>=games-arcade/gnome-robots-40.0
+		>=games-puzzle/gnome-sudoku-${PV}
+		>=games-puzzle/gnome-taquin-3.38.1-r1
+		>=games-puzzle/gnome-tetravex-3.38.2
+		>=games-puzzle/hitori-44.0
+		>=games-board/iagno-3.38.1-r1
+		>=games-puzzle/lightsoff-${PV}
+		>=games-puzzle/quadrapassel-40.2
+		>=games-puzzle/swell-foop-${PV}
+		>=games-board/tali-40.9
+	)
+	share? ( >=gnome-extra/gnome-user-share-47.2 )
+	shotwell? ( >=media-gfx/shotwell-0.32.13 )
+	tracker? (
+		>=app-misc/localsearch-3.8.2
+		>=app-misc/tinysparql-3.8.2
+		>=media-sound/gnome-music-${PV}
+	)
+"
+BDEPEND=""
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 5a98ff63b23a..4674c0527921 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,2 +1,3 @@
 DIST gvfs-1.58.4.tar.xz 1295412 BLAKE2B 19496fcf78f8a58a98e8d9206dc7f16af63c611f8f5dad091543584c1c9ff0bc4337c841eeec50d1e613a926474ce7ee71420b98ca2f152f41a5cdde4207742d SHA512 eec57586c95c382834256b52e4241236e369ed0d5bb2caeb40a63b207bdac2ccd530ca0c2e6b4453aa7debbd004099b24725e26aac583fecd5aa999208a50dc0
 DIST gvfs-1.58.5.tar.xz 1296608 BLAKE2B a6ca0fc4bc0d4aae5162573fd659e0503bcf827bd03c1ef09ef0161d0cd0208c3202970f6577a85a552c7bd76e2aa9f5d89ce3408cb073e85f677785dab32d01 SHA512 81d7ab58e4b4740e7cf5590a158b7f2773e00ecaeb872494b7f14b4ef78da33a28964a73a002427437f59e2aa798f3d902282d6894aee2e13adedf32ac4a99ce
+DIST gvfs-1.60.3.tar.xz 1310724 BLAKE2B 5ff2eb6293e6452a3d1affb60a7266116bca3599eafa0b7e213488d1d90699865d2448d61d58a0bf4f5acd32dc57e407719c9886262770c934dfef51e5d0e898 SHA512 1f5fabc831085f0b035a7bc1acf3bb26ad7195cc87c69aaea888b77a5239a895ca3c23c77ec6c030e274771ae49987d7a5c6b0ac61d8b68593c1815041b50363
diff --git a/gnome-base/gvfs/gvfs-1.60.3.ebuild b/gnome-base/gvfs/gvfs-1.60.3.ebuild
new file mode 100644
index 000000000000..05e58db94c3f
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.60.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="afp archive bluray cdda cdr elogind fuse +gcr keyring gnome-online-accounts gphoto2 +http ios mtp nfs onedrive policykit samba +sftp systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	onedrive? ( gnome-online-accounts )
+	udisks? ( udev )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.83.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	gcr? ( app-crypt/gcr:4= )
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2=
+		>=net-libs/libsoup-3.0.0:3.0
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147 )
+	fuse? (
+		>=sys-fs/fuse-3.0.0:3=
+		virtual/tmpfiles
+	)
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+		app-pda/usbmuxd
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.57.1:= )
+	keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15:=
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2:=
+	)
+	onedrive? ( >=net-libs/msgraph-0.3.0:= )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8:= )
+	sftp? ( virtual/openssh )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	virtual/pkgconfig
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	# currently HAVE_GCRYPT and linkage only used with afp; check it on big
+	# bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+	local enable_gcrypt="false"
+	if use afp; then
+		enable_gcrypt="true"
+	fi
+
+	# currently HAVE_LIBUSB and linkage only used with mtp; check it on big
+	# bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+	local enable_libusb="false"
+	if use mtp; then
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdr burn)
+		$(meson_use cdda)
+		-Ddeprecated_apis=false
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		-Dgoogle=false
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		$(meson_use onedrive)
+		$(meson_use sftp)
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		$(meson_use gcr)
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		# wouldn't install any of it as of 1.38.1; some tests need it,
+		# but they aren't automated tests in 1.38.1
+		-Ddevel_utils=false
+		-Dinstalled_tests=false
+		-Dunit_tests=false
+		-Dman=true
+		-Dprivileged_group=wheel
+		# wsdd is currently masked
+		-Dwsdd=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if use fuse; then
+		tmpfiles_process gvfsd-fuse-tmpfiles.conf
+	fi
+
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index ceda867119c1..e4f6e98a027a 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-characters-48.0.tar.xz 602764 BLAKE2B ede78805a32c30194a57d26f7f824474c951a03289afc7f688353a72bfa2e52c9388c55d536b7f7a956f459cf107e148b5f0f884d1495f450badd71697425ce4 SHA512 32d6eb7a8d945267db6f8349bb28e9d6fb1b6cccaaca2bbf9c8e523bcde97087b867c699a15200fa578731ee42e9fe54d349be39ffb1f3ce86d3bde4edced89c
 DIST gnome-characters-49.1.tar.xz 608800 BLAKE2B 8a0c5122b938c16bc118d53c37609f586556512447aa5670098427ed81f1bae5f007dbd76a50d296e4e14c1c82278b8d52b3a231066a6cebe6bb58543f765d5e SHA512 70261d452c17f03c3088ae56c028727e8ce44ee2db89b770dec9623da3c17d0a3565855969de32d6d3caf4043ec531d4cf47acff777e3932e1a0beea2057fa8a
+DIST gnome-characters-50.0.tar.xz 614348 BLAKE2B 49ce3c002f11fecaf84c6052425bfa76f8a7455ce10618acd701681788c0b61514572ca83e4a2da40a59eaff83418268e38a56d5c8729608f0e30e7d3914b9c1 SHA512 3fdd9d04ab6a8e356a9ca02f2aba4db85be0205b077632230fd7fa74a2de899265deb2360b6f87f873b1da5191a5bdafb47dee712619e027e84de8461076cc16
diff --git a/gnome-extra/gnome-characters/gnome-characters-48.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-50.0.ebuild
index 225d5541caca..3ba35fb191d2 100644
--- a/gnome-extra/gnome-characters/gnome-characters-48.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,17 +10,17 @@ HOMEPAGE="https://apps.gnome.org/Characters/"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.83.0:2
+	>=dev-libs/glib-2.87.0:2
 	>=dev-libs/gobject-introspection-1.82.0-r2:=
 	>=gui-libs/gtk-4.6:4[introspection]
-	>=gui-libs/libadwaita-1.6:1=
+	>=gui-libs/libadwaita-1.9_alpha:1=
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.36[introspection]
 	gnome-base/gnome-desktop:4
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 5badb5dff6d9..4e2e0c1b6a45 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-contacts-47.1.1.tar.xz 423676 BLAKE2B 49e43b2bb634e1158799056797e55ae6248fe0518dcdd1d5975810f278b149db75469d48e1f0c02b39e8bfe918b5b0578956149180c1665b323325d6eede55aa SHA512 e03588a82a6ce12d81cb7e346dee59a8e6b56365425c6ff172d4f4ce0b08cfae521dd279aca299d0c9938a832bfbe631a87e83d4a83daff8c5464d6173ae7ea3
 DIST gnome-contacts-49.0.tar.xz 414664 BLAKE2B 061c3f333277ca68654deb1f8784a27065596e7be6860c2516d5bc2d7ca100b6b3fa0e3f861ff0138be6d79ae01671f03a6e34055193f5cfeca35f6265a918aa SHA512 3b6dbad35b0eee001db732a42c245e6a3cf5c610995f7e5e700ede95bb1ebfdda507514db108cafc9f194eb74d7df0ff4d896d07f92be966111207964ffe432f
+DIST gnome-contacts-50.0.tar.xz 419416 BLAKE2B 09ab2553e27dc563ba07152708334d7bf4fbc360ab1d1dae034329221bb0b8c465c9b3d5b1f8cbbacc4b4605e6a22a53fa512044f2680e379e377cf8b6c6b76b SHA512 192e84ac63d2eae2ca6dc19ce6015f2b5ee8559af9bfd189abdb6a4559a2a2d9a2a7b81e84e6f8daefea03aa41869a6752dd14f022ba5e0757877ad90540f868
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-47.1.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-47.1.1.ebuild
deleted file mode 100644
index 4f89cd5b99ed..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-47.1.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://apps.gnome.org/Contacts/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+gnome-online-accounts"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.82.0-r2
-	dev-libs/folks[vala(+)]
-	gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] )
-	gnome-extra/evolution-data-server[gtk,vala]
-	>=dev-libs/libportal-0.7:=[gtk,vala]
-"
-RDEPEND="
-	>=dev-libs/folks-0.14.0:=[eds]
-	>=dev-libs/libgee-0.10:0.8=
-	>=dev-libs/glib-2.64:2
-	>=gui-libs/gtk-4.15.3:4
-	>=gui-libs/libadwaita-1.6_alpha:1
-	>=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?]
-	>=dev-libs/libportal-0.7:=
-	>=media-libs/gstreamer-1
-	>=media-gfx/qrencode-4.1.1:=
-	gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcamera=true # Ignored
-		-Dmanpage=true
-		-Ddocs=false
-		$(meson_use gnome-online-accounts goa)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-49.0-r1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-50.0.ebuild
index 4aa3772a97a2..3e81f98fb904 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-49.0-r1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-50.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://apps.gnome.org/Contacts/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="+gnome-online-accounts"
 
 VALA_DEPEND="
@@ -18,7 +18,7 @@ VALA_DEPEND="
 	>=dev-libs/gobject-introspection-1.82.0-r2
 	dev-libs/folks[vala(+)]
 	gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] )
-	<gnome-extra/evolution-data-server-3.60[gtk,vala]
+	gnome-extra/evolution-data-server[gtk,vala]
 	>=dev-libs/libportal-0.7:=[gtk,vala]
 "
 RDEPEND="
@@ -27,7 +27,8 @@ RDEPEND="
 	>=dev-libs/glib-2.64:2
 	>=gui-libs/gtk-4.15.3:4
 	>=gui-libs/libadwaita-1.8_alpha:1
-	>=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?]
+	>=media-libs/glycin-2.0[gtk,vala]
+	>=gnome-extra/evolution-data-server-3.60:=[gnome-online-accounts?]
 	>=dev-libs/libportal-0.7:=
 	>=media-libs/gstreamer-1
 	>=media-gfx/qrencode-4.1.1:=
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index d8c44589081e..55023248055f 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1 +1,2 @@
 DIST gnome-software-49.4.tar.xz 3551664 BLAKE2B 8524699532f1f2b4ef0012f0f6c4b9cf4693d4831971bd87e58142f344a5550eb57dd55e49fea72ca572e9de4bec85caa1147cda6a176d3230eceaae414406b0 SHA512 3454283bec4bdf6adccdf234c31fcb7d75943731efa912ceb814402152f428f2d7a4e0692cf8abbf1de2733a49f49f52d2e0e290df560ed49eeaefdf6a3c61bf
+DIST gnome-software-50.4.tar.xz 3588532 BLAKE2B 8a3bdcc7b2417fb3658c17c69cbab1d2e859b61f3a88db79275f77dfd5ba539d97339c8a69ce4002532742632114dc189c940b5deda14041c961ea62f1aeb3c6 SHA512 650e8a26e85d9de08edccb0c9f987824321404832c5dc7910571e46e62e0ca409b1dfca52c691a758225e317357ec3ac91941b98d54a69bf9338bca617323ab8
diff --git a/gnome-extra/gnome-software/gnome-software-50.4.ebuild b/gnome-extra/gnome-software/gnome-software-50.4.ebuild
new file mode 100644
index 000000000000..f7bd80b5ca61
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-50.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://apps.gnome.org/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+IUSE="dkms flatpak +firmware gtk-doc sysprof udev snap test"
+
+RDEPEND="
+	>=dev-libs/appstream-0.14.0:0=
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.3.4:=
+	>=gui-libs/gtk-4.17.5:4
+	>=dev-libs/glib-2.76.0:2
+	>=dev-libs/json-glib-1.6.0
+	>=net-libs/libsoup-3.0:3.0
+	>=gui-libs/libadwaita-1.8_alpha:1
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	>=gnome-base/gsettings-desktop-schemas-3.18.0
+	sys-auth/polkit
+	firmware? ( >=sys-apps/fwupd-1.6.2 )
+	flatpak? (
+		>=sys-apps/flatpak-1.14.1
+		dev-util/ostree
+	)
+	snap? (
+		app-containers/snapd
+		>=sys-libs/snapd-glib-1.64:=
+	)
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.18.0
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libglib-testing )
+"
+BDEPEND="
+	>=dev-build/meson-1.6.0
+	dev-libs/libxml2:2
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/Disable-gs-self-test-flatpak.patch"
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
+	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		-Dman=true
+		-Dpackagekit=false
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		-Deos_updater=false # Endless OS updater
+		$(meson_use dkms)
+		$(meson_use firmware fwupd)
+		$(meson_use flatpak)
+		-Dmalcontent=false
+		-Drpm_ostree=false
+		-Dwebapps=true
+		-Ddefault_featured_apps=true
+		-Dhardcoded_curated=true
+		-Dhardcoded_foss_webapps=true
+		-Dhardcoded_proprietary_webapps=true
+		$(meson_use udev gudev)
+		-Dapt=false
+		$(meson_use snap)
+		-Dexternal_appstream=false
+		$(meson_use gtk-doc gtk_doc)
+		-Dhardcoded_curated=true
+		# TODO: Will this be beneficial to us with flatpak at least? If
+		# enabled, it shows some apps under installed (probably merely due to
+		# /usr/share/app-info presence), but launching and removal of them is
+		# broken
+		-Ddefault_featured_apps=false
+		-Dmogwai=false #TODO?
+		$(meson_feature sysprof)
+		-Dprofile=''
+		-Dopensuse-distro-upgrade=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" --print-errorlogs || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 91352803ffa8..4ca0588aadb0 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-user-docs-49.9.tar.xz 16272260 BLAKE2B 85f6091f1990cb24c5cd88d71f269df8f043a99ff068ca5eb685a6f68cf856171af11bc88357cff6b79fa0ede408d3202eaa4f7605e550d07c7efefe2f81105e SHA512 639184a62ebf6ffe46f0bf2f25dcecd8c1be9be3f736a17cfcc7d0ab0f0f2206b7aa6dccfd4f4b5fe988de9461bbea38aa30de68292d820577b0b230a67a93df
 DIST gnome-user-docs-50.4.tar.xz 16414356 BLAKE2B d3244cbf4d629e4590006be6afaef90356726b5728a9f71c0985e71bf3064d4a9278a6587715e9337f41276c5095fbd603e5dc594bceb7a88d55de1e79229768 SHA512 e753a4c1794156036fce92b8536b0d041cd86891f584968f3211ad06c1df2ee7ba69c35aca9450ab1f26f0d9a77392aa2e24c4f0d501c920fcfbd7153aee6121
+DIST gnome-user-docs-50.5.tar.xz 18401120 BLAKE2B 221a4bfa88bf41730d09a7f9ea97e24ecc6f3c9808d43c70ec6c1964b2d9a5591ab32d8f6c5153275a05f6f0aaffa0c7b4d26b8f4f80f9eb2279276ef75320d4 SHA512 5a0ad9e680e8d9ba0ebc1149fe033d5fbf2347b386fc4232f1673c4d5cc4405330dc79fd072e37545561e19a61a91a4b17da83f8c707eae835ab4b02777cc353
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-50.5.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-50.5.ebuild
new file mode 100644
index 000000000000..56805b43ac47
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-50.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-libs/libxml2 )"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index b7e95f150b93..42f883bc5d4c 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,4 @@
 DIST gtk-4.18.6.tar.xz 17710412 BLAKE2B 8666ae72e35a9cc0686082ee054fab62ef737651015cdda85613a7d087d7649621203f98b72bf69bbd0f8191c065a26130030c6c48cfcb0b6ba1de775ff4e162 SHA512 636bc3adf01f444dfbf10a3fdce82cdd7b2914b9ff251e98e006a987c3216ef22f5ae8759aa5f2385d1e82813ab8bf2c8adc4f8d6db230e9f507b44fac10e359
 DIST gtk-4.20.3.tar.xz 16003020 BLAKE2B 71b04ea11bfb7ba1d8532c0fac1b76ba5bf39bd3eb537c093885d2cf718d4bcb2f706a845a5893cb03fb516d1ec6a323505f7287d1ecd7d06e703f15dcaf3dcb SHA512 9ae8d2fb6fc6b3780587e70cbf4bff972dd36eedce79d91de874cc813ba3cb100ce6cce076e063e4606e0e32aa51d05c625dd272d5766190045f32b3754368f1
 DIST gtk-4.20.4.tar.xz 16019448 BLAKE2B 2f82ebecb6b61de6bca8f0b0b6071234202cc3dd9cd0d8a7c4418b92267d0b51b222f58a192862cdb9c149a5e62ac6e42d5eeb51fbf881a3ace2fabeaad59edc SHA512 b11c9e09d1fe5a09b1f6a794b4f538921def361cd2e409abd079c81978749777708d78ed10446defca2acb9cd94f046060b4206ab059e0f44ad667f7ab477727
+DIST gtk-4.22.5.tar.xz 17007008 BLAKE2B 7a50a3bb360ce1e83744064c73cd09546991cdcb69564ca45ca55833f957abf47f84db1cdbe301c2d7b6ece2a49e3a05c8e49c3e0df139c0ce164bf99bd4f7aa SHA512 6c8970b8795df724c9e44e95a484278f9da7ddbc830f73d0c8678bce0752272af9f23d04e528bd51e9007db007150ec678072d4d76f89fd41dec579630758971
diff --git a/gui-libs/gtk/gtk-4.22.5.ebuild b/gui-libs/gtk/gtk-4.22.5.ebuild
new file mode 100644
index 000000000000..112b9f0ff4e6
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.22.5.ebuild
@@ -0,0 +1,317 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	gtk-doc? ( introspection )
+	test? ( introspection )
+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aqua broadway cloudproviders colord cups examples gstreamer gtk-doc +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+
+# librsvg for svg icons and "!8541 Use librsvg for symbolics that we
+#     can't parse ourselves" (formerly a PDEPEND to avoid circular dep
+#     on wd40 profiles with librsvg[tools]), bug #547710
+# NOTE: Support was added to build against both cups2 and cups3
+
+# NOTE: Add below libcloudproviders once accesskit-c is in ::gentoo:
+# accesskit? ( app-accessibility/accesskit-c:0.18 )
+COMMON_DEPEND="
+	>=dev-libs/glib-2.84:2
+	>=x11-libs/cairo-1.18.2[aqua?,glib,svg(+),X?]
+	>=x11-libs/pango-1.56.0[introspection?]
+	>=dev-libs/fribidi-1.0.6
+	>=media-libs/harfbuzz-8.4.0:=
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	media-libs/libpng:=
+	media-libs/mesa[vulkan?,wayland?,X?]
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libepoxy-1.4[egl(+),X(+)?]
+	>=media-libs/graphene-1.10.0[introspection?]
+	app-text/iso-codes
+	x11-misc/shared-mime-info
+
+	cloudproviders? ( net-libs/libcloudproviders )
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	examples? ( gnome-base/librsvg:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.24.0:1.0
+		>=media-libs/gst-plugins-bad-1.24.0:1.0
+		|| (
+			>=media-libs/gst-plugins-base-1.24.0:1.0[gles2]
+			>=media-libs/gst-plugins-base-1.24.0:1.0[opengl]
+		)
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.84:= )
+	vulkan? ( >=media-libs/vulkan-loader-1.3:=[wayland?,X?] )
+	wayland? (
+		>=dev-libs/wayland-1.24.0
+		>=dev-libs/wayland-protocols-1.44
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		media-libs/fontconfig
+		x11-libs/libX11
+		>=x11-libs/libXi-1.8
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		x11-libs/libdrm
+		sys-kernel/linux-headers
+	)
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+PDEPEND="
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	>=dev-build/meson-1.5.0
+	introspection? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+	dev-python/docutils
+	>=dev-libs/glib-2.82
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+	vulkan? ( media-libs/shaderc )
+	wayland? (
+		>=dev-util/wayland-scanner-1.24.0
+	)
+	test? (
+		dev-libs/glib:2
+		media-fonts/cantarell
+		wayland? ( dev-libs/weston[headless] )
+		>=gnome-base/librsvg-2.48:2
+		dev-cpp/catch
+	)
+"
+
+PATCHES=(
+	# Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds
+	# with USE="-wayland -X" to trick gtk into claiming that it wasn't built with
+	# such support.
+	# https://bugs.gentoo.org/624960
+	"${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_ge_4.18.5.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+	sed -i \
+		-e '/gtk4-update-icon-cache/d' \
+		docs/reference/gtk/meson.build \
+		tools/meson.build \
+		|| die
+
+	# The border-image-excess-size.ui test is known to fail on big-endian platforms
+	# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
+	if [[ $(tc-endian) == big ]]; then
+		sed -i \
+			-e "/border-image-excess-size.ui/d" \
+			-e "/^xfails =/a 'border-image-excess-size.ui'," \
+			testsuite/reftests/meson.build || die
+	fi
+}
+
+src_configure() {
+	use x86 && append-flags -DDISABLE_X64=1 #943705 https://gitlab.gnome.org/GNOME/gtk/-/issues/4173
+
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		-Dandroid-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		-Dprint-cpdb=disabled
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		$(meson_feature cloudproviders)
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+		-Dandroid-runtime=disabled
+		# Introspection
+		$(meson_feature introspection)
+
+		# Documentation
+		$(meson_use gtk-doc documentation)
+		-Dscreenshots=false
+		-Dman-pages=true
+
+		# Demos, examples, and tests
+		-Dprofile=default
+		$(meson_use examples build-demos)
+		$(meson_use test build-testsuite)
+		$(meson_use examples build-examples)
+		-Dbuild-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	addwrite /dev/dri
+
+	export LIBGL_ALWAYS_SOFTWARE=true
+
+	# Note that skipping gsk-compare entirely means we do run *far*
+	# fewer tests, but a reliable testsuite for us is more important
+	# than absolute-maximum coverage if we can't trust the results and
+	# dismiss any failures as "probably font related" and so on.
+	# Upstream said those are going to give slightly different results
+	# depending on the renderers and the software rendering stack and are
+	# meant to be used in CI in a well defined environment and not really
+	# suitable for distros
+	# https://gitlab.gnome.org/GNOME/gtk/-/issues/6383
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --timeout-multiplier=130 \
+			--setup=x11 \
+			--no-suite=docs \
+			--no-suite=failing \
+			--no-suite=x11_failing \
+			--no-suite=flaky \
+			--no-suite=headless \
+			--no-suite=gsk-compare \
+			--no-suite=gsk-compare-broadway \
+			--no-suite=gsk-compare-gl \
+			--no-suite=gsk-compare-cairo \
+			--no-suite=gsk-compare-ngl \
+			--no-suite=gsk-compare-vulkan \
+			--no-suite=needs-udmabuf \
+			--no-suite=pango \
+			--no-suite=svg
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --timeout-multiplier=130 \
+			--setup=wayland \
+			--no-suite=docs \
+			--no-suite=failing \
+			--no-suite=wayland_failing \
+			--no-suite=wayland_gles_failing \
+			--no-suite=flaky \
+			--no-suite=headless \
+			--no-suite=gsk-compare \
+			--no-suite=gsk-compare-broadway \
+			--no-suite=gsk-compare-gl \
+			--no-suite=gsk-compare-cairo \
+			--no-suite=gsk-compare-ngl \
+			--no-suite=gsk-compare-vulkan \
+			--no-suite=needs-udmabuf \
+			--no-suite=svg
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	local i src
+
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}/usr/share/gtk-doc/html" || die
+
+		for dir in gdk4 gtk4 gsk4; do
+			src="${ED}/usr/share/doc/${dir}"
+			test -d "${src}" || die "Expected documentation directory ${src} not found"
+			mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die
+		done
+
+		if use X; then
+			src="${ED}/usr/share/doc/gdk4-x11"
+			test -d "${src}" || die "Expected X11 documentation ${src} not found"
+			mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die
+		fi
+
+		if use wayland; then
+			src="${ED}/usr/share/doc/gdk4-wayland"
+			test -d "${src}" || die "Expected Wayland documentation ${src} not found"
+			mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die
+		fi
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	xdg_mimeinfo_database_update
+	gnome2_schemas_update
+
+	optfeature "default application for gtk-print-preview-command" app-text/evince
+
+	if use examples ; then
+		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 8d14eb6e5c27..bdd7ecff8a2c 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1 +1,2 @@
 DIST libadwaita-1.8.7.tar.xz 2701780 BLAKE2B c5594ac44e6f98caa5e302690938679723e255e577ea1657483eaf0d1ad376891976c743ec3b6e5ee7ed2cf3356824779e38e4f8364195d119fe885f4780a505 SHA512 3d6e78d905a31d9d4e9b89fc2d2dec91d73e87585a694520c357482d682861e67a03a95aaaf29926c4b5ed7fc145a9938d46e10110cb834ff1d8394f5f11225e
+DIST libadwaita-1.9.3.tar.xz 2894332 BLAKE2B 58332c93e78437784f39448a599dc8e313edfd3e0f0e277cf2373b5339241b3a102b6b401e8eeca0bb793db296c7f0d3bdcb9cc007c52439c9a986e83eb97413 SHA512 65f50ea784b0d7382eed4a56c2c88d74315641d2d5a37031747e4ad11845fd69418a636a37a7d9769b3529f63dec5506ada25ea1ebc591056791020528b45721
diff --git a/gui-libs/libadwaita/libadwaita-1.9.3.ebuild b/gui-libs/libadwaita/libadwaita-1.9.3.ebuild
new file mode 100644
index 000000000000..02fe2d17819c
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.9.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit gnome.org meson python-any-r1 vala virtualx xdg
+
+DESCRIPTION="Building blocks for modern GNOME applications"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="examples gtk-doc +introspection test +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.84.0:2
+	>=gui-libs/gtk-4.21.1:4[introspection?]
+	dev-libs/appstream:=
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.83.2:= )
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-lang/sassc
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dprofiling=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc documentation)
+		$(meson_use test tests)
+		$(meson_use examples)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	addwrite /dev/dri
+	virtx meson_src_test --timeout-multiplier 2
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/gui-libs/vte-common/Manifest b/gui-libs/vte-common/Manifest
index 298ac984dd76..9e38c9f64594 100644
--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -1,2 +1,2 @@
-DIST vte-0.82.3.tar.xz 6141808 BLAKE2B 069c660d2018685bdc748931ffe88299e071bdd68925c6fd92ac43eef8667dd52c0911f66dbb59e6f98a240cb583c102fccb8797d5443e9b1ea83c773f38224b SHA512 4b03ff539ea0240b2fe814c4523da248e9b201beb68439990f9590fd8f75024e869e06bf07c2afc06258b588b6750bdb776a1505662c991fddced39adbed15d8
 DIST vte-0.82.4.tar.xz 6148520 BLAKE2B 9b88ea5b589c9a03db0e8673e5c24dd848c0056585384cbf3337e56fc6361aa6c4db2528f6a698b4542c03ccca65a809ea50e3e6775d5d2e900b8868c6f3b73d SHA512 6fde14edfdc25aa65f6993ed513dfd40d55222a09f079bd97e57b7f40c52a224a5e92cdbe590b7ae41d4a4c16645d8aa0e6a904bc5673ab632d4bba8a5618488
+DIST vte-0.84.1.tar.xz 6709136 BLAKE2B 4bc482451287faa5194edaee72004d10ec441ed750491b475a6b5b99e5328946d3eee96a992ec33b4b90bda31fe0fac81d8d0f2a7c33c1a7ff2a0030d2e9913c SHA512 34ac77e712b12b62518a09122ce36c816e4c14a53b01be55f233c8749dd234b6b60a9ab47730e34be44fef1994364002a5f31a0af937e95ed1804752a8dd645e
diff --git a/gui-libs/vte-common/files/vte-common-0.84.0-musl-W_EXITCODE.patch b/gui-libs/vte-common/files/vte-common-0.84.0-musl-W_EXITCODE.patch
new file mode 100644
index 000000000000..0277318746ab
--- /dev/null
+++ b/gui-libs/vte-common/files/vte-common-0.84.0-musl-W_EXITCODE.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+https://bugs.gentoo.org/835489
+https://bugs.gentoo/org/554416
+
+From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001
+From:
+Date: Fri, 12 Mar 2021 08:41:13 -0600
+Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility
+
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -20,8 +20,6 @@
+ 
+ #include "widget.hh"
+ 
+-#include <sys/wait.h> // for W_EXITCODE
+-
+ #include <exception>
+ #include <new>
+ #include <string>
+@@ -993,7 +993,7 @@ Widget::dispose() noexcept
+         }
+
+         if (m_terminal->terminate_child()) {
+-                int status = W_EXITCODE(0, SIGKILL);
++                int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig)
+                 emit_child_exited(status);
+         }
+ }
diff --git a/gui-libs/vte-common/vte-common-0.82.3.ebuild b/gui-libs/vte-common/vte-common-0.84.1.ebuild
index 3226e7b59a7e..eb0055d1f36a 100644
--- a/gui-libs/vte-common/vte-common-0.82.3.ebuild
+++ b/gui-libs/vte-common/vte-common-0.84.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-3+ GPL-3+"
 
 SLOT="2.91" # vte_api_version in meson.build
 
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="systemd"
 
@@ -41,13 +41,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/vte-0.82.2-fix-unknown-variable.patch"
-)
-
 src_prepare() {
 	default
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.84.0-musl-W_EXITCODE.patch
 }
 
 src_configure() {
diff --git a/gui-libs/vte/Manifest b/gui-libs/vte/Manifest
index 298ac984dd76..9e38c9f64594 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -1,2 +1,2 @@
-DIST vte-0.82.3.tar.xz 6141808 BLAKE2B 069c660d2018685bdc748931ffe88299e071bdd68925c6fd92ac43eef8667dd52c0911f66dbb59e6f98a240cb583c102fccb8797d5443e9b1ea83c773f38224b SHA512 4b03ff539ea0240b2fe814c4523da248e9b201beb68439990f9590fd8f75024e869e06bf07c2afc06258b588b6750bdb776a1505662c991fddced39adbed15d8
 DIST vte-0.82.4.tar.xz 6148520 BLAKE2B 9b88ea5b589c9a03db0e8673e5c24dd848c0056585384cbf3337e56fc6361aa6c4db2528f6a698b4542c03ccca65a809ea50e3e6775d5d2e900b8868c6f3b73d SHA512 6fde14edfdc25aa65f6993ed513dfd40d55222a09f079bd97e57b7f40c52a224a5e92cdbe590b7ae41d4a4c16645d8aa0e6a904bc5673ab632d4bba8a5618488
+DIST vte-0.84.1.tar.xz 6709136 BLAKE2B 4bc482451287faa5194edaee72004d10ec441ed750491b475a6b5b99e5328946d3eee96a992ec33b4b90bda31fe0fac81d8d0f2a7c33c1a7ff2a0030d2e9913c SHA512 34ac77e712b12b62518a09122ce36c816e4c14a53b01be55f233c8749dd234b6b60a9ab47730e34be44fef1994364002a5f31a0af937e95ed1804752a8dd645e
diff --git a/gui-libs/vte/files/vte-0.84.0-musl-W_EXITCODE.patch b/gui-libs/vte/files/vte-0.84.0-musl-W_EXITCODE.patch
new file mode 100644
index 000000000000..cd0239b5a230
--- /dev/null
+++ b/gui-libs/vte/files/vte-0.84.0-musl-W_EXITCODE.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+https://bugs.gentoo.org/835489
+https://bugs.gentoo/org/554416
+
+From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001
+From:
+Date: Fri, 12 Mar 2021 08:41:13 -0600
+Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility
+
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -20,8 +20,6 @@
+ 
+ #include "widget.hh"
+ 
+-#include <sys/wait.h> // for W_EXITCODE
+-
+ #include <exception>
+ #include <new>
+ #include <string>
+@@ -993,7 +993,7 @@ Widget::dispose() noexcept
+         }
+ 
+         if (m_terminal->terminate_child()) {
+-                int status = W_EXITCODE(0, SIGKILL);
++                int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig)
+                 emit_child_exited(status);
+         }
+ }
+
diff --git a/gui-libs/vte/vte-0.82.4.ebuild b/gui-libs/vte/vte-0.82.4.ebuild
index 4bfa4c923c48..46d4d6ac158b 100644
--- a/gui-libs/vte/vte-0.82.4.ebuild
+++ b/gui-libs/vte/vte-0.82.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{13..14} )
 
 inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
@@ -63,6 +64,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream build w/ -fno-strict-aliasing but >= GCC 17 makes
+	# -Werror=strict-aliasing (set by the user here) effective even with
+	# that, so disable both rather than just the error to be safe.
+	append-flags $(test-flags-CC -fno-strict-aliasing -Wno-error=strict-aliasing)
 	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
 	filter-lto
 
diff --git a/gui-libs/vte/vte-0.82.3.ebuild b/gui-libs/vte/vte-0.84.1.ebuild
index 4bfa4c923c48..a249fe0e0294 100644
--- a/gui-libs/vte/vte-0.82.3.ebuild
+++ b/gui-libs/vte/vte-0.84.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{13..14} )
 
 inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
@@ -13,7 +14,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
 
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
@@ -55,7 +56,7 @@ src_prepare() {
 	use vala && vala_setup
 	xdg_environment_reset
 
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.84.0-musl-W_EXITCODE.patch
 
 	# -Ddebug option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
 	sed -e '/ggdb3/d' -i meson.build || die
@@ -63,6 +64,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream build w/ -fno-strict-aliasing but >= GCC 17 makes
+	# -Werror=strict-aliasing (set by the user here) effective even with
+	# that, so disable both rather than just the error to be safe.
+	append-flags $(test-flags-CC -fno-strict-aliasing -Wno-error=strict-aliasing)
 	# Upstream don't support LTO & error out on it in meson.build (bug #926156)
 	filter-lto
 
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild
index 12d592d1cd91..00317e240219 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-6.29.0-kcolorbuttontest.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-6.29.0-kcolorbuttontest.patch
new file mode 100644
index 000000000000..91c2bd64a22b
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-6.29.0-kcolorbuttontest.patch
@@ -0,0 +1,45 @@
+From d8144b3f27e32f4e2aaa2c6045fc962c623efbac Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Fri, 28 Aug 2026 11:35:42 +0300
+Subject: [PATCH] KColorMimeData: guard against a null QMimeData pointer
+
+This is a recent regression that caused all KStars tests to crash locally in Wayland.
+
+QClipboard::mimeData() can return nullptr when the clipboard has never been set in the current session (e.g. the offscreen QPA platform, or a
+freshly started Wayland session with no clipboard manager). Since the KColorButton/KColorCombo copy & paste context menu added in
+00866bc50fa32c280db443fc14e5294dcabfdeb4, KAbstractColorEditPrivate's Q_GLOBAL_STATIC KColorClipboardWatcher passes that pointer straight
+into KColorMimeData::canDecode()/fromMimeData(), which dereferenced it unconditionally, crashing on construction of the very first
+KColorButton/KColorCombo in the process.
+---
+ src/kcolormimedata.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/kcolormimedata.cpp b/src/kcolormimedata.cpp
+index 960bf09e..96227ca6 100644
+--- a/src/kcolormimedata.cpp
++++ b/src/kcolormimedata.cpp
+@@ -24,6 +24,11 @@ void populateMimeData(QMimeData *mimeData, const QColor &color)
+ 
+ bool canDecode(const QMimeData *mimeData)
+ {
++    // QClipboard::mimeData() can return nullptr when the clipboard has never
++    // been set (e.g. no clipboard manager, or the "offscreen" QPA platform).
++    if (!mimeData) {
++        return false;
++    }
+     if (mimeData->hasColor()) {
+         return true;
+     }
+@@ -38,6 +43,9 @@ bool canDecode(const QMimeData *mimeData)
+ 
+ QColor fromMimeData(const QMimeData *mimeData)
+ {
++    if (!mimeData) {
++        return QColor();
++    }
+     if (mimeData->hasColor()) {
+         return mimeData->colorData().value<QColor>();
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild
index 2aa6ccb6553b..ffdc25b70c15 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild
@@ -18,6 +18,8 @@ DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
 RDEPEND="${DEPEND}"
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
+PATCHES=( "${FILESDIR}/${P}-kcolorbuttontest.patch" ) # in 6.30
+
 CMAKE_SKIP_TESTS=(
 	# bug 650216
 	kdatecomboboxtest
diff --git a/mail-client/neomutt/neomutt-20260616.ebuild b/mail-client/neomutt/neomutt-20260616.ebuild
index 6a418dc39230..2589b879b9ea 100644
--- a/mail-client/neomutt/neomutt-20260616.ebuild
+++ b/mail-client/neomutt/neomutt-20260616.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index a20cdea97e27..c2151b2ec3c0 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,5 +1,3 @@
-DIST postfix-3.11.6.tar.gz 5289392 BLAKE2B e4a1194fa3f718212413bcee4f61f3c7fe3bd6b0bc6e96a714ca4093e3827350c2eda0e68c5826d865fc9c657e6bcebb0724b99c282c7a85dd877f2207de5075 SHA512 eddb71b7b64a8f9e0fca8a93679e86ac53eebc458a09910e5f3a871523d35361071a391cc904e511835137d4461a6a779c1b24c519e2f6a7de577e55e71a75ba
-DIST postfix-3.11.6.tar.gz.asc 220 BLAKE2B 594b165846bf1ef6ead41a135b38cc9e4180a61450c529bd57f022180758074a9f546c472ccca21452b49f723395c0f33e02bb314d20dc708438ed992f51f5e3 SHA512 d8255c2d7fda771b45e261d68ba8d1a066217b851c88a2d9c5de231b98c0ec5f1d7a41948d51c5f388400301cf6a804c7ded24561ad137f1f635b21c24281651
 DIST postfix-3.11.7.tar.gz 5293599 BLAKE2B 4f3d9f92320336a80770593800d026aa41dc628dfd9db5e5d3b6fad667fe700bdd4bddcc16fce17f47fdba9cd58419946dc5f14b0e9d7dc5569c45b1226ffae4 SHA512 3b4ef7562a24bbab1d0ca361ac0af1037aa3d4ae65a7c825711de9d5d3ed88975aad63cb09991717de334f4382c29039b527a3e8d4e65c5a6d35efd3e782910f
 DIST postfix-3.11.7.tar.gz.asc 220 BLAKE2B e32f69fae20c6aae0f95efabd02c77c2bd9b7684738b15f8d584447e3bb5d09c8ef80ffb11c4798615c6b8f3e8ff31de25a5bc2dc4f41ef012ec956f7528c662 SHA512 d482753f934393bb65b8e069a5ae092d3b3ef4c30106f8738e9947d18ad35271fc375d202ffbc335e4a04737e369eb8975163fb530aa1a7176d16c7f62746697
 DIST postfix-3.12-20260902.tar.gz 5425474 BLAKE2B f74688566d86114f59376d68fff99b7ac9ba6b2e606c48d053e74740c8b6a3f1ca2d3bb8085631ddfbcd580a8aa2b06364d257a2838e85b1187efd07d5c9df0b SHA512 48ba1d448ec62861ddc42a951e234fe9679504ce08343a79d2e0a84a54d4908086f064fec7ed5de7a3af6c4434bbc66e3186a6aafd81c22a84fee8982d143ae1
diff --git a/mail-mta/postfix/postfix-3.11.6.ebuild b/mail-mta/postfix/postfix-3.11.6.ebuild
deleted file mode 100644
index dd70699d2e8b..000000000000
--- a/mail-mta/postfix/postfix-3.11.6.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/postfix.asc
-inherit eapi9-ver pam systemd toolchain-funcs verify-sig
-
-if [[ ${PV} == *_rc* ]]; then
-	MY_PV="${PV/_rc/-RC}"
-else
-	MY_PV="${PV/_pre/-}"
-fi
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="http://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="https://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-SRC_URI+=" verify-sig? ( ${MY_URI}/${MY_SRC}.tar.gz.gpg2 -> ${MY_SRC}.tar.gz.asc )"
-S="${WORKDIR}/${MY_SRC}"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind +lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	dev-libs/libpcre2:0
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap:= )
-	ldap-bind? ( net-nds/openldap:=[sasl] )
-	lmdb? (
-		dev-db/lmdb:0=
-	)
-	mongodb? ( >=dev-libs/mongo-c-driver-1.23.0 >=dev-libs/libbson-1.23.0 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	tlsrpt? ( net-libs/libtlsrpt )
-	"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	selinux? ( sec-policy/selinux-postfix )"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-postfix )"
-
-REQUIRED_USE="
-	ldap-bind? ( ldap sasl )
-	tlsrpt? ( ssl )
-	"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:${EPREFIX}/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	# bug #915670
-	unset LD_LIBRARY_PATH
-
-	for name in CDB LDAP LMDB MONGODB MYSQL PCRE PGSQL SDBM SQLITE TLSRPT
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="" mylibs="${LDFLAGS} -ldl"
-
-	# Determine local database type defaults
-	local default_database_type="lmdb"
-	local default_cache_db_type="lmdb"
-	if ! use lmdb; then
-		if use berkdb; then
-			default_database_type="hash"
-			default_cache_db_type="btree"
-		elif use cdb; then
-			default_database_type="cdb"
-			ewarn
-			ewarn "cdb USE flag is on but lmdb USE flag is not. Local database files"
-			ewarn "for caches will not work. Consider turning lmdb USE flag on."
-			ewarn
-		fi
-	fi
-
-	# libpcre is EOL. prefer libpcre2
-	mycc=" -DHAS_PCRE=2"
-	AUXLIBS_PCRE="$($(tc-getPKG_CONFIG) --libs libpcre2-8)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if use mongodb; then
-		mycc="${mycc} -DHAS_MONGODB $($(tc-getPKG_CONFIG) --cflags libmongoc-1.0)"
-		AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL $($(tc-getPKG_CONFIG) --cflags libpq)"
-		AUXLIBS_PGSQL="$($(tc-getPKG_CONFIG) --libs libpq)"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use tlsrpt; then
-		mycc="${mycc} -DUSE_TLSRPT"
-		AUXLIBS_TLSRPT="-ltlsrpt"
-	fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${ESYSROOT}/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I${ESYSROOT}/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			AUXLIBS_CDB="-lcdb"
-		else
-			printf -v AUXLIBS_CDB "${ESYSROOT}/usr/$(get_libdir)/%s " \
-				cdb.a alloc.a buffer.a unix.a byte.a || die
-		fi
-	fi
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles \
-		shared=yes \
-		dynamicmaps=no \
-		pie=yes \
-		default_database_type="${default_database_type}" \
-		default_cache_db_type="${default_cache_db_type}" \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" \
-		CC="$(tc-getCC)" \
-		OPT="${CFLAGS}" \
-		CCARGS="${mycc}" \
-		AUXLIBS="${mylibs} ${AUXLIBS_TLSRPT}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" \
-		AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" \
-		AUXLIBS_MONGODB="${AUXLIBS_MONGODB}" \
-		AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" \
-		AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SDBM="${AUXLIBS_SDBM}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${ED}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger, collate and tlstype
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-	dobin auxiliary/collate/tlstype.pl
-	dodoc auxiliary/collate/README.tlstype
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue,log}
-	fperms 02755 /usr/sbin/post{drop,queue,log}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${ED}"/usr/sbin/postconf -c "${ED}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${ED}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${ED}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	dodoc -r README_FILES/ examples/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	if ver_replacing -lt 3.11 ; then
-		# This is an upgrade which requires user review
-		ewarn "Default database and cache type changed to lmdb"
-		ewarn "with postfix-3.11. Please read the migration guide:"
-		ewarn "  https://www.postfix.org/NON_BERKELEYDB_README.html"
-	fi
-
-	if ! use berkdb && ! use cdb && ! use lmdb; then
-		ewarn
-		ewarn "No backend for local database files is configured."
-		ewarn "newaliases and postmap commands will not work. This"
-		ewarn "is not a supported configuration and you are strongly"
-		ewarn "recommended to turn one of berkdb, cdb or lmdb USE flags"
-		ewarn "on."
-		ewarn
-	else
-		# warn if no aliases database
-		# do not assume berkdb
-		if [[ ! -e /etc/mail/aliases.db \
-		   && ! -e /etc/mail/aliases.cdb \
-		   && ! -e /etc/mail/aliases.lmdb ]] ; then
-			ewarn "You must edit /etc/mail/aliases to suit your needs"
-			ewarn "and then run /usr/bin/newaliases."
-		fi
-		# run newaliases anyway. otherwise, we might break when switching
-		# default database implementation
-		"${EROOT}"/usr/bin/newaliases
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# hint for configuring tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings, please run:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings, please run:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.11.7.ebuild b/mail-mta/postfix/postfix-3.11.7.ebuild
index ecefd16dd597..ddc3a18a7dfe 100644
--- a/mail-mta/postfix/postfix-3.11.7.ebuild
+++ b/mail-mta/postfix/postfix-3.11.7.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_SRC}"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind +lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"
 
diff --git a/media-fonts/unifont/unifont-17.0.05.ebuild b/media-fonts/unifont/unifont-17.0.05.ebuild
index a0418d841b12..cd3cfbf12681 100644
--- a/media-fonts/unifont/unifont-17.0.05.ebuild
+++ b/media-fonts/unifont/unifont-17.0.05.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+ || ( GPL-2+-with-font-exception OFL-1.1 ) public-domain utils? ( FDL-1.3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="ttf utils"
 REQUIRED_USE="ttf? ( utils )"
 
diff --git a/media-gfx/gnome-photos/gnome-photos-44.0-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-44.0-r1.ebuild
new file mode 100644
index 000000000000..3a8691d64735
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-44.0-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test upnp-av"
+#RESTRICT="!test? ( test )"
+# https://gitlab.gnome.org/GNOME/gegl/-/issues/335
+# https://gitlab.gnome.org/Archive/gnome-photos/-/issues/214
+RESTRICT="test"
+
+DEPEND="
+	media-libs/babl
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36.8:2
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
+	sci-geosciences/geocode-glib:2
+	>=media-libs/gexiv2-0.14.0:0=
+	>=dev-libs/glib-2.62.0:2
+	dev-libs/libportal:=[gtk]
+	>=net-libs/gnome-online-accounts-3.8.0:=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.16:3
+	>=dev-libs/libdazzle-3.26.0
+	>=gui-libs/libhandy-1.1.90:1
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libpng-1.6:0=
+	app-misc/tinysparql:3
+	sys-apps/dbus
+"
+# Upstream left this commented in meson.build. Probably comes back with the next version
+# >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts]
+
+# localsearch gschema used at runtime.
+RDEPEND="${DEPEND}
+	upnp-av? ( net-libs/dleyna:1.0= )
+	app-misc/localsearch:3
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/desktop-file-utils
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+	use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test dogtail)
+		-Dflatpak=false
+		-Dinstalled_tests=false
+		-Dmanuals=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 847b1f1dfd87..dd7ecb3472fe 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,2 +1,2 @@
-DIST simple-scan-46.0.tar.xz 1136672 BLAKE2B 0ee2dd5392ed1a888948183e9efbd8943287baad66dd45351cbbb32a9a4c17903415676b3e6e00203d8a3572e90397b51bc23ecec2ad6cfa6597a10ffdd5bcf4 SHA512 f7c4433536f59c71f066cdae51b0de1b0dcf9b8af00f3bedb4c1be281d09f9ce122666ed849bd88de8868042429f14bb7b01409f8a006360ce4285000fd30bdc
 DIST simple-scan-49.1.tar.xz 1216808 BLAKE2B 9e1bb19d8f0812ee574435b5e681056c1c0f5bcf8cd9c9881f367ae5c7fe67a52c029881b7bd8b235a18a072cdada17bf287c512ae5c29ece461eb31a9dbc70a SHA512 3f67928cca7019adaee58b71b40fda9dca232c42375e9d578d9c460f47b209e011d979360210304e859101cf043c048ff42f9365a0c69e7c8e78813c75c984a6
+DIST simple-scan-50.0.tar.xz 1233228 BLAKE2B cdc451540b113dce44d72dadc54ad48dbd626ec99274817cda352df142e50ae9a41054177e2c7bd24c60a7b6f3d98574055acf11e2a601accbd051850cb44d60 SHA512 4a8380d94a13f73181cc9b781d8f875724de4b9567b9b2be07c66abcf21a03b209fbdc28d6756c5c9d546d7f02966617a315e5d45c02f248db417e90137390cd
diff --git a/media-gfx/simple-scan/simple-scan-46.0.ebuild b/media-gfx/simple-scan/simple-scan-50.0.ebuild
index e32baad3fe4e..01e58e747ba8 100644
--- a/media-gfx/simple-scan/simple-scan-46.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,13 +10,13 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="colord webp"
 
 DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gui-libs/gtk-4.10.0:4
-	>=gui-libs/libadwaita-1.2.0:1
+	>=dev-libs/glib-2.76:2
+	>=gui-libs/gtk-4.15.2:4
+	>=gui-libs/libadwaita-1.8.0:1
 	>=virtual/zlib-1.2.3.1:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -42,7 +42,7 @@ BDEPEND="
 
 PATCHES=(
 	# Add control for optional dependencies
-	"${FILESDIR}"/"${PV}"-add-control-optional-deps.patch
+	"${FILESDIR}"/46.0-add-control-optional-deps.patch
 )
 
 src_prepare() {
diff --git a/media-libs/dav1d/dav1d-1.5.1.ebuild b/media-libs/dav1d/dav1d-1.5.1.ebuild
index 3647111e0e8d..113a8cbb4266 100644
--- a/media-libs/dav1d/dav1d-1.5.1.ebuild
+++ b/media-libs/dav1d/dav1d-1.5.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/dav1d/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 inherit meson-multilib
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index ccdddae45c6e..99e2ac371a93 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,2 +1,2 @@
-DIST gexiv2-0.14.6.tar.xz 391436 BLAKE2B 7552089fa5accb987f5efe130e58347f672d61a2ec55835dfcddb59b427857a85ee3887eab7c3f110c4e09d48a0aa11cf3728b198b8a4352582c9f8761157447 SHA512 1750964e539ed449c77bed5fc469fcd83a8534b25c4ea57a43671443b845ac6c2760236b03c1af936fd75b6517c8b2bd4873e066f0479e42ed521ab71a75efc9
 DIST gexiv2-0.14.7.tar.xz 391520 BLAKE2B 32d0cd137ebfcc9f0cd5df26b6d6c474dbaf2e43385122a0ee6a843003965a85e3a9ab27e01f19bee9185835bf8f0362c309ccaddc6308e3dca6089128355559 SHA512 c366bea99d0a9199944989d85512c3eb163f16ebfccb98b877311241e300f50ad57c0ac08f18f77bbdbd0fc41f18caed24f9645d6f888146200a18bca14a7fd5
+DIST gexiv2-0.16.2.tar.xz 434312 BLAKE2B 3e9805e6b4204c11fb0438054c622609814dbf0bd7d13d091eaba50144dc2cdee9060175975bc16d6e9a6699abdf561a6b1ececcdbdc7e03c17f2c378a1d8c84 SHA512 1987b96199979ee20bf8e7a7aaf57f929409dc97ebd217bfceedf5254e22d2860c0fa94c64dcc70b2e538747c7351d6bd08d2ae1da06cbf36007b1fda7bc89ec
diff --git a/media-libs/gexiv2/gexiv2-0.14.6.ebuild b/media-libs/gexiv2/gexiv2-0.16.2.ebuild
index c4e3482caa4c..8c64d27dc60e 100644
--- a/media-libs/gexiv2/gexiv2-0.14.6.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,11 +14,11 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
+SLOT="0.16/4"
 IUSE="gtk-doc +introspection python test +vala"
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
@@ -28,7 +28,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=media-gfx/exiv2-0.26:=
+	>=media-gfx/exiv2-0.28:=
 	>=dev-libs/glib-2.46.0:2
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
 	python? (
@@ -38,9 +38,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	>=dev-build/meson-1.4
 	dev-util/glib-utils
 	gtk-doc? (
 		dev-util/gtk-doc
+		introspection? ( >=dev-util/gi-docgen-2021.1 )
 		app-text/docbook-xml-dtd:4.3
 	)
 	test? ( media-gfx/exiv2[xmp] )
diff --git a/media-libs/giflib/giflib-6.1.3.ebuild b/media-libs/giflib/giflib-6.1.3.ebuild
index f353b276c665..1029a9df64ff 100644
--- a/media-libs/giflib/giflib-6.1.3.ebuild
+++ b/media-libs/giflib/giflib-6.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( virtual/imagemagick-tools )"
diff --git a/media-libs/libcuefile/libcuefile-477-r4.ebuild b/media-libs/libcuefile/libcuefile-477-r4.ebuild
index 34ca7743d3a2..6792e570593c 100644
--- a/media-libs/libcuefile/libcuefile-477-r4.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-static-libs.patch
diff --git a/media-libs/libdolbyb/libdolbyb-1.0.1.ebuild b/media-libs/libdolbyb/libdolbyb-1.0.1.ebuild
index c47893fde6a9..0cfaae2a8c82 100644
--- a/media-libs/libdolbyb/libdolbyb-1.0.1.ebuild
+++ b/media-libs/libdolbyb/libdolbyb-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://codeberg.org/sox_ng/libdolbyb/releases/download/${P}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0/3" # SHLIB in configure.ac
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="media-libs/libsndfile"
 RDEPEND="${DEPEND}"
diff --git a/media-libs/libffado/libffado-2.5.0_p5.ebuild b/media-libs/libffado/libffado-2.5.0_p5.ebuild
index 5eadfed95196..9ac2e8568d78 100644
--- a/media-libs/libffado/libffado-2.5.0_p5.ebuild
+++ b/media-libs/libffado/libffado-2.5.0_p5.ebuild
@@ -16,7 +16,7 @@ else
 		https://ffado.org/files/${PN}-${PV%_p*}.tgz
 		mirror://debian/pool/main/libf/libffado/${PN}_${PV/_p/-}.debian.tar.xz
 	"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${PV%_p*}"
 fi
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index dad2833db882..f1f551a233a6 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,6 +4,7 @@ DIST opencv-4.11.0.tar.gz 95051012 BLAKE2B a4195007513d82666f785b58bccce69158f81
 DIST opencv-4.12.0-eigen5.patch 1245 BLAKE2B 5fba4e8abbc8be8f7792eac0bd8d36ced1ca20df3f4110e44b12edfeae91a7e3e6a5b6c3f5bd1a1675cc1348cf5244fea1bea5cf3549ef7586535998f6a0f9e0 SHA512 5d7782bc167206c24e7ecbd7005a3946e03ebc435000cf0628275082e060f5753837236934c96fb1c92ca363a7e089b2f111ed62ee32a61fd63dc5ea5ec3b23d
 DIST opencv-4.12.0-fix_videowriter_raw_return_code.patch 2463 BLAKE2B b311456194b4b575322586b782c4df409ad4cb57fbc86924759f24d3de878d2db40c80c5c458d00b82d4fab45fc5c976a5ffef2439acbbf1dcdc4651cd3d268d SHA512 e35794321c9f7c7295f17d3960f6678bb97c64716985e4b1a2b4e8511a92c03afc0430db2b65872442b6e695db3025061e954648cbda20c7122c1216c12ab19c
 DIST opencv-4.12.0.tar.gz 95254890 BLAKE2B 26a5258e0ef3fb37f0d5a67cc329a14e204080a636b94a8c9dd5cbd7e5e623528726af023f5aaf85fe8da952040f1f08593ac8093b9531c273eea47eb631e12c SHA512 8ac63ddd61e22cc0eaeafee4f30ae6e1cab05fc4929e2cea29070203b9ca8dfead12cc0fd7c4a87b65c1e20ec6b9ab4865a1b83fad33d114fc0708fdf107c51b
+DIST opencv-4.14.0.tar.gz 96287941 BLAKE2B c4348246490752ffbe462a5c990fcfcfd2ef70f48fd81a9affa5df1a1f66450687ab9ed4f1ca4656e71c8f037f084029c62499296709d65512f420ecbaea4516 SHA512 4f1e606cd24f74b49227a32bd1558882d3b01dbbadca8b49a0e07dd9fc6291b4c584d7f2c3951409758c3128dc53d38d84c4c7642c7a6f6a054a5eb9d5c6f91e
 DIST opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 BLAKE2B 9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169e2222f6 SHA512 8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3
 DIST opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 BLAKE2B 923dc944edfda4c292d42207290bee414bfe21998f6ffe341ea3b38b6f2f581f3a243653e2c1fd3fa86084068ad6e7acd5ca73ab43094aa15f124d379833a5d8 SHA512 68cce870da0846cbd12a093ec7896b510e34590dad2b91699be1df5d4f72d343f9789d54c45c1b801784f7e57e0e80b19ba65dd99855225da99b4193dae97aaa
 DIST opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz 920403 BLAKE2B 5f834e8ccef9d88d0650f8ae5d215a2d07d0a356aaad4de1622068e0b2a7def88fccc84bc4397f0182732e836fcd6e363ae25a2cdeaa4d458a7d8ef9afc81da5 SHA512 5611b9db40477759213ab35320570c198f1f224f92ca801ca3accd1f7620faf3d44f306e44abefd10be118acee9b56da643ca82abaa7c4d2102fe92e5b298a6e
@@ -12,6 +13,8 @@ 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.11.0.tar.gz 55450097 BLAKE2B bcfa10a4cceb7990ff695593f7f1ba8a9eefd6530beab6b8d04a14fcb7f2612e6e9c5ac9f654f685337935a434d38c844b16c7f540b31acaf9c4fe639ae678a1 SHA512 a5ebb6810a3b5e40858b7fd533f9eb7b3d475dfda843a489bc5168e72c5eaad0a7a23629aace1f43e1b62d9c24e5e1923d841059c297728fac464e00759886c2
 DIST opencv_contrib-4.12.0.tar.gz 55475555 BLAKE2B 12ae7cc8b8e08b39cbc41ec48f078cd3546b868747cde7237bbfa5b60b2a8dff422352361d2d11d6569c065f979b0f2e8287d6f0a905241269bb01ab5a90fe44 SHA512 574121ca57328671741413df91fbf600cc04bb9a9beeacfb7bc20c15b2b4e8c9e031df30aafbcc34f82d85edfb098e5d008a744f4e6d833d6e47537a042045c6
+DIST opencv_contrib-4.14.0.tar.gz 55515587 BLAKE2B 36554839da9123cbae32837855beac7472eb16d5fc0134e3b81f6562d8c5c90fd7a6225ea11ad1443f5312a0a1e7ff45c755d974f95e51a946a74d1889daf372 SHA512 7fa7ecaacc2ef4e8634f0e4558dae94fed862cdf7c6a3ab1724598a9b9a33a39d73f587b0bcd377201c0f96ebaf6708c884dc33afbcaa2cd95d376b9d62eaead
 DIST opencv_extra-4.11.0.tar.gz 505587850 BLAKE2B 797de07ba1a6f1c2a772c8f72bb4fe21af5450bb9af5b2596163ccfc56f9bea0bb89fe88105278ef6ee1bbabe0896d36809521ed9125c84ff21157ed7d72462b SHA512 512afd1489fc224fcaffe4f91da2814e04163c83c17afcd42bd12ddc3b14470b10c24bd0e0f61a94537afb68158c1dffa00fd1d459c83fa11f52f02c681def06
 DIST opencv_extra-4.12.0.tar.gz 505622881 BLAKE2B 4090d64d1d6741c544af166da1f75b68df1fa4767e7360c9591c7a0623fc237cd5ca71a0ca954fd807228270ba51a44b1f16d742f18d6617494ef20fd989ec8d SHA512 aa6e4d3a4968004277ad4cfd69ae93457851d5ea06a5d582e40a16c9f83747f5c73feecfc4320d2c2c0fdff782a1ba30c3dddf98c37c3776c66e482ccac8d47b
+DIST opencv_extra-4.14.0.tar.gz 507167516 BLAKE2B e8d8beb0d1972736df5e9fc96e5179156d46402cfc81f2d61c823f83abd51d5d56d07e03a4512c6e07b28a32df84124af098cc134b39f3995b329ab4820bf432 SHA512 0847468059fe7aa7b32a28b3333a2ccf2f2395fede74a366f6a04b286423dd999869982625a7b055f6a8bcad515426464c37e24e959d211b90646ed787fba529
 DIST yunet-202303.onnx 232589 BLAKE2B 1cd8eac1a254b35697f3b4c7d3d35ec8ed0ca2fc3ed39bc391e06713c039602141122858d4c29cf42f54994af967a22d470d39a547657b7c61f58db3733c9b7e SHA512 ffeec1ba6e45ad63bc10ad2e6d8af5d5a9b816ac1b0606e62f0d06fec611f1bfa23daea07cfd3934fad958ddb5de3042950103ea3066ce61d0a563f47cd4b2d9
diff --git a/media-libs/opencv/files/opencv-4.14.0-openjpeg-version.patch b/media-libs/opencv/files/opencv-4.14.0-openjpeg-version.patch
new file mode 100644
index 000000000000..5e3ba63a7604
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.14.0-openjpeg-version.patch
@@ -0,0 +1,20 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+
+fix openjpeg version string
+
+OPENJPEG_VERSION is only set for the bundled copy; the system one exports the
+three components separately.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a9321d0..c038e82 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1609,7 +1609,7 @@ endif()
+ 
+ if(HAVE_OPENJPEG)
+   status("    JPEG 2000:" OpenJPEG_FOUND
+-      THEN "OpenJPEG (ver ${OPENJPEG_VERSION})"
++      THEN "OpenJPEG (ver ${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION})"
+       ELSE "build (ver ${OPENJPEG_VERSION})"
+   )
+ elseif(HAVE_JASPER)
diff --git a/media-libs/opencv/files/opencv-4.14.0-use-system-flatbuffers.patch b/media-libs/opencv/files/opencv-4.14.0-use-system-flatbuffers.patch
new file mode 100644
index 000000000000..18dafead8391
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.14.0-use-system-flatbuffers.patch
@@ -0,0 +1,43 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+
+Find the system flatbuffers and allow for newer revisions.
+
+The generated schema pins the exact version of the bundled flatbuffers, which
+never matches whatever dev-libs/flatbuffers happens to be installed. Upstream
+guarantees wire and API compatibility within a major version, so only assert
+that.
+
+diff --git a/cmake/OpenCVDetectFlatbuffers.cmake b/cmake/OpenCVDetectFlatbuffers.cmake
+index b94f2d3..dbfa532 100644
+--- a/cmake/OpenCVDetectFlatbuffers.cmake
++++ b/cmake/OpenCVDetectFlatbuffers.cmake
+@@ -1,12 +1,6 @@
+ if(WITH_FLATBUFFERS)
+-  set(HAVE_FLATBUFFERS 1)
+-  set(flatbuffers_VERSION "25.9.23")
+-  ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
+-  ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1")
+-  set(CUSTOM_STATUS_flatbuffers "    Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})")
+-endif()
+-
+-if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS)
++  find_package(flatbuffers REQUIRED)
++  set(HAVE_FLATBUFFERS "${flatbuffers_FOUND}")
+   list(APPEND CUSTOM_STATUS flatbuffers)
+ 
+   if(HAVE_FLATBUFFERS)
+diff --git a/modules/dnn/misc/tflite/schema_generated.h b/modules/dnn/misc/tflite/schema_generated.h
+index b1e333c..4e4f568 100644
+--- a/modules/dnn/misc/tflite/schema_generated.h
++++ b/modules/dnn/misc/tflite/schema_generated.h
+@@ -8,9 +8,7 @@
+ 
+ // Ensure the included flatbuffers.h is the same version as when this file was
+ // generated, otherwise it may not be compatible.
+-static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
+-              FLATBUFFERS_VERSION_MINOR == 9 &&
+-              FLATBUFFERS_VERSION_REVISION == 23,
++static_assert(FLATBUFFERS_VERSION_MAJOR == 25,
+              "Non-compatible flatbuffers version included");
+ 
+ namespace opencv_tflite {
diff --git a/media-libs/opencv/opencv-4.14.0.ebuild b/media-libs/opencv/opencv-4.14.0.ebuild
new file mode 100644
index 000000000000..cadda08639a2
--- /dev/null
+++ b/media-libs/opencv/opencv-4.14.0.ebuild
@@ -0,0 +1,1667 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit flag-o-matic multilib multiprocessing toolchain-funcs
+inherit cuda java-pkg-opt-2 cmake-multilib python-r1 virtualx xdg-utils
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	if [[ ${PV} = 4.9999* ]]; then
+		EGIT_BRANCH="4.x"
+	elif [[ ${PV} = 5.9999* ]]; then
+		EGIT_BRANCH="5.x"
+	fi
+	NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca"
+	# branch v0.1.2e
+	ADE_PV="0.1.2e"
+	ADE_MD5="e36774fc32e99463462f5b882f5d572d"
+else
+	# branch v0.1.2e
+	ADE_PV="0.1.2e"
+	# branch wechat_qrcode_20210119
+	QRCODE_COMMIT="a8b69ccc738421293254aec5ddb38bd523503252"
+	# branch dnn_samples_face_detector_20170830
+	DNN_SAMPLES_FACE_DETECTOR_COMMIT="b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f"
+	# branch contrib_xfeatures2d_boostdesc_20161012
+	XFEATURES2D_BOOSTDESC_COMMIT="34e4206aef44d50e6bbcd0ab06354b52e7466d26"
+	# branch contrib_xfeatures2d_vgg_20160317
+	XFEATURES2D_VGG_COMMIT="fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+	# branch contrib_face_alignment_20170818
+	FACE_ALIGNMENT_COMMIT="8afa57abc8229d611c4937165d20e2a2d9fc5a12"
+	# branch nvof_2_0_bsd
+	NVIDIA_OPTICAL_FLOW_COMMIT="edb50da3cf849840d680249aa6dbef248ebce2ca"
+
+	SRC_URI="
+		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/opencv/ade/archive/v${ADE_PV}.tar.gz -> ade-${ADE_PV}.tar.gz
+		contrib? (
+			https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${PN}_contrib-${PV}.tar.gz
+			wechat-qrcode? (
+				https://github.com/${PN}/${PN}_3rdparty/archive/${QRCODE_COMMIT}.tar.gz -> ${PN}_3rdparty-${QRCODE_COMMIT}.tar.gz
+				https://github.com/${PN}/${PN}_3rdparty/archive/${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
+					-> ${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}.tar.gz
+			)
+			contribxfeatures2d? (
+				https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
+					-> ${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}.tar.gz
+				https://github.com/${PN}/${PN}_3rdparty/archive/${XFEATURES2D_VGG_COMMIT}.tar.gz
+					-> ${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}.tar.gz
+			)
+				https://github.com/${PN}/${PN}_3rdparty/archive/${FACE_ALIGNMENT_COMMIT}.tar.gz
+					-> ${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}.tar.gz
+			cuda? (
+				https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
+					-> NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz
+			)
+		)
+		test? (
+			https://github.com/${PN}/${PN}_extra/archive/refs/tags/${PV}.tar.gz -> ${PN}_extra-${PV}.tar.gz
+		)
+		contribdnn? (
+			https://github.com/ShiqiYu/libfacedetection.train/raw/02246e79b1e976c83d1e135a85e0628120c93769/onnx/yunet_s_640_640.onnx -> yunet-202303.onnx
+		)
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+
+# general options
+IUSE="debug doc +eigen gflags glog java non-free opencvapps python test testprograms"
+
+# modules
+IUSE+=" contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d examples features2d wechat-qrcode"
+# hardware
+IUSE+=" cuda cudnn opencl video_cards_intel"
+# video
+IUSE+=" +ffmpeg gphoto2 gstreamer ieee1394 openni openni2 xine vaapi v4l"
+# image
+IUSE+=" avif gdal gif jasper jpeg jpeg2k openexr png quirc spng tesseract tiff webp"
+# gui
+IUSE+=" gtk3 qt6 opengl truetype vtk vulkan wayland"
+# parallel
+IUSE+=" openmp tbb"
+# lapack options
+IUSE+=" atlas lapack mkl"
+
+# from cmake/OpenCVCompilerOptimizations.cmake
+# TODO make this only relevant for binhost
+CPU_FEATURES_MAP=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+
+	# cpu_flags_arm_fp:FP16
+
+	cpu_flags_arm_asimddp:NEON_DOTPROD
+	# cpu_flags_arm_neon_fp16:NEON_FP16
+	# cpu_flags_arm_neon_bf16:NEON_BF16
+
+	# cpu_flags_loong_lsx:LSX
+	# cpu_flags_loong_lasx:LASX
+
+	# cpu_flags_mips_msa:MSA
+
+	cpu_flags_ppc_vsx:VSX   # (always available on Power8)
+	cpu_flags_ppc_vsx3:VSX3 # (always available on Power9)
+
+	# cpu_flags_riscv_rvv:RVV
+
+	cpu_flags_x86_sse:SSE   # (always available on 64-bit CPUs)
+	cpu_flags_x86_sse2:SSE2 # (always available on 64-bit CPUs)
+
+	cpu_flags_x86_sse3:SSE3
+	cpu_flags_x86_ssse3:SSSE3
+
+	cpu_flags_x86_sse4_1:SSE4_1
+	cpu_flags_x86_popcnt:POPCNT
+	cpu_flags_x86_sse4_2:SSE4_2
+
+	cpu_flags_x86_f16c:FP16
+	cpu_flags_x86_fma3:FMA3
+	cpu_flags_x86_avx:AVX
+	cpu_flags_x86_avx2:AVX2
+	cpu_flags_x86_avx512_bitalg:AVX_512BITALG
+	cpu_flags_x86_avx512_vbmi2:AVX_512VBMI2
+	cpu_flags_x86_avx512_vnni:AVX_512VNNI
+	cpu_flags_x86_avx512_vpopcntdq:AVX_512VPOPCNTDQ
+	cpu_flags_x86_avx512bw:AVX_512BW
+	cpu_flags_x86_avx512cd:AVX_512CD
+	cpu_flags_x86_avx512dq:AVX_512DQ
+	cpu_flags_x86_avx512f:AVX_512F
+	cpu_flags_x86_avx512ifma:AVX_512IFMA
+	cpu_flags_x86_avx512vbmi:AVX_512VBMI
+	cpu_flags_x86_avx512vl:AVX_512VL
+
+	# AVX512_KNL_EXTRA
+	cpu_flags_x86_avx512er:AVX_512ER
+	cpu_flags_x86_avx512pf:AVX_512PF
+	# AVX512_KNM_EXTRA
+	cpu_flags_x86_avx512_4fmaps:AVX_5124FMAPS
+	cpu_flags_x86_avx512_4vnniw:AVX_5124VNNIW
+
+)
+IUSE+=" ${CPU_FEATURES_MAP[*]%:*}"
+
+REQUIRED_USE="
+	amd64? (
+		cpu_flags_x86_sse
+		cpu_flags_x86_sse2
+		cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+		cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+		cpu_flags_x86_avx512er? ( cpu_flags_x86_avx512pf )
+		cpu_flags_x86_avx512pf? ( cpu_flags_x86_avx512er )
+		cpu_flags_x86_avx512_4fmaps? ( cpu_flags_x86_avx512_4fmaps )
+		cpu_flags_x86_avx512_4vnniw? ( cpu_flags_x86_avx512_4vnniw )
+	)
+	atlas? ( lapack )
+	cuda? (
+		contrib
+	)
+	cudnn? ( cuda )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt6 )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib )
+	jasper? ( !abi_x86_32 )
+	java? ( python )
+	mkl? ( lapack )
+	opengl? ( || ( gtk3 qt6 wayland ) )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	testprograms? ( test )
+	test? ( || ( ffmpeg gstreamer ) jpeg png tiff features2d )
+	wayland? ( !vtk )
+	wechat-qrcode? ( contribdnn )
+"
+# 	?? ( gtk3 qt6 wayland )
+
+RESTRICT="!test? ( test )"
+
+# NOTE
+# dev-libs/flatbuffers is header only, but we still want to rebuild on sub-slot changes
+COMMON_DEPEND="
+	dev-libs/protobuf:=[protoc(+),protobuf(+),${MULTILIB_USEDEP}]
+	virtual/zlib:=[${MULTILIB_USEDEP}]
+	avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	cudnn? (
+		dev-cpp/abseil-cpp:=
+		dev-libs/cudnn:=
+	)
+	contribdnn? (
+		dev-cpp/abseil-cpp:=
+		dev-libs/flatbuffers:=
+	)
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( >=dev-games/ogre-1.12:= )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( >=media-libs/libjpeg-turbo-3.1.0:=[${MULTILIB_USEDEP}] )
+	jpeg2k? (
+		jasper? ( media-libs/jasper:= )
+		!jasper? ( >=media-libs/openjpeg-2.5.3:2=[${MULTILIB_USEDEP}] )
+	)
+	lapack? (
+		atlas? ( sci-libs/atlas )
+		mkl? (
+			sci-libs/mkl[tbb?]
+			openmp? ( sci-libs/mkl[gnu-openmp] )
+		)
+		!atlas? (
+			!mkl? (
+				virtual/cblas
+				>=virtual/lapack-3.10
+				virtual/lapacke
+			)
+		)
+	)
+	opencl? (
+		virtual/opencl[${MULTILIB_USEDEP}]
+		dev-util/opencl-headers
+	)
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	openni? (
+		dev-libs/OpenNI
+	)
+	openni2? (
+		dev-libs/OpenNI2
+	)
+	png? (
+		!spng? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+		spng? ( media-libs/libspng )
+	)
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy:=[${PYTHON_USEDEP}]
+	)
+	qt6? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,widgets,concurrent,opengl?]
+	)
+	quirc? ( media-libs/quirc:=[${MULTILIB_USEDEP}] )
+	tbb? ( >=dev-cpp/tbb-2022.1.0:=[${MULTILIB_USEDEP}] )
+	tesseract? ( app-text/tesseract[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? (
+		sci-libs/vtk:=[rendering,cuda=]
+		|| (
+			(
+				sci-libs/vtk[opencascade(+)]
+				sci-libs/opencascade[-ffmpeg(-)]
+			)
+			sci-libs/vtk[-opencascade(-)]
+		)
+	)
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )
+	vulkan? (
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.13
+		dev-util/wayland-scanner
+	)
+"
+GST_TEST_DEPEND="
+	media-plugins/gst-plugins-aom[${MULTILIB_USEDEP}]
+	media-plugins/gst-plugins-mpeg2enc[${MULTILIB_USEDEP}]
+	media-plugins/gst-plugins-openh264[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
+	java? ( >=virtual/jdk-1.8:* )
+	test? (
+		wayland? ( gui-wm/tinywl )
+		gstreamer? (
+			amd64? ( ${GST_TEST_DEPEND} )
+			arm64? ( ${GST_TEST_DEPEND} )
+			x86? ( ${GST_TEST_DEPEND} )
+			arm? ( media-plugins/gst-plugins-openh264[${MULTILIB_USEDEP}] )
+			media-plugins/gst-plugins-jpeg[${MULTILIB_USEDEP}]
+			media-plugins/gst-plugins-libav[${MULTILIB_USEDEP}]
+			media-plugins/gst-plugins-mpeg2dec[${MULTILIB_USEDEP}]
+			media-plugins/gst-plugins-mpg123[${MULTILIB_USEDEP}]
+			media-plugins/gst-plugins-x264[${MULTILIB_USEDEP}]
+			!elibc_musl? ( !ppc? ( !ppc64? (
+				media-plugins/gst-plugins-vpx[${MULTILIB_USEDEP}]
+			) ) )
+		)
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+unset COMMON_DEPEND
+
+BDEPEND="
+	dev-util/patchelf
+	virtual/pkgconfig
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	doc? (
+		app-text/doxygen[dot]
+		python? (
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		)
+	)
+	java? ( >=dev-java/ant-1.10.14-r3 )
+	test? (
+		!arm? (
+			ffmpeg? (
+				media-fonts/wqy-microhei
+			)
+			gstreamer? (
+				media-fonts/wqy-microhei
+			)
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
+	"${FILESDIR}/${PN}-4.1.2-opencl-license.patch"
+	"${FILESDIR}/${PN}-4.4.0-disable-native-cpuflag-detect.patch"
+
+	"${FILESDIR}/${PN}-4.8.1-use-system-opencl.patch"
+
+	"${FILESDIR}/${PN}-4.9.0-drop-python2-detection.patch"
+
+	"${FILESDIR}/${PN}-4.10.0-dnn-explicitly-include-abseil-cpp.patch"
+	"${FILESDIR}/${PN}-4.10.0-tbb-detection.patch"
+
+	"${FILESDIR}/${PN}-4.11.0-ade-0.1.2e.tar.gz.patch"
+	"${FILESDIR}/${PN}-4.11.0-cmake-CMP0177.patch"
+
+	"${FILESDIR}/${PN}-4.12.0-cmake-4.patch"
+
+	"${FILESDIR}/${PN}-4.14.0-use-system-flatbuffers.patch"
+	"${FILESDIR}/${PN}-4.14.0-openjpeg-version.patch"
+
+	# TODO applied in src_prepare
+	# "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
+
+	# "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
+)
+
+cuda_get_host_compiler() {
+	if [[ -v NVCC_CCBIN ]]; then
+		echo "${NVCC_CCBIN}"
+		return
+	fi
+
+	if [[ -v CUDAHOSTCXX ]]; then
+		echo "${CUDAHOSTCXX}"
+		return
+	fi
+
+	einfo "Trying to find working CUDA host compiler"
+
+	if ! tc-is-gcc && ! tc-is-clang; then
+		die "$(tc-get-compiler-type) compiler is not supported"
+	fi
+
+	# compiler with CHOST prefix
+	# x86_64-pc-linux-gnu-g++
+	local compiler
+
+	# gcc or clang
+	local compiler_type
+
+	# major version of the current compiler. 15
+	local compiler_version
+
+	# cat/pkg of the compiler
+	# sys-devel/gcc, llvm-core/clang
+	local package
+
+	# QPN of the package we are checking
+	# sys-devel/gcc, <sys-devel/gcc-15
+	local package_version
+
+	# system compiler e.g. tc-getCXX plus version
+	# used to skip rechecking, as we check NVCC_CCBIN first
+	# x86_64-pc-linux-gnu-g++-15
+	local NVCC_CCBIN_default
+
+	compiler_type="$(tc-get-compiler-type)"
+	compiler_version="$("${compiler_type}-major-version")"
+
+	# try the default compiler first
+	NVCC_CCBIN="$(tc-getCXX)"
+	NVCC_CCBIN_default="${NVCC_CCBIN}-${compiler_version}"
+
+	compiler="${NVCC_CCBIN/%-${compiler_version}}"
+
+	# store the package so we can re-use it later
+	if tc-is-gcc; then
+		package="sys-devel/${compiler_type}"
+	elif tc-is-clang; then
+		package="llvm-core/${compiler_type}"
+	else
+		die "$(tc-get-compiler-type) compiler is not supported"
+	fi
+
+	package_version="${package}"
+
+	ebegin "testing ${NVCC_CCBIN_default} (default)"
+
+	while ! \
+		nvcc "${NVCCFLAGS}" \
+			-x cu \
+			-ccbin "${NVCC_CCBIN}" \
+			- \
+			<<<"int main(){}" \
+			&>> "${T}/cuda_get_host_compiler.log" ;
+		do
+		eend 1
+
+		while true; do
+			# prepare next version
+			local package_version_next
+			package_version_next="$(best_version "${package_version}")"
+
+			if [[ -z "${package_version_next}" ]]; then
+				eerror "Compiler lookup failed. Nothing installed matches: ${package_version}."
+				eerror "You can use NVCC_CCBIN to specify the exact compiler to use."
+				eerror "Check ${T}/cuda_get_host_compiler.log for details."
+				die "Could not find a supported version of ${compiler}. Did not find \"${package_version}\". NVCC_CCBIN is unset."
+			fi
+
+			package_version="<${package_version_next}"
+
+			NVCC_CCBIN="${compiler}-$(ver_cut 1 "${package_version/#<${package}-/}")"
+
+			# skip the next version equals the already checked system default
+			[[ "${NVCC_CCBIN}" != "${NVCC_CCBIN_default}" ]] && break
+		done
+		ebegin "testing ${NVCC_CCBIN}"
+	done
+	eend $?
+
+	echo "${NVCC_CCBIN}"
+	export NVCC_CCBIN
+}
+
+cuda_get_host_native_arch() {
+	if [[ -v CUDAARCHS ]]; then
+		echo "${CUDAARCHS}"
+		return
+	fi
+
+	# TODO nvptx-arch ?
+	__nvcc_device_query || die "failed to query the native device"
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use cuda && [[ -z "${CUDA_GENERATION}" ]] && [[ -z "${CUDA_ARCH_BIN}" ]]; then # TODO CUDAARCHS
+		einfo "The target CUDA architecture can be set via one of:"
+		einfo "  - CUDA_GENERATION set to one of Maxwell, Pascal, Volta, Turing, Ampere, Lovelace, Hopper, Auto"
+		einfo "  - CUDA_ARCH_BIN, (and optionally CUDA_ARCH_PTX) in the form of x.y tuples."
+		einfo "      You can specify multiple tuple separated by \";\"."
+		einfo ""
+		einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
+	fi
+
+	# When building binpkgs you probably want to include all targets
+	# TODO CUDAARCHS
+	if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -v CUDA_GENERATION || -v 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
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	use java && java-pkg-opt-2_pkg_setup
+
+	if use cuda && [[ ! -e /dev/nvidia-uvm ]]; then
+		# NOTE We try to load nvidia-uvm and nvidia-modeset here,
+		# so __nvcc_device_query does not fail later.
+
+		nvidia-smi -L &> /dev/null || true
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_fetch
+		git-r3_checkout
+
+		if use contrib; then
+			git-r3_fetch "https://github.com/${PN}/${PN}_contrib"
+			git-r3_checkout "https://github.com/${PN}/${PN}_contrib" "${WORKDIR}/${PN}_contrib-${PV}"
+		fi
+
+		if use test; then
+			git-r3_fetch "https://github.com/${PN}/${PN}_extra"
+			git-r3_checkout "https://github.com/${PN}/${PN}_extra" "${WORKDIR}/${PN}_extra-${PV}"
+		fi
+	else
+		default
+	fi
+
+	# remove bundled stuff
+	local files_3rdparty=(
+		# cpufeatures
+		# fastcv
+		ffmpeg
+		# flatbuffers
+		include/{opencl,vulkan}
+		# ippicv
+		# ittnotify
+		libjasper
+		libjpeg
+		libjpeg-turbo
+		libpng
+		libspng
+		libtiff
+		# libtim-vx
+		libwebp
+		openexr
+		openjpeg
+		# orbbecsdk
+		protobuf
+		quirc
+		tbb
+		zlib
+		zlib-ng
+	)
+
+	local file
+	for file in "${files_3rdparty[@]}"; do
+		rm -r "${S}/3rdparty/${file}" || die "Removing 3rd party components (${file}) failed"
+
+		sed -e "\_add\_subdirectory(.*3rdparty/${file})_d" \
+			-i "${S}/CMakeLists.txt" "${S}/cmake"/*cmake || die
+	done
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e 's:truetype/wqy:wqy-microhei:g' \
+		-i \
+			modules/gapi/test/render/gapi_render_tests_ocv.cpp \
+			modules/gapi/test/render/ftp_render_test.cpp \
+		|| die
+
+	sed \
+		-e '/find_package(OpenMP/s/)/ COMPONENTS C CXX)/g' \
+		-i \
+			cmake/OpenCVFindFrameworks.cmake \
+		|| die
+
+	if use contrib; then
+		pushd "${WORKDIR}/${PN}_contrib-${PV}" >/dev/null || die
+		eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
+		eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
+		[[ -n "${PATCHES_CONTRIB_USER[*]}" ]] && eapply "${PATCHES_CONTRIB_USER[@]}"
+		popd >/dev/null || die
+
+		! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; }
+		! use contribfreetype && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/freetype" || die; }
+		! use contribhdf && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/hdf" || die; }
+		! use contribovis && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/ovis" || die; }
+		! use contribsfm && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/sfm" || die; }
+		! use contribxfeatures2d && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/xfeatures2d" || die; }
+	fi
+
+	mkdir -p "${S}/.cache/ade" || die
+	cp \
+		"${DISTDIR}/ade-${ADE_PV}.tar.gz" \
+		"${S}/.cache/ade/$(md5sum "${DISTDIR}/ade-${ADE_PV}.tar.gz" | cut -f 1 -d " ")-v${ADE_PV}.tar.gz" || die
+
+	if [[ ${PV} = *9999* ]] ; then
+		sed \
+			-e "/ade_filename/s/\.zip/.tar.gz/" \
+			-e "/set(ade_md5/s/\".*\"/\"${ADE_MD5}\"/g" \
+			-i "${S}/modules/gapi/cmake/DownloadADE.cmake" || die
+	fi
+
+	if use wechat-qrcode; then
+		mkdir -p "${S}/.cache/wechat_qrcode" || die
+		for file in "detect.caffemodel" "detect.prototxt" "sr.prototxt" "sr.caffemodel"; do
+			mv \
+				"${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" \
+				"${S}/.cache/wechat_qrcode/$( \
+					md5sum "${WORKDIR}/${PN}_3rdparty-${QRCODE_COMMIT}/${file}" | cut -f 1 -d " " \
+				)-${file}" || die
+		done
+
+		mv \
+			"${WORKDIR}/${PN}_3rdparty-${DNN_SAMPLES_FACE_DETECTOR_COMMIT}/res10_300x300_ssd_iter_140000.caffemodel" \
+			"${S}/samples/dnn/" || die
+	fi
+
+	if use contribxfeatures2d; then
+		cp \
+			"${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i \
+			"${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		mkdir -p "${S}/.cache/xfeatures2d/boostdesc" || die
+		for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/"*.i; do
+			mv \
+				"${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" \
+				"${S}/.cache/xfeatures2d/boostdesc/$( \
+					md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_BOOSTDESC_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
+				)-$(basename "${file}")" || die
+		done
+
+		cp \
+			"${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i \
+			"${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		mkdir -p "${S}/.cache/xfeatures2d/vgg" || die
+		for file in "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/"*.i; do
+			mv \
+				"${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" \
+				"${S}/.cache/xfeatures2d/vgg/$( \
+					md5sum "${WORKDIR}/${PN}_3rdparty-${XFEATURES2D_VGG_COMMIT}/$(basename "${file}")" | cut -f 1 -d " " \
+				)-$(basename "${file}")" || die
+		done
+	fi
+
+	if use contribdnn; then
+		mkdir -p "${S}/.cache/data" || die
+		mkdir -p "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/face/" || die
+		file="face_landmark_model.dat"
+		cp \
+			"${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
+			"${WORKDIR}/${PN}_extra-${PV}/testdata/cv/face/" \
+			|| die
+		mv \
+			"${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" \
+			"${S}/.cache/data/$( \
+				md5sum "${WORKDIR}/${PN}_3rdparty-${FACE_ALIGNMENT_COMMIT}/${file}" | cut -f 1 -d " " \
+			)-${file}" || die
+
+		mkdir -p "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/dnn/onnx/models/" || die
+		cp "${DISTDIR}/yunet-202303.onnx" "${WORKDIR}/${PN}_extra-${PV}/testdata/cv/dnn/onnx/models/" || die
+	fi
+
+	if use cuda; then
+		mkdir -p "${S}/.cache/nvidia_optical_flow"
+		cp \
+			"${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" \
+			"${S}/.cache/nvidia_optical_flow/$( \
+				md5sum "${DISTDIR}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" | cut -f 1 -d " " \
+			)-${NVIDIA_OPTICAL_FLOW_COMMIT}.tar.gz" || die
+	fi
+
+	if use java; then
+		java-pkg-opt-2_src_prepare
+
+		# set encoding so even this cmake build will pick it up.
+		ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+		ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)"
+		ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)"
+	fi
+
+	if multilib_native_use testprograms; then
+		sed \
+			-e 's:share/OpenCV/testdata:@OPENCV_TEST_DATA_INSTALL_PATH@:g' \
+			-i  "${S}/cmake/templates/opencv_run_all_tests_unix.sh.in" || die
+	fi
+}
+
+multilib_src_configure() {
+	# bug #919101 and https://github.com/opencv/opencv/issues/19020
+	filter-lto
+
+	append-cppflags "$(usex debug '-DDEBUG' '-DNDEBUG')"
+
+	# please don't sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+		-DMIN_VER_CMAKE=3.26
+
+		-DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # FindPythonInterp
+
+		# for protobuf
+		-DCMAKE_CXX_STANDARD=17
+
+	# Optional 3rd party components
+	# ===================================================
+		-DOPENCV_ENABLE_NONFREE="$(usex non-free)"
+		-DWITH_QUIRC="$(usex quirc)"
+		-DWITH_FLATBUFFERS="$(multilib_native_usex contribdnn)"
+		-DWITH_1394="$(usex ieee1394)"
+		# -DWITH_AVFOUNDATION="no" # IOS
+		-DWITH_VTK="$(multilib_native_usex vtk)"
+		-DWITH_EIGEN="$(usex eigen)"
+		-DWITH_VFW="no" # Video windows support
+		-DWITH_FFMPEG="$(usex ffmpeg)"
+		-DWITH_GSTREAMER="$(usex gstreamer)"
+		-DWITH_GTK="$(usex gtk3)"
+		-DWITH_GTK_2_X="no" # only want gtk3 nowadays
+		-DWITH_IMGCODEC_GIF="$(usex gif)"
+		-DWITH_IPP="no"
+		-DWITH_JULIA="no"
+		-DWITH_JASPER="$(usex jpeg2k "$(multilib_native_usex jasper)")"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_OPENJPEG="$(usex jpeg2k "$(multilib_native_usex !jasper)")"
+		-DWITH_WEBP="$(usex webp)"
+		-DWITH_OPENEXR="$(multilib_native_usex openexr)"
+		-DWITH_OPENVX="no"
+		-DWITH_OPENNI="$(multilib_native_usex openni)"
+		-DWITH_OPENNI2="$(multilib_native_usex openni2)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_SPNG="$(usex png "$(multilib_native_usex spng)")"
+		-DWITH_GDCM="no"
+		-DWITH_PVAPI="no"
+		-DWITH_GIGEAPI="no"
+		-DWITH_ARAVIS="no"
+		-DWITH_WIN32UI="no"              # Windows only
+		# -DWITH_QUICKTIME="no"
+		# -DWITH_QTKIT="no"
+		-DWITH_TBB="$(usex tbb)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_PTHREADS_PF="yes"
+		-DWITH_TIFF="$(usex tiff)"
+		-DWITH_UNICAP="no"               # Not packaged
+		-DWITH_V4L="$(usex v4l)"
+		-DWITH_LIBV4L="$(usex v4l)"
+		# -DWITH_DSHOW="yes"                 # direct show supp
+		-DWITH_MSMF="no"
+		-DWITH_XIMEA="no"        # Windows only
+		-DWITH_XINE="$(multilib_native_usex xine)"
+		-DWITH_CLP="no"
+		-DWITH_OPENCL="$(usex opencl)"
+		-DWITH_OPENCL_SVM="no" # "$(usex opencl)"
+		-DWITH_DIRECTX="no"
+		-DWITH_INTELPERC="no"
+		-DWITH_IPP_A="no"
+		-DWITH_MATLAB="no"
+		-DWITH_VA="$(usex vaapi)"
+		-DWITH_VA_INTEL="$(usex vaapi "$(usex video_cards_intel)")"
+		-DWITH_GDAL="$(multilib_native_usex gdal)"
+		-DWITH_GPHOTO2="$(usex gphoto2)"
+		-DWITH_LAPACK="$(multilib_native_usex lapack)"
+		-DWITH_ITT="no" # 3dparty libs itt_notify
+
+		-DWITH_AVIF="$(usex avif)"
+		-DWITH_FREETYPE="$(usex truetype)"
+		-DWITH_VULKAN="$(usex vulkan)"
+		-DWITH_WAYLAND="$(usex wayland)"
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit
+	# ===================================================
+		-DWITH_CUDA="$(multilib_native_usex cuda)"
+		-DWITH_CUBLAS="$(multilib_native_usex cuda)"
+		-DWITH_CUFFT="$(multilib_native_usex cuda)"
+		-DWITH_CUDNN="$(multilib_native_usex cudnn)"
+		# NOTE set this via MYCMAKEARGS if needed
+		-DWITH_NVCUVID="no" # TODO needs NVIDIA Video Codec SDK
+		-DWITH_NVCUVENC="no" # TODO needs NVIDIA Video Codec SDK
+		-DCUDA_NPP_LIBRARY_ROOT_DIR="$(usex cuda "${CUDA_PATH:-${ESYSROOT}/opt/cuda}" "")"
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_JAVA="$(multilib_native_usex java)" # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES="no"
+		-DBUILD_opencv_apps="$(usex opencvapps)"
+		-DBUILD_DOCS="$(usex doc)" # Doesn't install anyways.
+		-DBUILD_EXAMPLES="$(multilib_native_usex examples)"
+		-DBUILD_TESTS="$(multilib_native_usex test "yes" "$(multilib_native_usex testprograms)")"
+		-DBUILD_PERF_TESTS="no"
+
+		# -DBUILD_WITH_STATIC_CRT="no"
+		-DBUILD_WITH_DYNAMIC_IPP="no"
+		-DBUILD_FAT_JAVA_LIB="no"
+		# -DBUILD_ANDROID_SERVICE="no"
+		-DBUILD_CUDA_STUBS="$(multilib_native_usex cuda)"
+		-DOPENCV_EXTRA_MODULES_PATH="$(usex contrib "${WORKDIR}/${PN}_contrib-${PV}/modules" "")"
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB="no"
+		-DINSTALL_BIN_EXAMPLES="$(multilib_native_usex examples)"
+		-DINSTALL_C_EXAMPLES="$(multilib_native_usex examples)"
+		-DINSTALL_TESTS="$(multilib_native_usex testprograms)"
+		# -DINSTALL_ANDROID_EXAMPLES="no"
+		-DINSTALL_TO_MANGLED_PATHS="no"
+		-DOPENCV_GENERATE_PKGCONFIG="yes"
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE="no"
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DBUILD_USE_SYMLINKS="yes"
+		-DENABLE_PRECOMPILED_HEADERS="no"
+		-DENABLE_SOLUTION_FOLDERS="no"
+		-DENABLE_PROFILING="no"
+		-DENABLE_COVERAGE="no"
+		-DOPENCV_DOWNLOAD_TRIES_LIST="0"
+
+		-DHAVE_opencv_java="$(multilib_native_usex java)"
+
+		-DBUILD_WITH_DEBUG_INFO="$(usex debug)"
+		-DOPENCV_ENABLE_MEMORY_SANITIZER="$(usex debug)"
+		-DCV_TRACE="$(usex debug)"
+		-DENABLE_NOISY_WARNINGS="$(usex debug)"
+		-DOPENCV_WARNINGS_ARE_ERRORS="no"
+		-DENABLE_IMPL_COLLECTION="no"
+		-DENABLE_INSTRUMENTATION="no"
+		-DGENERATE_ABI_DESCRIPTOR="no"
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE="no"
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DWITH_PROTOBUF="yes"
+		-DBUILD_PROTOBUF="no"
+		-DPROTOBUF_UPDATE_FILES="yes"
+		-DProtobuf_MODULE_COMPATIBLE="yes"
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DOPENCV_DOC_INSTALL_PATH="share/doc/${PF}"
+		-DOPENCV_SAMPLES_BIN_INSTALL_PATH="libexec/${PN}/bin/samples"
+
+		-DBUILD_IPP_IW="no"
+		-DBUILD_ITT="no"
+
+	# ===================================================
+	# configure modules to be build
+	# ===================================================
+		-DBUILD_opencv_dnn="$(usex contribdnn)"
+		-DBUILD_opencv_gapi="$(usex ffmpeg yes "$(usex gstreamer)")"
+		-DBUILD_opencv_features2d="$(usex features2d)"
+		-DBUILD_opencv_java_bindings_generator="$(usex java)"
+		-DBUILD_opencv_wechat_qrcode="$(usex wechat-qrcode)"
+		-DBUILD_opencv_julia="no"
+		-DBUILD_opencv_js="no"
+		-DBUILD_opencv_js_bindings_generator="no"
+		-DBUILD_opencv_objc_bindings_generator="no"
+		-DBUILD_opencv_python2="no"
+		-DBUILD_opencv_ts="$(usex test)"
+		-DBUILD_opencv_video="$(usex ffmpeg yes "$(usex gstreamer)")"
+		-DBUILD_opencv_videoio="$(usex ffmpeg yes "$(usex gstreamer)")"
+
+		-DBUILD_opencv_cudalegacy="no"
+
+		# -DBUILD_opencv_world="yes"
+
+		-DOPENCV_PLUGIN_VERSION=".$(ver_rs 1-2 '' "$(ver_cut 1-2)")"
+		-DOPENCV_PLUGIN_ARCH=".${ARCH}"
+
+		-DDNN_PLUGIN_LIST="all"
+		-DHIGHGUI_ENABLE_PLUGINS="no"
+
+		-DOPENCV_SKIP_SAMPLES_SYCL="yes"
+	)
+
+	local VIDEOIO_PLUGIN_LIST=()
+	if use ffmpeg; then
+		VIDEOIO_PLUGIN_LIST+=("ffmpeg")
+	fi
+	if use gstreamer; then
+		VIDEOIO_PLUGIN_LIST+=("gstreamer")
+	fi
+
+	mycmakeargs+=(
+		-DVIDEOIO_PLUGIN_LIST="$(IFS=';'; echo "${VIDEOIO_PLUGIN_LIST[*]}")"
+	)
+
+	if [[ ${PV} != *9999* ]] ; then
+		mycmakeargs+=(
+			-DOPENCV_VCSVERSION="${PV}"
+			-DBUILD_INFO_SKIP_EXTRA_MODULES="yes"
+		)
+	fi
+
+	if use qt6; then
+		mycmakeargs+=(
+			-DWITH_QT="$(multilib_native_usex qt6)"
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_QT="no"
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5="yes"
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes"
+		)
+	fi
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	# TODO binhost https://github.com/opencv/opencv/wiki/CPU-optimizations-build-options
+
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			local value
+			# These are merged into one flag internally
+			if [[ ${ABI} == amd64 ]]; then
+				case "${i%:*}" in
+					cpu_flags_x86_avx512er|cpu_flags_x86_avx512pf)
+						value="AVX512_KNL_EXTRA"
+						;;
+					cpu_flags_x86_avx512_4fmaps|cpu_flags_x86_avx512_4vnniw)
+						value="AVX512_KNM_EXTRA"
+						;;
+					*)
+						value="${i#*:}"
+						;;
+				esac
+			else
+				value=${i#*:}
+			fi
+
+			use "${i%:*}" && CPU_BASELINE="${CPU_BASELINE}${value};"
+		fi
+	done
+	unset CPU_FEATURES_MAP
+
+	mycmakeargs+=(
+		-DCPU_BASELINE="${CPU_BASELINE}"
+	)
+	if [[ ${MERGE_TYPE} != "buildonly" ]]; then
+		mycmakeargs+=(
+			-DOPENCV_CPU_OPT_IMPLIES_IGNORE="yes"
+			-DCPU_DISPATCH=
+		)
+	fi
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	# NOTE
+	# we remove unused modules,
+	# so we shouldn't need to disable options for unused modules
+	if use contrib; then
+		mycmakeargs+=(
+			-DBUILD_opencv_cvv="$(usex contribcvv)"
+
+			-DBUILD_opencv_freetype="$(usex contribfreetype)"
+			-DBUILD_opencv_hdf="$(multilib_native_usex contribhdf)"
+			-DBUILD_opencv_ovis="$(usex contribovis)"
+			-DBUILD_opencv_sfm="$(usex contribsfm)"
+			-DBUILD_opencv_xfeatures2d="$(usex contribxfeatures2d)"
+			-DWITH_TESSERACT="$(multilib_native_usex tesseract)"
+		)
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	if multilib_native_use cuda; then
+		# Check if we can get the arch from the present gpu
+		if ! SANDBOX_WRITE=/dev/nvidiactl test -w /dev/nvidiactl; then
+
+			# Needs write access to /dev/nvidiactl.
+			# /dev/nvidiactl usually is 660 root:video .
+
+			# eqawarn "Can't access the GPU at /dev/nvidiactl."
+			# eqawarn "User $(id -nu) is not in the group \"video\"."
+
+			# export CUDAARCHS="all"
+			# build all targets
+			mycmakeargs+=(
+				# can't use "all" as that breaks openmp
+				# nvcc fatal   : Unsupported gpu architecture 'compute_all'
+				# -DCMAKE_CUDA_ARCHITECTURES="all"
+
+				# with openmp -> CUDA_ARCHITECTURES is empty for target "cmTC_0088f"
+				# -DCUDA_GENERATION="Auto" # requires access to GPU
+
+				# wrong arch....
+				# -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS:-50}" # breaks with openmp otherwise..
+
+				-DOpenMP_CUDA_FLAGS=""
+				-DOpenMP_CUDA_LIB_NAMES=""
+			)
+
+			local CUDA_DEVICE_ACCESS="false"
+
+			cuda_add_sandbox
+		else
+			cuda_add_sandbox -w
+		fi
+
+		addwrite "/proc/self/task"
+		addpredict "/dev/char/"
+
+		# order of preference CMAKE_CUDA_ARCHITECTURES > CUDA_GENERATION > CUDA_ARCH_BIN and/or CUDA_ARCH_PTX
+		# CMAKE_CUDA_ARCHITECTURES is set from the CUDAARCHS env var
+		if [[ -v CUDAARCHS ]]; then
+			# eqawarn "CUDAARCHS ${CUDAARCHS}"
+			mycmakeargs+=(
+				-DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
+			)
+		elif [[ -v CUDA_GENERATION ]]; then
+			# eqawarn "CUDA_GENERATION ${CUDA_GENERATION}"
+			mycmakeargs+=(
+				-DCUDA_GENERATION="${CUDA_GENERATION}"
+			)
+		elif [[ -v CUDA_ARCH_BIN ]]; then
+			# eqawarn "CUDA_ARCH_BIN ${CUDA_ARCH_BIN}"
+			mycmakeargs+=(
+				-DCUDA_ARCH_BIN="${CUDA_ARCH_BIN}"
+			)
+			if [[ -v CUDA_ARCH_PTX ]]; then
+				# eqawarn "CUDA_ARCH_PTX ${CUDA_ARCH_PTX}"
+				mycmakeargs+=(
+					-DCUDA_ARCH_PTX="${CUDA_ARCH_PTX}"
+				)
+			fi
+		else
+			# eqawarn "CUDA_DEVICE_ACCESS ${CUDA_DEVICE_ACCESS}"
+			if [[ "${CUDA_DEVICE_ACCESS}" == "false" ]]; then
+				mycmakeargs+=(
+					-DCUDA_GENERATION="Auto"
+				)
+			else
+				# eqawarn "detect"
+				: "${CUDAARCHS:="$(cuda_get_host_native_arch)"}"
+				export CUDAARCHS
+				mycmakeargs+=(
+					-DCUDA_GENERATION="${CUDAARCHS}"
+					-DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
+				)
+			fi
+		fi
+
+		local -x CUDAHOSTCXX CUDAHOSTLD
+		CUDAHOSTCXX="$(cuda_get_host_compiler)"
+		CUDAHOSTLD="$(tc-getCXX)"
+
+		if tc-is-gcc; then
+			# Filter out IMPLICIT_LINK_DIRECTORIES picked up by CMAKE_DETERMINE_COMPILER_ABI(CUDA)
+			# See /usr/share/cmake/Help/variable/CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES.rst
+			CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES_EXCLUDE=$(
+				"${CUDAHOSTLD}" -E -v - <<<"int main(){}" |& \
+				grep LIBRARY_PATH | cut -d '=' -f 2 | cut -d ':' -f 1
+			)
+		fi
+
+		mycmakeargs+=(
+			-DOPENCV_CMAKE_CUDA_DEBUG="$(usex debug 1 0)"
+			-DENABLE_CUDA_FIRST_CLASS_LANGUAGE="yes"
+		)
+	fi
+
+	if use contribdnn; then
+		mycmakeargs+=(
+			-DOPENCV_DNN_OPENCL="$(usex opencl)"
+			-DOPENCV_DNN_CUDA="$(multilib_native_usex cudnn)"
+		)
+	fi
+
+	if use ffmpeg; then
+		mycmakeargs+=(
+			-DOPENCV_GAPI_GSTREAMER="no"
+			-DOPENCV_FFMPEG_DISABLE_MEDIASDK="yes"
+		)
+	fi
+
+	# according to modules/java/jar/CMakeLists.txt:23-26
+	if use java; then
+		mycmakeargs+=(
+			-DOPENCV_JAVA_SOURCE_VERSION="$(java-pkg_get-source)"
+			-DOPENCV_JAVA_TARGET_VERSION="$(java-pkg_get-target)"
+		)
+	fi
+
+	if multilib_native_use lapack; then
+		if use mkl; then
+			mycmakeargs+=(
+				-DWITH_MKL="yes"
+				-DMKL_WITH_OPENMP="$(usex openmp)"
+				-DMKL_WITH_TBB="$(usex tbb)"
+			)
+		else
+			mycmakeargs+=(
+				-DSKIP_OPENBLAS_PACKAGE="yes"
+				-DOPENCV_LAPACK_DISABLE_MKL="yes"
+			)
+		fi
+	fi
+
+	if use gtk3 || use qt6 || use wayland; then
+		if use opengl; then
+			mycmakeargs+=(
+				-DWITH_OPENGL="yes"
+				-DOpenGL_GL_PREFERENCE="GLVND"
+			)
+		else
+			mycmakeargs+=(
+				-DWITH_OPENGL="no"
+			)
+		fi
+	fi
+
+	# NOTE set this via MYCMAKEARGS if needed
+	if use opencl; then
+		mycmakeargs+=( -DOPENCL_INCLUDE_DIR="${ESYSROOT}/usr/include" )
+		if has_version sci-libs/clfft; then
+			mycmakeargs+=( -DWITH_OPENCLAMDFFT="yes" )
+		else
+			mycmakeargs+=( -DWITH_OPENCLAMDFFT="no" )
+		fi
+		if has_version sci-libs/clblas; then
+			mycmakeargs+=( -DWITH_OPENCLAMDBLAS="yes" )
+		else
+			mycmakeargs+=( -DWITH_OPENCLAMDBLAS="no" )
+		fi
+	else
+		mycmakeargs+=(
+			-DWITH_OPENCLAMDFFT="no"
+			-DWITH_OPENCLAMDBLAS="no"
+		)
+	fi
+
+	# NOTE due to multilib we can't do
+	# if multilib_native_use test; then
+	if use test; then
+		# opencv tests assume to be build in Release mode
+		local -x CMAKE_BUILD_TYPE="Release"
+		mycmakeargs+=(
+			-DOPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
+		)
+		if use vtk; then
+			mycmakeargs+=(
+				-DVTK_MPI_NUMPROCS="$(makeopts_jobs)" # TODO
+			)
+		fi
+	fi
+
+	if multilib_native_use testprograms; then
+		# NOTE do this so testprograms do not fail
+		mycmakeargs+=(
+			-DOPENCV_TEST_INSTALL_PATH="libexec/${PN}/bin/test"
+		)
+	fi
+
+	if use vulkan; then
+		mycmakeargs+=( -DVULKAN_INCLUDE_DIRS="${ESYSROOT}/usr/include" )
+	fi
+
+	if multilib_native_use python; then
+		# shellcheck disable=SC2329
+		python_configure() {
+			# Set all python variables to load the correct Gentoo paths
+			local mycmakeargs=(
+				"${mycmakeargs[@]}"
+				# python_setup alters PATH and sets this as wrapper
+				# to the correct interpreter we are building for
+				-DBUILD_opencv_python3="yes"
+				-DBUILD_opencv_python_bindings_generator="yes"
+				-DBUILD_opencv_python_tests="$(usex test)"
+				-DPYTHON_DEFAULT_EXECUTABLE="${EPYTHON}"
+				-DPYTHON_EXECUTABLE="${EPYTHON}" # check
+				-DINSTALL_PYTHON_EXAMPLES="$(usex examples)"
+				# -DPYTHON3_LIMITED_API="yes"
+			)
+			cmake_src_configure
+		}
+
+		python_foreach_impl python_configure
+	else
+		mycmakeargs+=(
+			-DOPENCV_PYTHON_SKIP_DETECTION="yes"
+			-DPYTHON_EXECUTABLE="no"
+			-DINSTALL_PYTHON_EXAMPLES="no"
+			-DBUILD_opencv_python3="no"
+			-DBUILD_opencv_python_bindings_generator="no"
+			-DBUILD_opencv_python_tests="no"
+		)
+		cmake_src_configure
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_native_use python; then
+		python_foreach_impl cmake_src_compile
+	else
+		cmake_src_compile
+	fi
+}
+
+# from firefox/thunderbird
+virtwl() {
+	debug-print-function "${FUNCNAME[*]}" "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME[*]} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME[*]} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read -r WAYLAND_DISPLAY <&"${VIRTWL[0]}"
+
+	debug-print "${FUNCNAME[*]}: $*"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return "${r}"
+}
+
+multilib_src_test() {
+	# no tests on ABI_X86_32
+	! multilib_is_native_abi && return
+
+	# NOTE we don't run the tests
+	use testprograms && return
+
+	declare -xA OPENCV_SKIP_TESTS
+
+	local -x OPENCV_SKIP_TESTS_core=(
+		'hal_intrin128.*32x4_CPP_EMULATOR'
+		'hal_intrin128.*64x2_CPP_EMULATOR'
+	)
+
+	local -x OPENCV_SKIP_TESTS_gapi=(
+		'AsyncAPICancelation/cancel/*.basic'
+	)
+
+	local -x OPENCV_SKIP_TESTS_videoio=(
+		'*mfx*'
+	)
+
+	local -x OPENCV_SKIP_TESTS_video=(
+		# needs dnn/gsoc2016-goturn/goturn.caffemodel
+		'GOTURN.accuracy'
+		# needs dnn/onnx/models/dasiamrpn_model.onnx
+		'DaSiamRPN.accuracy'
+		# needs dnn/onnx/models/nanotrack_backbone_sim.onnx
+		'NanoTrack.accuracy_NanoTrack_V1'
+		# needs dnn/onnx/models/nanotrack_backbone_sim_v2.onnx
+		'NanoTrack.accuracy_NanoTrack_V2'
+		# needs dnn/gsoc2016-goturn/goturn.caffemodel
+		'Tracking/DistanceAndOverlap.GOTURN*'
+	)
+
+	if ! use gtk3 && ! use qt6; then
+		# TODO Compositor doesn't have required interfaces in function 'init'
+		# && ! use wayland
+		# local -x OPENCV_SKIP_TESTS_highgui=(
+		# 	'Highgui_GUI.*'
+		# )
+		:
+	else
+		addpredict /dev/fuse
+	fi
+
+	if use wayland; then
+		if use gtk3 || use qt6; then
+			local -x OPENCV_SKIP_TESTS_highgui=(
+				'Highgui_GUI.regression'
+				'Highgui_GUI.small_width_image'
+			)
+		fi
+	fi
+
+	if multilib_native_use cuda; then
+		local -x OPENCV_SKIP_TESTS_cudaoptflow=(
+			'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
+			'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
+			'CUDA_OptFlow/NvidiaOpticalFlow_1_0.Regression/0'
+			'CUDA_OptFlow/NvidiaOpticalFlow_2_0.Regression/0'
+		)
+		if use opengl; then
+			local -x OPENCV_SKIP_TESTS_cudaarithm=(
+				'OpenGL/Buffer.MapDevice/*'
+				'OpenGL/*Gpu*'
+			)
+			# tinywl's headless backend leaves namedWindow(WINDOW_OPENGL)
+			# without a GL context, so every cv::ogl test dies on bufId_ != 0
+			use wayland && OPENCV_SKIP_TESTS_cudaarithm=( 'OpenGL/*' )
+		fi
+	fi
+
+	if use contribdnn; then
+		local -x OPENCV_SKIP_TESTS_dnn=(
+			'Test_ONNX_layers.LSTM_cell_forward/0'
+			'Test_ONNX_layers.LSTM_cell_bidirectional/0'
+			'Test_TensorFlow_layers.Convolution3D/1'
+			'Test_TensorFlow_layers.concat_3d/1'
+		)
+		local -x OPENCV_SKIP_TESTS_objdetect=(
+			# dnn/onnx/models/face_recognizer_fast.onnx
+			'Objdetect_face_recognition.regression'
+			'Objdetect_QRCode_Encode_Decode_Structured_Append.regression'
+		)
+		:
+	else
+		# dnn/onnx/models/yunet-202303.onnx
+		local -x OPENCV_SKIP_TESTS_objdetect=(
+			'Objdetect_face_detection.regression'
+			'Objdetect_face_recognition.regression'
+		)
+
+		OPENCV_SKIP_TESTS_video+=(
+			'vittrack.accuracy_vittrack'
+		)
+	fi
+
+	if use wechat-qrcode; then
+		local -x OPENCV_SKIP_TESTS_wechat_qrcode=(
+			# dnn/wechat_2021-01/detect.prototxt
+			'Objdetect_QRCode_points_position.rotate45'
+			'Objdetect_QRCode_Big.regression'
+			'Objdetect_QRCode_Tiny.regression'
+			'Objdetect_QRCode_Multi.regression/*'
+			'Objdetect_QRCode_Easy_Multi.regression/1'
+		)
+	fi
+
+	local -x OPENCV_SKIP_TESTS_imgproc=(
+		"Imgproc_ConnectedComponents.spaghetti_bbdt_sauf_stats"
+		"Imgproc_ConnectedComponents.chessboard_even"
+		"Imgproc_ConnectedComponents.chessboard_odd"
+		"Imgproc_ConnectedComponents.maxlabels_8conn_even"
+		"Imgproc_ConnectedComponents.maxlabels_8conn_odd"
+	)
+
+	local -x OPENCV_SKIP_TESTS_imgcodecs=(
+		"Imgcodecs_Png.ReadWriteWithExif"
+		"Imgcodecs_AVIF*"
+	)
+
+	if multilib_native_use cuda; then
+		if ! SANDBOX_WRITE=/dev/nvidiactl test -w /dev/nvidiactl ; then
+			eerror "Can't access the GPU at /dev/nvidiactl."
+			eerror "User $(id -nu) is not in the group \"video\"."
+			local -x TEST_CUDA="false"
+
+			local -x OPENCV_SKIP_TESTS_photo=( "CUDA_*" )
+			local -x OPENCV_SKIP_TESTS_stitching=( "CUDA_*" )
+			OPENCV_SKIP_TESTS_video+=( "CUDA_*" )
+		else
+			# local -x OPENCV_PARALLEL_BACKEND="threads"
+			local -x DNN_BACKEND_OPENCV="cuda"
+			cuda_add_sandbox -w
+			addwrite "/dev/dri/"
+			[[ -c /dev/udmabuf ]] && addwrite /dev/udmabuf
+		fi
+	fi
+
+	# shellcheck disable=SC2329
+	opencv_test() {
+		cd "${BUILD_DIR}" || die
+
+		# directories to search for _core_ plugins
+		local -x OPENCV_CORE_PLUGIN_PATH="${BUILD_DIR}/lib"
+		# directories to search for _dnn_ plugins
+		local -x OPENCV_DNN_PLUGIN_PATH="${BUILD_DIR}/lib"
+		# directories to search for _videoio_ plugins
+		local -x OPENCV_VIDEOIO_PLUGIN_PATH="${BUILD_DIR}/lib"
+		# # path to extra OpenVINO plugins
+		# local -x OPENCV_DNN_IE_EXTRA_PLUGIN_PATH="${BUILD_DIR}/lib"
+
+		local -x OPENCV_TEMP_PATH="${T%/}"
+
+		local -x OPENCV_TEST_DATA_PATH="${WORKDIR}/${PN}_extra-${PV}/testdata"
+
+		if use debug; then
+			local -x OPENCV_LOG_LEVEL=DEBUG
+		fi
+
+		local test_opts_base=(
+			--skip_unstable=1
+			--test_threads="$(makeopts_jobs)"
+			--test_debug="$(usex debug 2 0)"
+			# --test_require_data=1 # OPENCV_TEST_REQUIRE_DATA="true"
+			# --test_bigdata=1
+			# --test_tag_enable="verylong,mem_6gb" #,skip_other,dnn_skip_cuda,dnn_skip_cuda_fp16,dnn_skip_parser
+		)
+
+		local results=()
+
+		local tests
+		readarray -t tests <<< "$(find "${BUILD_DIR}/bin" -name 'opencv_test_*' | sort)"
+
+		for test in "${tests[@]}" ; do
+
+			if [[ ${TEST_CUDA} == "false" ]] && [[ ${test} == *opencv_test_cu* || ${test} == *opencv_test_dnn* ]] ; then
+				eqawarn "Skipping test ${test}"
+				continue
+			fi
+
+			local test_opts=(
+				--gtest_color=yes
+				--gtest_output="json:${BUILD_DIR}/test-reports/$(basename "${test}").json"
+			)
+
+			local testname
+			testname="OPENCV_SKIP_TESTS_$(basename "${test//opencv_test_/}")[*]"
+			if [[ -n "${!testname}" ]]; then
+				test_opts+=(
+					--gtest_filter="-$(IFS=':'; echo "${!testname}")"
+				)
+			fi
+
+			einfo "${test} ${test_opts_base[*]} ${test_opts[*]}"
+			if ! "${test}" "${test_opts_base[@]}" "${test_opts[@]}"; then
+				results+=( "$(basename "${test}")" )
+
+				if [[ -z "${OPENCV_TEST_CONTINUE_ON_FAIL}" ]]; then
+					eerror "${results[*]} failed"
+					die
+				fi
+			fi
+		done
+
+		if [[ -n "${results[*]}" ]]; then
+			echo -e "failed: ${results[*]}"
+			if command -v jq &>/dev/null; then
+				for res in "${results[@]}"; do
+					if [[ -f "${BUILD_DIR}/test-reports/${res}.json" ]]; then
+						eerror "${res}: $(
+							jq -r '.testsuites.[] |
+								select( .failures != 0) |
+								.testsuite.[] |
+								select( (.failures | length) > 0) |
+								"\(.classname).\(.name)"' "${BUILD_DIR}/test-reports/${res}.json" | \
+								tr '\n' ' '
+							)"
+					else
+						eerror "${res}: no test report"
+					fi
+				done
+			fi
+			die "${results[*]}"
+		fi
+	}
+
+	local virtx_cmd=
+
+	xdg_environment_reset
+
+	if use wayland; then
+		virtx_cmd=virtwl
+	else
+		virtx_cmd=virtx
+	fi
+
+	# NOTE we do this to defeat pkgcheck saying virtualx.eclass is unused, as it can't detect it being called from a var
+	[[ -z "${virtx_cmd}" ]] && virtx
+
+	local -x MESA_SHADER_CACHE_DISABLE=true
+
+	if multilib_native_use python; then
+		"${virtx_cmd}" python_foreach_impl opencv_test
+	else
+		"${virtx_cmd}" opencv_test
+	fi
+}
+
+multilib_src_install() {
+	if use abi_x86_64 && use abi_x86_32; then
+		MULTILIB_WRAPPED_HEADERS=( # {{{
+			# [opencv4]
+			/usr/include/opencv4/opencv2/cvconfig.h
+			/usr/include/opencv4/opencv2/opencv_modules.hpp
+
+			/usr/include/opencv4/opencv2/core_detect.hpp
+
+			/usr/include/opencv4/opencv2/cudaarithm.hpp
+			/usr/include/opencv4/opencv2/cudabgsegm.hpp
+			/usr/include/opencv4/opencv2/cudacodec.hpp
+			/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+			/usr/include/opencv4/opencv2/cudafilters.hpp
+			/usr/include/opencv4/opencv2/cudaimgproc.hpp
+			/usr/include/opencv4/opencv2/cudalegacy.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+			/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+			/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+			/usr/include/opencv4/opencv2/cudaoptflow.hpp
+			/usr/include/opencv4/opencv2/cudastereo.hpp
+			/usr/include/opencv4/opencv2/cudawarping.hpp
+			# [cudev]
+			/usr/include/opencv4/opencv2/cudev.hpp
+			/usr/include/opencv4/opencv2/cudev/block/block.hpp
+			/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+			/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+			/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+			/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+			/usr/include/opencv4/opencv2/cudev/common.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+			/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+			/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+			/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+			/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+			/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+			/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+			/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+			/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+			/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+			/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+			/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+			/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+			/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+			/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+			/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+			# [contribcvv]
+			/usr/include/opencv4/opencv2/cvv.hpp
+			/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+			/usr/include/opencv4/opencv2/cvv/cvv.hpp
+			/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+			/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+			/usr/include/opencv4/opencv2/cvv/filter.hpp
+			/usr/include/opencv4/opencv2/cvv/final_show.hpp
+			/usr/include/opencv4/opencv2/cvv/show_image.hpp
+			# [contribdnn]
+			/usr/include/opencv4/opencv2/dnn.hpp
+			/usr/include/opencv4/opencv2/dnn/all_layers.hpp
+			/usr/include/opencv4/opencv2/dnn/dict.hpp
+			/usr/include/opencv4/opencv2/dnn/dnn.hpp
+			/usr/include/opencv4/opencv2/dnn/dnn.inl.hpp
+			/usr/include/opencv4/opencv2/dnn/layer.details.hpp
+			/usr/include/opencv4/opencv2/dnn/layer.hpp
+			/usr/include/opencv4/opencv2/dnn/shape_utils.hpp
+			/usr/include/opencv4/opencv2/dnn/utils/debug_utils.hpp
+			/usr/include/opencv4/opencv2/dnn/utils/inference_engine.hpp
+			/usr/include/opencv4/opencv2/dnn/version.hpp
+			/usr/include/opencv4/opencv2/dnn_superres.hpp
+			# [contribhdf]
+			/usr/include/opencv4/opencv2/hdf.hpp
+			/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+
+			/usr/include/opencv4/opencv2/mcc.hpp
+			/usr/include/opencv4/opencv2/mcc/ccm.hpp
+			/usr/include/opencv4/opencv2/mcc/checker_detector.hpp
+			/usr/include/opencv4/opencv2/mcc/checker_model.hpp
+
+			/usr/include/opencv4/opencv2/text.hpp
+			/usr/include/opencv4/opencv2/text/erfilter.hpp
+			/usr/include/opencv4/opencv2/text/ocr.hpp
+			/usr/include/opencv4/opencv2/text/swt_text_detection.hpp
+			/usr/include/opencv4/opencv2/text/textDetector.hpp
+
+			# [qt6]
+			/usr/include/opencv4/opencv2/viz.hpp
+			/usr/include/opencv4/opencv2/viz/types.hpp
+			/usr/include/opencv4/opencv2/viz/viz3d.hpp
+			/usr/include/opencv4/opencv2/viz/vizcore.hpp
+			/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+			/usr/include/opencv4/opencv2/viz/widgets.hpp
+
+			/usr/include/opencv4/opencv2/wechat_qrcode.hpp
+		) # }}}
+	fi
+
+	if multilib_native_use python; then
+		python_foreach_impl cmake_src_install
+		python_foreach_impl python_optimize
+	else
+		cmake_src_install
+	fi
+
+	for plugin in "${ED}/usr/$(get_libdir)/libopencv_"*".$(ver_rs 1-2 '' "$(ver_cut 1-2)").${ARCH}"* ; do
+		patchelf --set-soname "$(basename "${plugin}" ".$(get_libname)")" "${plugin}"
+	done
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.6.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.6.1.ebuild
index a4af4a061b59..c76d93f2d4a8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.6.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.6.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 # public-domain modplug
 LICENSE="BSD-2 BSD CC-BY-SA-4.0 GPL-2+ GPL-3 ISC LGPL-2.1+ MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="
 	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http jack
 	lame libnotify libsamplerate lirc mms modplug +mp3 mpris opengl openmpt opus
diff --git a/media-plugins/mpg123-output-plugins/Manifest b/media-plugins/mpg123-output-plugins/Manifest
index 5d78427cf519..d8d0c3fc497c 100644
--- a/media-plugins/mpg123-output-plugins/Manifest
+++ b/media-plugins/mpg123-output-plugins/Manifest
@@ -5,3 +5,5 @@ DIST mpg123-1.33.3.tar.bz2 1121537 BLAKE2B d4610c07d7f7c90ef5ddadf15b847705bfe78
 DIST mpg123-1.33.4.tar.bz2 1122088 BLAKE2B 3af400a54e19ed93f200c006ea57db97709fed6daa1f8e6f23229a395b3dec8f38f999c24f8209fa7243be19f6c05baa2925e7016b7518378cc0668ef6b539f6 SHA512 9b7aa93b692132da7eb8dcfef12ce91bf66bf8475af50e9c57d7b80225f96c0e74264e518e558371af1f4cf6d2afda5b3dfc844949fd747db7ac7c44d0e9f6ad
 DIST mpg123-1.33.5.tar.bz2 1123086 BLAKE2B 1e849727250081df1ce752acc88f98db83b021d4fbacc7947e5693ebc7ec899d64791ef8ec108f9ec127903f04cdeaad80d5e38ffe8506f21dfef522546f2670 SHA512 ab5d9c26e9f1c73b98449b738fa55e818bcde713683a84ac282e3c2adef85e4ffa46bdc33ddf736b536a5ddb3f24ca731664cdc465d431e267b5656e959b61d0
 DIST mpg123-1.33.6.tar.bz2 1123797 BLAKE2B 400c16b71a0e015b04c11cfae0dc39f085e3a044c1069d0727ea0de1e58302e8736cc913eaf657945636b3c9351867c5bbcb7f337857a7ecf3b23f432b327e27 SHA512 83d8fca128b1fd39e336e6052837b16951360d6f1a47919e00d4b7285717ee7cd4dd56c24bd873316ba6969081fe619cda93ebb20771aed052c6e9d07657f2ab
+DIST mpg123-1.33.7.tar.bz2 1126376 BLAKE2B 6d529a3f03bcea07acab57d936fd8d6d70ca03b82b339ac5330db026f2f068ce4035f802a989e39d13a7cae76a76fe5d85a189a3b615ca1ff0cd3d64a46c9c4d SHA512 694743802bb7be0f4a39bf62e681ae0bfed769cb87dc6c5b6fb5f9245966631efb5c5b9bd58588f7af55ced5d020f97c8a54993e71b5295bc45ebd152473f40e
+DIST mpg123-1.33.7.tar.bz2.sig 566 BLAKE2B caddc7c89101c10afe55ab6f0497a7e59f291d85101118e62c12b998f9320be5ac75f675c815570fc27893bf98e3e49f5cb71b9c3865414c30fb5fb1e25abdef SHA512 79e9ba315b4c5d312ddfc212e932b473a59bc3a73cc0cfa3eb0d0db0482b9905fc8c06c0be867e7e12bbc48f59572d28cb19ba52d444d318724ab64ee86dd263
diff --git a/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.7.ebuild b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.7.ebuild
new file mode 100644
index 000000000000..e44b6675b1f6
--- /dev/null
+++ b/media-plugins/mpg123-output-plugins/mpg123-output-plugins-1.33.7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="mpg123"
+MY_P="${MY_PN}-${PV}"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasorgis.asc
+inherit flag-o-matic libtool toolchain-funcs verify-sig
+
+DESCRIPTION="Plugins for mpg123, the realtime MPEG 1.0/2.0/2.5 audio player"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2
+	https://www.mpg123.org/download/${MY_P}.tar.bz2
+	verify-sig? (
+		https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2.sig
+		https://www.mpg123.org/download/${MY_P}.tar.bz2.sig
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	!<media-sound/mpg123-1.32.3-r100
+	!media-libs/libmpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	sdl? ( media-libs/libsdl2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/libtool
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasorgis )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+src_configure() {
+	local _audio=
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: 'struct hostent' has no member named 'h_addr'
+	append-cflags -D_GNU_SOURCE
+
+	append-lfs-flags
+
+	local flag
+	for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
+		if use ${flag}; then
+			_audio+=" ${flag/pulseaudio/pulse}"
+		fi
+	done
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext (bug #164504)
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio="${_audio}"
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+		--disable-components
+		--enable-libout123-modules
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 8f62bb990985..6731247bbf0c 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,3 @@
 DIST Ardour-9.2.0.tar.bz2 18038842 BLAKE2B fc0668132291e015d2bb075e925a1e5b4922e415ea74affccc9b3af983b6a2f7f67a0582c5b53ca2231236f8dc4bd2c887885c172bd6710829ad5d5614be2a84 SHA512 f4d86dba07d7a3846411890e24f9cdf3d3ea4fbd8e5a575f56a3620859630fc96c1105b047024982f719d753729527f4d752414b443d56d2be6a70277b9dfa9a
 DIST Ardour-9.7.0.tar.bz2 18118247 BLAKE2B f49ba1a35fa24054e97aff584ab8d489e21e925f5db4b19befb3a44dfe11043f4cd3a5a209db50b03abe5e66e0d08272bf0b307d4f9837e4c64b437d161fa85f SHA512 4cb155c413cbc29687d303f8d666ac5ca0481b859ae868753ec57480ca957b4fb61ebb012066069b47195f990bcff66158e0ce9f7783ec7d882d818f4dfc484e
+DIST Ardour-9.8.0.tar.bz2 18134703 BLAKE2B ea0e5c70d7b6f2e10ddc0f32866c3b51b455736f18b4f07b4e16a89bc4d3c714569a2f14406fed3810560af9706d24f5ef085c7bc3883d3fdb8a53f0a011549b SHA512 b5d4fc63ca270c82bb9209c07bbe450209b70758257389a0dd17de87fc1628ef139f94d03f052b5ea7d3a856aaea1a60a1ad08b536a4a084c07dcac9a8f603fc
diff --git a/media-sound/ardour/ardour-9.8.0.ebuild b/media-sound/ardour/ardour-9.8.0.ebuild
new file mode 100644
index 000000000000..9343d0abffcc
--- /dev/null
+++ b/media-sound/ardour/ardour-9.8.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE='threads(+)'
+inherit desktop edo flag-o-matic optfeature python-any-r1 waf-utils toolchain-funcs xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	# Main repo not stable
+	#EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	EGIT_REPO_URI="https://github.com/Ardour/ardour.git"
+	inherit git-r3
+else
+	# upstream doesn't provide a release tarball in github repo
+	# see https://github.com/Ardour/ardour/blob/master/README-GITHUB.txt
+	# official link is available here, but with token/expiration:
+	# https://community.ardour.org/download?architecture=x86_64&type=source
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}"
+	KEYWORDS="~amd64 ~loong ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="9"
+IUSE="doc jack phonehome pulseaudio test"
+CPU_USE=(
+	cpu_flags_x86_{avx,avx512f,fma3,sse}
+)
+IUSE+=" ${CPU_USE[@]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/libarchive:=
+	dev-cpp/cairomm:0[X]
+	dev-cpp/glibmm:2
+	dev-cpp/pangomm:1.4
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2=
+	media-libs/alsa-lib
+	media-libs/aubio:=
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/raptor:2
+	media-libs/rubberband:=
+	media-libs/taglib:=
+	media-libs/vamp-plugin-sdk
+	net-libs/libwebsockets:=
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0=[threads]
+	virtual/libusb:1
+	x11-libs/cairo[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/pango
+	x11-themes/hicolor-icon-theme
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+"
+#	media-libs/suil[X,gtk2] bundled suil is used, maybe probably because of ytk
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+	dev-libs/sord
+	media-libs/sratom
+	x11-libs/libXi
+	test? ( dev-util/cppunit )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.12-fix_fpu.patch"
+	# see bug #966219
+	"${FILESDIR}/${PN}-8.12-fix_fftranscode.patch"
+)
+
+src_prepare() {
+	default
+
+	local optflags=(
+		$(usev cpu_flags_x86_sse sse)
+	)
+	# these flags imply sse and avx
+	if use cpu_flags_x86_sse && use cpu_flags_x86_avx; then
+		optflags+=(
+			avx
+			$(usev cpu_flags_x86_avx512f avx512f)
+			$(usev cpu_flags_x86_fma3 fma)
+		)
+	fi
+
+	# use only flags defined by users
+	sed 's/flag_line = o.*/flag_line = \": '"${optflags[*]}"'\"/' \
+		-i wscript || die
+
+	# shebang
+	python_fix_shebang wscript
+	python_fix_shebang waf
+
+	# fix hardcoded cpp, apply `gcc -E` needs patching but will fail w/ clang
+	tc-export CPP
+	sed -e "s@obj.command = 'cpp'@obj.command = '${CPP/-gcc -E/-cpp}'@" \
+		-i gtk2_ardour/wscript || die
+
+	# skip non-generic tests with failures
+	sed -e "\@'test/fpu_test.cc',@d" -i libs/ardour/wscript || die
+}
+
+src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/ardour${SLOT}"
+
+	local backends=(
+		alsa
+		dummy
+		$(usev jack)
+		$(usev pulseaudio)
+	)
+
+	# VST support is enabled by default given --no-lxvst is not called.
+	# But please keep in mind the README (obsolete?) made by upstream.
+	# https://github.com/Ardour/ardour/blob/master/PACKAGER_README
+	tc-export CC CXX
+	local myconf=(
+		--configdir="${EPREFIX}"/etc
+		--cxx17
+		--freedesktop
+		--no-execstack
+		--noconfirm
+		--optimize
+		--with-backends=$(IFS=','; echo "${backends[*]}")
+		$(usev !cpu_flags_x86_sse --no-fpu-optimization)
+		$(usev !phonehome --no-phone-home)
+		$(usev test --test)
+		# not possible right now  --use-external-libs
+		# missing dependency: https://github.com/c4dm/qm-dsp
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	waf-utils_src_compile i18n
+	if use doc; then
+		pushd doc >/dev/null || die
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+		find . \( -iname '*.map' -o -iname '*.md5' \) -delete || die
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	pushd "${S}"/libs/ardour/ >/dev/null || die
+	edo ./run-tests.sh
+	popd >/dev/null || die
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	local s
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+	rm "${D}/usr/share/mime/packages/ardour.xml" || die
+
+	# the appdata directory is deprecated
+	# no patch because this causes the translation fail
+	mv "${ED}"/usr/share/{appdata,metainfo} || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "another synth used by default if installed" media-plugins/gmsynth-lv2
+	optfeature "exporting audio in mp3" media-video/ffmpeg[lame]
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/audacious/audacious-4.6.1.ebuild b/media-sound/audacious/audacious-4.6.1.ebuild
index 9a0532ffd06a..4ffe9a74512e 100644
--- a/media-sound/audacious/audacious-4.6.1.ebuild
+++ b/media-sound/audacious/audacious-4.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://distfiles.audacious-media-player.org/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="gtk qt6 test"
 REQUIRED_USE="test? ( qt6 )"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/fluidsynth/fluidsynth-2.5.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.5.7.ebuild
index 6255fd6cfcac..357db6f9c4d4 100644
--- a/media-sound/fluidsynth/fluidsynth-2.5.7.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.5.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 # Apache-2.0 for gcem
 LICENSE="Apache-2.0 LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa dbus debug doc ipv6 jack ladspa openmp oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/mpg123-base/Manifest b/media-sound/mpg123-base/Manifest
index 5d78427cf519..d8d0c3fc497c 100644
--- a/media-sound/mpg123-base/Manifest
+++ b/media-sound/mpg123-base/Manifest
@@ -5,3 +5,5 @@ DIST mpg123-1.33.3.tar.bz2 1121537 BLAKE2B d4610c07d7f7c90ef5ddadf15b847705bfe78
 DIST mpg123-1.33.4.tar.bz2 1122088 BLAKE2B 3af400a54e19ed93f200c006ea57db97709fed6daa1f8e6f23229a395b3dec8f38f999c24f8209fa7243be19f6c05baa2925e7016b7518378cc0668ef6b539f6 SHA512 9b7aa93b692132da7eb8dcfef12ce91bf66bf8475af50e9c57d7b80225f96c0e74264e518e558371af1f4cf6d2afda5b3dfc844949fd747db7ac7c44d0e9f6ad
 DIST mpg123-1.33.5.tar.bz2 1123086 BLAKE2B 1e849727250081df1ce752acc88f98db83b021d4fbacc7947e5693ebc7ec899d64791ef8ec108f9ec127903f04cdeaad80d5e38ffe8506f21dfef522546f2670 SHA512 ab5d9c26e9f1c73b98449b738fa55e818bcde713683a84ac282e3c2adef85e4ffa46bdc33ddf736b536a5ddb3f24ca731664cdc465d431e267b5656e959b61d0
 DIST mpg123-1.33.6.tar.bz2 1123797 BLAKE2B 400c16b71a0e015b04c11cfae0dc39f085e3a044c1069d0727ea0de1e58302e8736cc913eaf657945636b3c9351867c5bbcb7f337857a7ecf3b23f432b327e27 SHA512 83d8fca128b1fd39e336e6052837b16951360d6f1a47919e00d4b7285717ee7cd4dd56c24bd873316ba6969081fe619cda93ebb20771aed052c6e9d07657f2ab
+DIST mpg123-1.33.7.tar.bz2 1126376 BLAKE2B 6d529a3f03bcea07acab57d936fd8d6d70ca03b82b339ac5330db026f2f068ce4035f802a989e39d13a7cae76a76fe5d85a189a3b615ca1ff0cd3d64a46c9c4d SHA512 694743802bb7be0f4a39bf62e681ae0bfed769cb87dc6c5b6fb5f9245966631efb5c5b9bd58588f7af55ced5d020f97c8a54993e71b5295bc45ebd152473f40e
+DIST mpg123-1.33.7.tar.bz2.sig 566 BLAKE2B caddc7c89101c10afe55ab6f0497a7e59f291d85101118e62c12b998f9320be5ac75f675c815570fc27893bf98e3e49f5cb71b9c3865414c30fb5fb1e25abdef SHA512 79e9ba315b4c5d312ddfc212e932b473a59bc3a73cc0cfa3eb0d0db0482b9905fc8c06c0be867e7e12bbc48f59572d28cb19ba52d444d318724ab64ee86dd263
diff --git a/media-sound/mpg123-base/mpg123-base-1.33.7.ebuild b/media-sound/mpg123-base/mpg123-base-1.33.7.ebuild
new file mode 100644
index 000000000000..2b166c9828cb
--- /dev/null
+++ b/media-sound/mpg123-base/mpg123-base-1.33.7.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="mpg123"
+MY_P="${MY_PN}-${PV}"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasorgis.asc
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal verify-sig
+
+DESCRIPTION="Realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2
+	https://www.mpg123.org/download/${MY_P}.tar.bz2
+	verify-sig? (
+		https://downloads.sourceforge.net/${MY_PN}/${MY_P}.tar.bz2.sig
+		https://www.mpg123.org/download/${MY_P}.tar.bz2.sig
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	!<media-sound/mpg123-1.32.3-r100
+	!media-libs/libmpg123
+	dev-libs/libltdl:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/libtool
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasorgis )
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: 'struct hostent' has no member named 'h_addr'
+	append-cflags -D_GNU_SOURCE
+
+	if multilib_is_native_abi ; then
+		local flag
+		for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext (bug #164504)
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio=dummy
+		--with-default-audio="${_audio} dummy"
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+		$(multilib_native_enable programs)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123} || die
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/sox/sox-14.7.0.9.ebuild b/media-sound/sox/sox-14.7.0.9.ebuild
index f2e130b7cb26..a36ff659673b 100644
--- a/media-sound/sox/sox-14.7.0.9.ebuild
+++ b/media-sound/sox/sox-14.7.0.9.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 # https://codeberg.org/sox_ng/sox_ng/wiki/Copyright
 LICENSE="GPL-2"
 SLOT="0/3" # SHLIB_VERSION in configure.ac
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa amr ao dolbyb encode +ffmpeg fftw flac id3tag ladspa loudness mad ogg openmp oss opus png pulseaudio sndfile sndio speexdsp twolame wavpack"
 
 RDEPEND="
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index b23cf3785913..f26f7705cec8 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,3 @@
 DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
 DIST znc-1.10.1.tar.gz 2310976 BLAKE2B c2a01930d965b9e21de724a23dc1a7670009a142c395afab3dedae8ed9c67c47f997e67c4294a2f2bb6438df1aac70024d9b96968e09de9933ab9a80f9cbfcb1 SHA512 f125eef5a9f8bfcd278951971638fe8a937261001bfd8f6438fc51fda666b97c00780c5c6f1a921b3db79cb7656bc9675eb3881b18b22b7738e0976ebcca7cb3
-DIST znc-1.10.2.tar.gz 2313233 BLAKE2B 6ff1d7e7f13edeef12a729bfb57b0a6d587cdef0cc044d82c913d0a727452f714af51149897f333b9c6fb768fc1b411b4d9021b6554c242c68dd5c791dffb992 SHA512 cc9012bb669d1f4e98e1765cfdd41dcd49033f391ac702c0b28dcae76bdd74a452e2036fde0d8b65686e9859605632a29682c942377952249e90e2992490f348
+DIST znc-1.10.3.tar.gz 2313669 BLAKE2B d419c97cf77c3604e67e8a7a3f83cc62e01006bdc453e4e292b50df8fbf0089616efa4894a5fb43476ddf52cb09ad596ab2a305515717a6f37e2097d0347411a SHA512 5f101b0fdc4313330f11d0238292c3e0e91a1f581d373dc459c6b8d414e86e49219db156598e5a8398eb0dad498d18ae3bf6c8681db311f6468581d96615a4d6
diff --git a/net-irc/znc/znc-1.10.2.ebuild b/net-irc/znc/znc-1.10.3.ebuild
index d74db69c0448..ea85d04bdb52 100644
--- a/net-irc/znc/znc-1.10.2.ebuild
+++ b/net-irc/znc/znc-1.10.3.ebuild
@@ -18,7 +18,7 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="
-		https://znc.in/releases/archive/${MY_P}.tar.gz
+		https://files.asokolov.org/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 07a9e795cfd4..162448d9233a 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1 +1,2 @@
 DIST gnome-online-accounts-3.56.5.tar.xz 496848 BLAKE2B 0d92f67d936a732ce8c139881fa9dcdfac01f634e8f69692f936e3efde02bc75f1097cd5e3749461b7975f2be41819287ed898f42d4bb092bbb312d6c819b51c SHA512 460b59fa9c211a99b6107b196ecf7563ade3079d452b123e68dcd93a1a41f4c705c12f47cd6b81e4ea80270c89dabbf1a0a03c29d4cdebc167b7b1936fc4eff6
+DIST gnome-online-accounts-3.58.1.tar.xz 496012 BLAKE2B 89f9e52ff491fdbeaf53809bab2014ae827939c95c1e3d27d98608cb8492d6d81f020ccbb2f16b648e95ac191d56c85a3ead6fe06b08bc475e743fc597fed691 SHA512 4d466a14086ec199b5693727c29e8c159e85eef9949c2b30f5680c25b791653b1c468aedfd3176662dc934927d35df5f1e0c2ae8d6ec37d7d9515bbb8ca2ea15
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.58.1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.58.1.ebuild
new file mode 100644
index 000000000000..cbdad14d8d1d
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.58.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-online-accounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+IUSE="debug gnome gtk-doc +introspection kerberos ms365 +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.84.0:2
+	sys-apps/dbus
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	>=gui-libs/libadwaita-1.6_beta
+	>=gui-libs/gtk-4.15.2:4
+	>=dev-libs/json-glib-0.16
+	>=app-crypt/libsecret-0.5
+	>=net-libs/libsoup-3.0:3.0
+	>=sys-apps/keyutils-1.6.2
+	dev-libs/libxml2:2=
+	>=net-libs/rest-0.9.0:1.0
+	kerberos? (
+		>=app-crypt/gcr-4.1.0:4=[gtk]
+		app-crypt/mit-krb5
+	)
+"
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+BDEPEND="gtk-doc? ( dev-util/gi-docgen )"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	local emesonargs=(
+		-Dgoabackend=true
+		-Dexchange=true
+		-Dfedora=false
+		-Dgoogle=true
+		-Dimap_smtp=true
+		$(meson_use kerberos)
+		-Downcloud=true
+		-Dwebdav=true
+		$(meson_use gtk-doc documentation)
+		$(meson_use ms365 ms_graph)
+		$(meson_use introspection)
+		-Dman=true
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 7fb2fc3335d8..e753e03cf95f 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -2,3 +2,5 @@ DIST libpcap-1.10.6.tar.gz 987897 BLAKE2B 1da8f60ffa572ad175f25723942e73d30caad7
 DIST libpcap-1.10.6.tar.gz.sig 442 BLAKE2B cc87921fcab895a3ab242d11cad637bd8a523f28e1a39b4c752435ba25cfb375fbba93ddaa4098ae2e9f42026b28a98a0e44ddde72adae86a6264e1773252f67 SHA512 59bd2fdeae1702bbf39ba60adabd594a2caae354ccd6fa4e6f79472eb25b26c805048ee206551fb4264e522c8d83bfcba2930db56e8fb1e5526c3099b9d7aa87
 DIST libpcap-1.10.7.tar.gz 994575 BLAKE2B 4bf6938b602f9933846b23a90fae8e4b3354bda04cbd0ebaca6aee5b1463e0267e5f47ca77fa4286c18d50ba1ca0d36ad4a5b177a8589e6ffe9dd348fa0a4546 SHA512 905ad8bacb4aa820f55bc88017130f7bf2dc15ff4917f20fe603fc6e4f637f21d56909fe921065ccc615448af0537726a4df6d7fade82083603c94239ea947bc
 DIST libpcap-1.10.7.tar.gz.sig 442 BLAKE2B 6a887322dcf11e485ec53e72000229a7cd4a28f102ff6bcbe0c16d174d8056126cb98afa4f47b503062938a7a5499a76b40e1908aa4093b10035735ad2edbf5a SHA512 5f33af9c2310ed34b548ad299ff832c16c0f888795c437c32dc9443f16668b324bf963713d872e573788f077ce552de774cf7b76247fd7780495b88da03669e1
+DIST libpcap-1.11.0.tar.gz 1052416 BLAKE2B 3a78632f7deb15611b681224562f76ba890fb760e1c681c418dd73999ed7b06cff52c678aa2f3f1d3299958f2676d3fe5ea33262e872254aad1dbfd40ba874b9 SHA512 6a29b24afe8fc5fe7761871b2067dba1df69624c4eb263765e4da0c6a5a8915e0b32ec6767e190b2459f8b2a691b1ac5d9867c3a2a9c8234ff9b623b5a84414b
+DIST libpcap-1.11.0.tar.gz.sig 442 BLAKE2B 4e9cc8aaf4bf88a8b9c2e46c44d1dba2468034ca4b2f378ec977d010fedc20772ef9420a972443b8a82cd8c35932c89ee06a2aee8be015f022c4350a19a6eb77 SHA512 568f48b2cb15e2942e7adb3636a75ed7eacaf4aaa94c6c1efd6bc9a9296ecb7e7dedc3be64b4718493e0a23db4e6020981e012b0c7dd0c1a323101abce13b683
diff --git a/net-libs/libpcap/libpcap-1.10.7.ebuild b/net-libs/libpcap/libpcap-1.10.7.ebuild
index 2d4b48d848d4..22d4ca58f271 100644
--- a/net-libs/libpcap/libpcap-1.10.7.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.7.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 # The project itself has COPYING with BSD, but the files used for
diff --git a/net-libs/libpcap/libpcap-1.11.0.ebuild b/net-libs/libpcap/libpcap-1.11.0.ebuild
new file mode 100644
index 000000000000..1cea764e9ddf
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.11.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo multilib-minimal multiprocessing
+
+DESCRIPTION="System-independent library for user-level network packet capture"
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	inherit verify-sig
+
+	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+# The project itself has COPYING with BSD, but the files used for
+# the libpcap library itself seem to be a mix of BSD-with-attribution
+# and BSD-4.
+LICENSE="BSD BSD-with-attribution BSD-4"
+SLOT="0"
+IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	sys-devel/flex
+	dbus? ( virtual/pkgconfig )
+	test? ( dev-lang/perl )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20260908 )"
+fi
+
+src_prepare() {
+	default
+
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #884275
+	export LEX=flex
+
+	local myeconfargs=(
+		$(use_enable bluetooth)
+		$(use_enable dbus)
+		$(use_enable rdma)
+		$(use_enable remote)
+		$(use_enable usb)
+		$(use_enable yydebug)
+		$(use_with netlink libnl)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_test() {
+	if has_version -b "dev-lang/perl[perl_features_ithreads]" ; then
+		# errors out if this is set w/o ithreads
+		local -x TESTRUN_JOBS=$(get_makeopts_jobs)
+	else
+		ewarn "Running tests serially without dev-lang/perl[perl_features_ithreads]"
+	fi
+
+	emake -Onone check
+	edo testprogs/findalldevstest
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 2d4b48d848d4..1cea764e9ddf 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools edo multilib-minimal multiprocessing
 
-DESCRIPTION="A system-independent library for user-level network packet capture"
+DESCRIPTION="System-independent library for user-level network packet capture"
 HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
 
 if [[ ${PV} == *9999* ]] ; then
@@ -42,6 +42,7 @@ BDEPEND="
 	app-alternatives/yacc
 	sys-devel/flex
 	dbus? ( virtual/pkgconfig )
+	test? ( dev-lang/perl )
 "
 
 if [[ ${PV} != *9999* ]] ; then
@@ -70,7 +71,6 @@ multilib_src_configure() {
 		$(use_enable usb)
 		$(use_enable yydebug)
 		$(use_with netlink libnl)
-		--enable-ipv6
 	)
 
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -78,15 +78,22 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	emake all shared
-	use test && emake testprogs
 }
 
 multilib_src_test() {
-	testprogs/findalldevstest || die
+	if has_version -b "dev-lang/perl[perl_features_ithreads]" ; then
+		# errors out if this is set w/o ithreads
+		local -x TESTRUN_JOBS=$(get_makeopts_jobs)
+	else
+		ewarn "Running tests serially without dev-lang/perl[perl_features_ithreads]"
+	fi
+
+	emake -Onone check
+	edo testprogs/findalldevstest
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+	dodoc CREDITS CHANGES VERSION README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 524826d46544..e3a139972be7 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,3 +1,3 @@
 DIST libupnp-1.14.31.tar.gz 826590 BLAKE2B 2fcfcd00aab5e97821ad40125071d6c5354cfce63ff59a88783a1bed17658d71566a4834615826b37a681cc3f6ac26d9324f6202c824849e5399ca81e58f7b3a SHA512 be0f876adb7a0799187531cc83a29afd5bfe8f7772e909f88faf406e344f992ccb07ef410f7511766576bde8128478926e33cebfcfa8ed1ba15fe136e0bfc8c7
 DIST libupnp-1.18.5.tar.gz 833624 BLAKE2B d4e94020f3e01e55eccdca089ede45715c812653120122d627daa0270b84f30329c9bcf5fc9ab0a66fdd83886fdf8f0768a10edd78abf514f7a6af1ac459bdb6 SHA512 a4ffb5977d9e103f8ce3ed8f9dec6a336424258c9541ae38790accaa35cd7bf92165cded285ce30f57c7aa5e03f05f0a639d846436b460800ee5e5fcb4d2d7c8
-DIST libupnp-22.0.6.tar.gz 877457 BLAKE2B 013985d85f5c808ab211352304d13bce3bc7eea3f8c34a2ea815d01a6857ef541757f31095c5cda309559757195fbaba68e07523ca9353457fadcf18fe03d8ba SHA512 fd6154f09a100be3a6172414737937460a545d679ec7b27233c3e3eb5aefbede8273a19390eaf353472e2f36be90006aff0d14a15d802bac2ae60e381120f2ed
+DIST libupnp-22.1.0.tar.gz 881932 BLAKE2B ec34098705c84f1883f3e63a5bd8cc1a30dc65a4f9820efdf494a19dc331c55d733da208cf3eee86b03bb35f78cceedf0f95b50bc6cc825126523081d83f6884 SHA512 ff3a097c22655f5b9c063ae43ab639ef3f11427ca1b04954a278ec7f352044d70a203753b83d490fe8c401b355c92e6097957d3f1112ab88f6a5cad33dc81029
diff --git a/net-libs/libupnp/libupnp-22.0.6.ebuild b/net-libs/libupnp/libupnp-22.1.0.ebuild
index b8e25faeb275..b8e25faeb275 100644
--- a/net-libs/libupnp/libupnp-22.0.6.ebuild
+++ b/net-libs/libupnp/libupnp-22.1.0.ebuild
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index 273203587030..5b204697ba0f 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1,3 +1,4 @@
 DIST ena-driver-2.16.1-linux.tar.gz 1496231 BLAKE2B f3d064a1114f6ba307daab31f1f3ca10a83d5779ac8007b610f5dca1ff791f8c3a25e2b1de852d963fdf3873733763561089bd1e442e1744403a4d8e54a942b1 SHA512 63d53d0377252c8e25486be4d9df5b9af2bbe99916b348ba3960182c5d0cbc82130b636ff28c006de23f6ff9ff526679c3ecbf4ee19ea65660b411c9da66a34c
 DIST ena-driver-2.17.0-linux.tar.gz 1503664 BLAKE2B e62d9423268357c3f2e909ddbff79a0a0272285c79d1cf0039c7609af6c6f0593f1dadaec4d35388e6c03e0f8819c3b49e0e407fcde38669e37267258017a442 SHA512 5273dc9f92d554791d02362686c4cfd9898ec60b677d0168b73da369d956b391de4183292c42296bf8f7fa70ae1acb66d78842e9239037caf100a1bc9cd1ebeb
 DIST ena-driver-2.17.2-linux.tar.gz 1505731 BLAKE2B 48ed61cd04eacb1fd51a37847b86d4dd1c6e4b415136773f9743a56b90ce162f078e8ac4f286cc7882316aa607fd2dfd9fec8fa83fd8a1d4fc84155858a201a0 SHA512 e6e14de0308a592b6bac472e5d790abb1b0d857326d734a0dc586a3a983bb239eb1488928cacb6fa7b45233b333b61cb18389d560aaac8960ddebab07cd122a6
+DIST ena-driver-2.17.3-linux.tar.gz 1515932 BLAKE2B 4ef47236a0882241a487704e725e9e7b840ec88aa3fced0482b8265808c94407c6ca5e7b531d7c688e43b958c4d3fffbdcf4218a5ba4e6ca99ab7d76c0fd8992 SHA512 c1b7ab655581dc139614fd4b0e7a9d72ede192b4cd1ad5d9711c3726491bf5a7302434757bfc3bc79100ce73ad184b7a68e51e3d516171635a99570be68afa5b
diff --git a/net-misc/ena-driver/ena-driver-2.17.3.ebuild b/net-misc/ena-driver/ena-driver-2.17.3.ebuild
new file mode 100644
index 000000000000..442767116575
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.17.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz"
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+
+CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB"
+DOCS=(
+	README.rst
+	RELEASENOTES.md
+	ENA_Linux_Best_Practices.rst
+)
+
+src_compile() {
+	local modlist=( ena=net )
+	local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 501658939ab5..0518b3680578 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,2 +1,2 @@
-DIST mrouted-4.5.tar.gz 322493 BLAKE2B 1c4702d41f7bb9b6bd39cf718f28714555987b5837a858c6bb7697ad85f7a8b090bcee87d6997eecce728f3f645ac6ed41edd6bcd762b07ef92c52551ea11fba SHA512 145decbd1fba826196f719a7712bb9568080b2b5757eb80f79185537cd045ca1def36e34e93804ecaaa815607f43b58fc768b307098d90ac808ed5717a0c58d7
 DIST mrouted-4.6.tar.gz 325200 BLAKE2B eee3509d2a87ca6e089889900e5b96e14e344d12a895c6d6a4a8a3c65fab78640f0906839fda0a88f6803b608d8a9551d66d1fffae218c14331a7bfc655f2ae9 SHA512 e3e4483c38cc85787e1873a733213eedcdccaf371e39ba6ccc01786184d2ddf1ee5e44bde6d04424b28ebbcec2a020d9575ad48323fc4d2a58a88f4cf639ec1c
+DIST mrouted-4.7.tar.gz 325769 BLAKE2B ff026175bb880b54dc57511ad20540a2b33b2c2448b582e23cc2d072c13b0e59ebff3959951c32575d9b5feb6d3f948d3034a4af3d36ac926e35a885dc9a27e0 SHA512 d8035dce5cc448657f347269239963d5702d61a30e020e9a5e0ae29dca2c642095b37186294509f0ceb57552dafbd3eafd6320b578644ee0ffde089bda0add9c
diff --git a/net-misc/mrouted/mrouted-4.5.ebuild b/net-misc/mrouted/mrouted-4.7.ebuild
index dd6d1e4f2e8b..97ffd4a7fd26 100644
--- a/net-misc/mrouted/mrouted-4.5.ebuild
+++ b/net-misc/mrouted/mrouted-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,9 +11,8 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Stanford GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
-
 # Needs unshare
 RESTRICT="!test? ( test ) test"
 
@@ -25,8 +24,10 @@ BDEPEND="
 src_configure() {
 	tc-export CC CXX
 
-	econf \
-		$(use_enable test)
+	# rename mtrace binary to mrtrace to avoid conflict with glibc (886145)
+	# and rewrite the man page so we don't confuse people
+	sed -i -e 's/MTRACE/MRTRACE/' -e 's/mtrace/mrtrace/' man/mtrace.8 || die
+	econf $(use_enable test) "--program-transform-name='s/^mtrace/mrtrace/'"
 }
 
 src_compile() {
@@ -42,3 +43,8 @@ src_install() {
 	newinitd "${FILESDIR}"/mrouted.rc mrouted
 	systemd_dounit mrouted.service
 }
+
+pkg_postinst() {
+	ewarn "The mtrace program from mrouted conflicts with the one installed by glibc"
+	ewarn "so it has been renamed to mrtrace. See mrtrace(8) for documentation."
+}
diff --git a/net-misc/openrdap/Manifest b/net-misc/openrdap/Manifest
index 70773eb83c08..37659968649e 100644
--- a/net-misc/openrdap/Manifest
+++ b/net-misc/openrdap/Manifest
@@ -1,2 +1,4 @@
 DIST openrdap-0.10.1-vendor.tar.xz 79660 BLAKE2B cc84662f59f7b177a1e2681de013eabb08000a48981382a75d415ddc49a28f017ef8ec6edc38f9fbbd912da04bd07d42084fcc919c9c6f2e374e0fa6896d714e SHA512 3c75c99933a7ca3362f4b94476120d92f5923d1b7fc08467f526e644e660bfaa64a6053c299f7b5b565373206eb3db466ac34c5b79fe58e2a5a8f4addc5cb1b7
 DIST openrdap-0.10.1.tar.gz 98235 BLAKE2B 763239884a7ea6412ff269325951839af3d730936c55bec45974d3d3e3270d5c143a20d835dc271eb68df09474047f9085d91e4a45c2f490e95eccc1b6ea260f SHA512 130eff87e9870745e1a2c7a38a0174de26239630ecd366c9983e808763cea5f83a0b0c803860a81ea45df3cb840cd088e6d2434c486383750c3b16cffe666030
+DIST openrdap-0.10.2-vendor.tar.xz 3755800 BLAKE2B cc0c3835a2ed824ce956a50c2677c4246968f3efae97427d7b30f3e5112d75f5adc1a5e6d40197454ce865b6e884b3ab37a1c7e1f2da1fe5b0b1cd0a090eb500 SHA512 aa475a913837de02f36b6bd75c4845588ffb9491ca53cafc0fa145832cc2dc81c037fe0563b7abc989a50f8cf87f794f72e8c3059f1cc43c78d9930b84d8f280
+DIST openrdap-0.10.2.tar.gz 99668 BLAKE2B 5b458939f263a300d06f7d7afec531cf6041650630339af8e9d198cfb670f27efa3aaeb397af200c03e71068ce78716067cde45794b3bc2f85c81468e09c4623 SHA512 1b63401431762aa7bec87823b61e62c59ebd8e26264c5206959bbdf1646d69a3ce06b23e4ef5c41704019b387493647e91102ca3d9e2f74011d79fd0f6c0f674
diff --git a/net-misc/openrdap/openrdap-0.10.2.ebuild b/net-misc/openrdap/openrdap-0.10.2.ebuild
new file mode 100644
index 000000000000..80bcd3557e18
--- /dev/null
+++ b/net-misc/openrdap/openrdap-0.10.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module toolchain-funcs shell-completion
+
+DESCRIPTION="RDAP command line client"
+HOMEPAGE="
+	https://www.openrdap.org/
+	https://github.com/openrdap/rdap
+"
+SRC_URI="
+	https://github.com/openrdap/rdap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~conikost/distfiles/${P}-vendor.tar.xz
+"
+S=${WORKDIR}/${P/open/}
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-lang/go-1.26.0"
+
+src_compile() {
+	ego build ./cmd/rdap
+
+	if ! tc-is-cross-compiler; then
+		einfo "generating shell completion files"
+		# those commands exit OK with 1, so we can't use die
+
+		./rdap --completion-script-bash > rdap.bash
+		grep -q "complete -F" rdap.bash || die "bash completion script is invalid"
+
+		./rdap --completion-script-zsh > rdap.zsh
+		grep -q "compdef rdap" rdap.zsh || die "zsh completion script is invalid"
+	fi
+}
+
+src_install() {
+	dobin rdap
+	einstalldocs
+
+	if ! tc-is-cross-compiler; then
+		newbashcomp rdap.bash rdap
+		newzshcomp rdap.zsh _rdap
+	else
+		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
+	fi
+}
diff --git a/net-misc/sb-hosts/Manifest b/net-misc/sb-hosts/Manifest
index 1da79b0ea3ec..72b6633da3c5 100644
--- a/net-misc/sb-hosts/Manifest
+++ b/net-misc/sb-hosts/Manifest
@@ -1,2 +1,2 @@
-DIST sb-hosts-3.16.112.tar.gz 21511188 BLAKE2B a3951069e2527002d17e998e6b748cc96c0440f74d6a81413cbcb8f0938deac14f665a512471a576e36999ecfa6137fa1036a717238bf185d82e7a29de160d2d SHA512 d212863379a9ce3ba059d35552f6c77b5d2db855d5821e46975737b3347b26d18e88ea454517a871c8021bd5a53c986a1cc002597ab86b167c39ba7116ca8c2d
 DIST sb-hosts-3.16.113.tar.gz 21544430 BLAKE2B af70773c0dd5241c8736613cbdf79652888e5055c4ab51f51c14aff83ff3e4ae074453918a37f8d6eef36fa4c77ee3d3e4d82c9b09ba59be33fae75b8bf63725 SHA512 39668928ebcb01ce2d726e2bc230109787d93dac1397a7c608ef8606bc46e352913b437fd46ad5f433bc21e04dd2e3ff9b07683777209e5636e614d1b3770e46
+DIST sb-hosts-3.16.114.tar.gz 21339729 BLAKE2B 24d9713c2b05051f882a268fbe770afe2fa9b0ae9ecf6847a712dcc2e63e167955f4af8c30523036fc3b3ed3c5d38d410f3d6db587e26ca13f2c286cc96e6854 SHA512 46d53618967502047c974539a44205e97c21846be8dc63c0c4a83f85e49459fb4d4f22033af2feb785537e3f171fb881f9c11e078dc2b6c95ae597317ac49e12
diff --git a/net-misc/sb-hosts/sb-hosts-3.16.112.ebuild b/net-misc/sb-hosts/sb-hosts-3.16.114.ebuild
index 941876ea977f..941876ea977f 100644
--- a/net-misc/sb-hosts/sb-hosts-3.16.112.ebuild
+++ b/net-misc/sb-hosts/sb-hosts-3.16.114.ebuild
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 9ee14bc47863..295306acaf9d 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -36,6 +36,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Lukas Schmelting <lschmelting@posteo.com> (2026-09-06)
+# Most revdeps still need gexiv2-0.16 compatibility fixes
+# See: https://bugs.gentoo.org/982084
+=media-libs/gexiv2-0.16*
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2026-09-11)
 # EAPI=7, old PYTHON_COMPAT, doesn't work with spotify for a long time,
 # upstream inactive for a decade.
diff --git a/sci-geosciences/viking/viking-1.11.ebuild b/sci-geosciences/viking/viking-1.11-r1.ebuild
index ff32f1eff940..d1c299d69713 100644
--- a/sci-geosciences/viking/viking-1.11.ebuild
+++ b/sci-geosciences/viking/viking-1.11-r1.ebuild
@@ -31,7 +31,7 @@ COMMONDEPEND="
 	>=x11-libs/gtk+-3.22:3
 	geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
 	gps? ( >=sci-geosciences/gpsd-3.20:= )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2:0 ) )
 	magic? ( sys-apps/file )
 	nova? ( sci-libs/libnova )
 	oauth? ( net-libs/liboauth )
diff --git a/sci-ml/kineto/kineto-0.4.0_p20260805.ebuild b/sci-ml/kineto/kineto-0.4.0_p20260805-r1.ebuild
index d2ab2b277c31..2d756e6dfb5d 100644
--- a/sci-ml/kineto/kineto-0.4.0_p20260805.ebuild
+++ b/sci-ml/kineto/kineto-0.4.0_p20260805-r1.ebuild
@@ -20,10 +20,12 @@ KEYWORDS="~amd64 ~arm64"
 IUSE="rocm cuda test"
 
 RDEPEND="
-	dev-libs/libfmt
 	dev-libs/dynolog
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libfmt
+"
 BDEPEND="
 	test? ( dev-cpp/gtest )
 	${PYTHON_DEPS}
@@ -43,12 +45,17 @@ src_configure() {
 	local mycmakeargs=(
 		-DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/
 		-DKINETO_BUILD_TESTS=OFF # tests require cuda toolkit
-		-DCUDA_SOURCE_DIR=/opt/cuda
 	)
 	if use cuda; then
-		mycmakeargs+=( -DKINETO_BACKEND=cuda )
+		mycmakeargs+=(
+			-DKINETO_BACKEND=cuda
+			-DCUDA_SOURCE_DIR="${EPREFIX}"/opt/cuda
+		)
 	elif use rocm; then
-		mycmakeargs+=( -DKINETO_BACKEND=rocm )
+		mycmakeargs+=(
+			-DKINETO_BACKEND=rocm
+			-DROCM_SOURCE_DIR="${EPREFIX}"/usr
+		)
 	else
 		mycmakeargs+=( -DKINETO_BACKEND=cpu )
 	fi
diff --git a/sec-keys/openpgp-keys-thomasorgis/Manifest b/sec-keys/openpgp-keys-thomasorgis/Manifest
new file mode 100644
index 000000000000..f7f0fdd4457d
--- /dev/null
+++ b/sec-keys/openpgp-keys-thomasorgis/Manifest
@@ -0,0 +1,2 @@
+DIST openpgp-keys-thomas-ubuntu-20260913.asc 7793 BLAKE2B 955e19e2e6f569aee64c86287106988f7b14a131bccf26a64f90f0878d1bcbeb094ddacbe59d0f88379e55a168e63d58f7e6f171eecb22661942ee15f95101ac SHA512 9e04464351301a442f823689434cfccedb3ed0b74e88ecb66b8ad9c7c86a2ca5000ba1cf6d78549c3ad2a1c4ce5ce2ac832cb0e89cc9162745f3d41ad22c3b12
+DIST openpgp-keys-thomasorgis-20260913.asc 3104 BLAKE2B 88c2bbba1affedaba47619743c81af40403cad0f9a20940900e45d84db1ff3d2f2f01cebc1c24a836d3f47578c36a0082ef2c7fb7d61ad7a70102dae5613feb1 SHA512 0e767594166d43348c9215ba8d1ced92b5c4a7c7149583f651f2cacbf384f9118ef137a7c01d7951ae04a21511aceaa9b5af4f75883d3e89d119960228564d91
diff --git a/sec-keys/openpgp-keys-thomasorgis/metadata.xml b/sec-keys/openpgp-keys-thomasorgis/metadata.xml
new file mode 100644
index 000000000000..cd64b45ebb77
--- /dev/null
+++ b/sec-keys/openpgp-keys-thomasorgis/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <origin>baldeagleos-repo</origin>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-thomasorgis/openpgp-keys-thomasorgis-20260913.ebuild b/sec-keys/openpgp-keys-thomasorgis/openpgp-keys-thomasorgis-20260913.ebuild
new file mode 100644
index 000000000000..99ce69b67173
--- /dev/null
+++ b/sec-keys/openpgp-keys-thomasorgis/openpgp-keys-thomasorgis-20260913.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SEC_KEYS_VALIDPGPKEYS=(
+	'D021FF8ECF4BE09719D61A27231C4CBC60D5CAFE:thomas:manual,ubuntu'
+)
+
+inherit sec-keys
+
+DESCRIPTION="OpenPGP keys used by Thomas Orgis"
+HOMEPAGE="https://thomas.orgis.org/ https://www.mpg123.org/download.shtml"
+SRC_URI+=" http://thomas.orgis.org/public_key -> ${P}.asc"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 3145549de8b3..7b2c9edc6489 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,2 +1,2 @@
-DIST baobab-48.0.tar.xz 606832 BLAKE2B 15bb7ffb3b47a81e8cc298f2a1ebf07cbb7542f7adf55588eef8a79b8ce1a281ec2d89a2868704e56709d180265a45579b18beffec7f5f253baf7c251b5612fb SHA512 720434a22c349ee3827a1795001bb460fd88d45e79cc1685c6ca49b21625fd7be5356ca92ad5bcc479771d3f8fcb8908b5db1e71acc7bbeacfdb2b89abe91615
 DIST baobab-49.1.tar.xz 611572 BLAKE2B d4c0d52c2d770f612e85550352a41051111e4814e74f679f2bfb56d25857a924dc42fd667642ef404d7b9d08ace5a22119ca53efa79f37d05157443e4219edae SHA512 79b2c47ffa74974c389d9c26a2f4f5c6b41f93def74a7053a46a44742e28b383018667331f5f366d9345f9a2d0c844ababb423c69b0a4006334cadc8e2cfbb37
+DIST baobab-50.0.tar.xz 618484 BLAKE2B 01d3218fd018e73a0fe10e8739fb24958bf6f03b87cefa70a93b5b24365f28e1c242895a30f430887a74964fd8e8f2f0c5c6c38d8a9536ddbdc70f631e6190f7 SHA512 0318c2fc68aa54502f1500b35f44a6378341af189afda3b82e5231f67e079e6c7bd6dcb820254042d69cf211cbcd5db3ce694d61246a2d315dcc500ffa33c4f0
diff --git a/sys-apps/baobab/baobab-48.0.ebuild b/sys-apps/baobab/baobab-50.0.ebuild
index 65435d6911f8..64dc7360c040 100644
--- a/sys-apps/baobab/baobab-48.0.ebuild
+++ b/sys-apps/baobab/baobab-50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,12 +10,12 @@ HOMEPAGE="https://apps.gnome.org/Baobab/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=gui-libs/gtk-4.15.1:4
-	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gui-libs/libadwaita-1.8_alpha:1
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/sys-apps/inxi/inxi-3.3.41.1.ebuild b/sys-apps/inxi/inxi-3.3.41.1.ebuild
index 397f1e28d16c..92085a4ecbe5 100644
--- a/sys-apps/inxi/inxi-3.3.41.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.41.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-lang/perl
 	sys-apps/pciutils
diff --git a/sys-apps/pandora_box/Manifest b/sys-apps/pandora_box/Manifest
index 8cb93f3e2b3c..85f3b6b11cdd 100644
--- a/sys-apps/pandora_box/Manifest
+++ b/sys-apps/pandora_box/Manifest
@@ -1,4 +1,4 @@
-DIST pandora_box-0.21.0-crates.tar.xz 22946408 BLAKE2B aedbc95e0d689e307cc53dd596af05c6be2bc213863986bfd64418483727301989c7175033831f01ab08d8c9d386c0cf512912e20c3af2a4740a86c7cf005ed9 SHA512 bebbe9e94c1aa298c523426c34af615f4bb3bd53317102bd22661e526cb497b68b98aca35e99c3b6b9bbff0ff8747abd1f7d0d7d4410d336109a6c200dce1666
-DIST pandora_box-0.21.0.tar.gz 20694847 BLAKE2B 9ebc369ac81d0f0c774e1a7b09c4a66d5c16c924d3a5d0f1b31faf06f65cdde8db55948fc0ef0a930cb61d3e112798a15e9e10ef86ab56882a27c771f90ce4ad SHA512 378ce3eaa5a348c76e63bc636518218146ce6e9faa91f0ff49678fd5618a7fd7e0c4dbdb9c566d0353ec0ff432dd3eb3a9a45ce5a0aa852f01e2705150993069
 DIST pandora_box-0.22.0-crates.tar.xz 22912104 BLAKE2B 26631264d5debaad1c04d96ce0cca1fada9e6d3634f9dd67df2b3c4d52e04d78dc9ccbf612806ea70520f70d4ac7d910e759e4cd06ef6584d0c9f55a3e667c47 SHA512 650ceb0bd47f6ff03bf66d587750954ab8588f635c2bf4e9961aabd10a0d0713922566d642964437673f260c574b3224519d0ab6bdd05f6fcff09489d194feb4
 DIST pandora_box-0.22.0.tar.gz 20880549 BLAKE2B e9b6674e6d737d3ece593584f4e6cedc6f4288408b86e9c4a0d9ae7aec71a2b4e3bc0eb25015065041b773256a69d09b285c53470ab0190dae50b28d8d8b369e SHA512 25ee47712c9b591a5f6df17a421d1da7da13e62f5c0202b3493fc79a7e3dcba6d7019360d753bc3f668d656c243f8553a93552e1711442539b30bbeac5e67fd4
+DIST pandora_box-0.24.0-crates.tar.xz 16786804 BLAKE2B 365c9787943d302bceb713a25cc3dc9dfa947aa53b0165fe9c23766981715222e0c438630965e4f7ba62ad4b3360e72d043b1736b112ed0c640e992285f08f4b SHA512 dfa4602013b43b18f0baf90cffbefa8a7ac13fd17b3bcf06de65850fa84baeb386da7e6a3a2f03b9bce51f7dbd8f77ea66b834835ff1085e8062c4623b3b2fdf
+DIST pandora_box-0.24.0.tar.gz 8437569 BLAKE2B 847e339645671594f8db13cea007b0d9bc4081056eaea04252b1e22c2fbfd9f8096dd9ed231af0419b2d0fd23d4be9c60cee7fe141435bdd2b1ed5b0fa0923fc SHA512 da40e96fa5645b693e61e9d4276725095559c6fd076ef972e244137915e2f0764359fbb915243bf0009556e44ed04ff044e36ac270a3dc416354b7f6324003b4
diff --git a/sys-apps/pandora_box/pandora_box-0.21.0.ebuild b/sys-apps/pandora_box/pandora_box-0.24.0.ebuild
index c7b2ae1bd346..c7b2ae1bd346 100644
--- a/sys-apps/pandora_box/pandora_box-0.21.0.ebuild
+++ b/sys-apps/pandora_box/pandora_box-0.24.0.ebuild
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index fdf2b975e966..157bab122c1e 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -1,4 +1,4 @@
-DIST syd-3.57.0-crates.tar.xz 23060692 BLAKE2B 1fdc6e3c704a5baadb9e0c6d7484f560afcf2b3fb2c7a478061a63fbe6b3818a3934c920b228aa0c1ba256982ef87355c3882e8f19b0544dc6e2c24c0fd4eed6 SHA512 35b2b7a620cdd5354b62da8dfaf272b9f7ad92b91381b3dd385cf9966e1ae8f386ec803968447d55fbf87b2c4c4e4bf3696f53bbd32fa822e00c059df8db1eb7
-DIST syd-3.57.0.tar.gz 20976212 BLAKE2B 86ac125f56977a19be20ab78a5e7bdce73a7bf3b1ebe67137263f3545ebdf523ffaa223b0c76030efb54d59ebabc5dbb18c2f0add76668407078a91bb3e93cec SHA512 087d022e7a3c4e46033c954520c07358ac457d498c42173d8e8ab3538ebeb70f3396752c9f8c06de18f3da3959ad451095b867fb82ec6ea6f4d65f27d19ef6f7
 DIST syd-3.58.0-crates.tar.xz 17024392 BLAKE2B c8590a1589012c3e25d20dce7a5af7518a944319c34ca1e089705abe1269c1cad45c698bb9c73d693d42ee2a0d134a75ea616a56fd08bd6fe32f242d9fbc5412 SHA512 f9721eaffda4c3293aaa968bbee41d2565b456ce3c5b05c2c75bb97bae5cfb8aca448d0a21a0234601ac42edd936a29dea7bc6d24a039f1b996561300858c2c2
 DIST syd-3.58.0.tar.gz 8152372 BLAKE2B ec8d691845ba1c1baa57a54ce210d3b83a909cbff4312e2b10f28d63bc853637306e6e59a5e994587e3c6f06d58346e9f572475f6fb9a699d74a415b9b8148f9 SHA512 c32bdac008bd2a17f3692a6c52e6f96453b268ac2e71f1748caf5f712a0ad84c4d624a6f9c021d7a1d88d35f3f481ed6d39e6b6c4fc55a58e31deb2b82ad45f0
+DIST syd-3.59.0-crates.tar.xz 16786804 BLAKE2B 365c9787943d302bceb713a25cc3dc9dfa947aa53b0165fe9c23766981715222e0c438630965e4f7ba62ad4b3360e72d043b1736b112ed0c640e992285f08f4b SHA512 dfa4602013b43b18f0baf90cffbefa8a7ac13fd17b3bcf06de65850fa84baeb386da7e6a3a2f03b9bce51f7dbd8f77ea66b834835ff1085e8062c4623b3b2fdf
+DIST syd-3.59.0.tar.gz 8437088 BLAKE2B 6ad185ea0931bd4bffb16085fff6723744e7dc2453e4ba5240ec2f08f08e1dfd4b98bc54e4489cbcc198310ce66b59d527269d8fbc46f5352eea9fdac5a9f49a SHA512 a4f86de7889339c6a92fff568b65a2873be9c8186615b2c37617afa4b5c2a8365fa5c0eb82c0a4895e13feaf812f753bc428c8217434dd2d99aa741d5c62c21d
diff --git a/sys-apps/syd/syd-3.57.0.ebuild b/sys-apps/syd/syd-3.59.0.ebuild
index 39feacf32ba2..39feacf32ba2 100644
--- a/sys-apps/syd/syd-3.57.0.ebuild
+++ b/sys-apps/syd/syd-3.59.0.ebuild
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d3af3a3723d2..33d8fdc4a982 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -34,6 +34,7 @@ DIST gcc-16.2.0-musl-patches-1.tar.xz 3036 BLAKE2B 8545e2499a8af4af9483e0372f253
 DIST gcc-16.2.0-patches-1.tar.xz 22984 BLAKE2B 2d069def99de0c3f1f2d47e5fa9cb6669825588f63f181a9c06af43e77fbf5c8a69b1ab26ae1d236ec030141a7bcb1789266d95845cc879e2765c523f560c266 SHA512 121cabc9a2d0249fb8b3b11185fee4c7f2466b2b460ff7ac0722aec185ba4afb23470cc7592adc2e73bb5f4a6f44ae0155b038b47b18961ecc669f223b1f4f3a
 DIST gcc-16.2.0.tar.xz 107200820 BLAKE2B ab3ffe16e042da767f3f1eac170da518d6d7de3b0f92e068f79e3bf25fdc0bdf56eea0cd586bd4b9b6e9baebadd110c2ebd77b75c99c45853814f4bea5a98ef0 SHA512 c51c30ca7422d0cbecf504b2e0f33c3aca31e0f90a76b65217f465163fa6fa17b3f5de39e145c47e5bab90ac0ce7fff3b03c8d553ae36e01faaea5a50f8648d1
 DIST gcc-17-20260906.tar.xz 100281396 BLAKE2B 758c496b1ad1410479a5108c1d7f7f98b0b1b2962fe1df77e1687ef2d70e21037e422c2a6a4f8fda8b79e568b0f828e7674a7e1fde43df6f1c0ad2486a826fbb SHA512 49db076d7359bd6f08d4cfa04fd380a977e904431fc57d75ca3a06675a83046a61b103c9a48bdcb3972a15a609cb2b33d1a8dd2221540dc88f4ce0814e6b5fdc
+DIST gcc-17-20260913.tar.xz 100376020 BLAKE2B 3c30df5725a8f68487f979dc6f314996dbe52fb2d8ca68c774e4033cdcf02f6011abab9bdbde389e6ca42b07c55acd0e8690d629f8e7d31c603b55006306f55a SHA512 bff2af3d632a6b10e770a567c627f3f50f5dd2406a77133f4ac3822f05ce9a9ee99979a54d3ef09635080d949e992d40fedd29f34e903db8aca6958cdec1b0e9
 DIST gcc-17.0.0-musl-patches-1.tar.xz 3040 BLAKE2B cc39906facd9c395bae9f87c67124066b8081521df39857d752f1e398dca5113240d24a836ca0f793313f954d6c38ff39961bf71a8036a1d5bc62751e71eb7c9 SHA512 4e330ee1c87229ba30644ad7a6841683aba368ce00585b5a7af433f215e248534a8d81f6f95fcf7b348c7d9aeaf1eeae015d76601e3d918a0ca39d94ed7e521c
 DIST gcc-17.0.0-patches-13.tar.xz 23248 BLAKE2B e09e2a4a2e51ad7275fe7d3ac3981d5a9873ce1af1f9de60dde2aa5f3df31ef4d73f48553170333a73251614c9bf666a7a93dadcde59d9dde3a20d8b5b2e902a SHA512 3c1aac5abda361d3407ba02ca19ad24c038671254714e82ec6a96f49286a4c551346eaaa718ae340cbfde6515685e665c91f6252adbfff16322b8dfb70b92e47
 DIST gcc-8.5.0-patches-5.tar.xz 20188 BLAKE2B 45b29161105edc6344bb48f5bdf17e1aad6e8d9edb4d9434816425996c1b12c10f1303963776adad9db866d845f864d80d198a30e35ee6c204ca3659cf7a1401 SHA512 f22ab5d8e3116e2e896a5dcbbf5cef67dc5090182af364ef64fc22d2b28c029da5ed39f126f446721e388e7b6848239d01f5fc0346e49b96d5c04068b557f8f8
diff --git a/sys-devel/gcc/gcc-17.0.0_p20260913.ebuild b/sys-devel/gcc/gcc-17.0.0_p20260913.ebuild
new file mode 100644
index 000000000000..aa8002c82c88
--- /dev/null
+++ b/sys-devel/gcc/gcc-17.0.0_p20260913.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintenance notes and explanations of GCC handling are on the wiki:
+# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc
+
+TOOLCHAIN_HAS_TESTS=1
+PATCH_GCC_VER="17.0.0"
+PATCH_VER="13"
+MUSL_GCC_VER="17.0.0"
+MUSL_VER="1"
+PYTHON_COMPAT=( python3_{13..14} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	[[ ${CHOST} == m68k-* ]] && eapply "${FILESDIR}"/${PN}-15-m68k-workaround.patch
+	eapply_user
+}
diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index 21768f0e5133..ee2e2bae97a8 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -33,6 +33,8 @@ DIST bcachefs-tools-1.39.3.tar.sign 833 BLAKE2B 5d061c8952eb3a4f1525957891babfb9
 DIST bcachefs-tools-1.39.3.tar.zst 3215639 BLAKE2B 1dc891f231ad1206b56dcf200840949bb93a53d3079b3aa9a8a38873e0f5059b37f0c78a5b2b9409349061fa83989bbdd561f9a4ce6ea3ce3e8740ec5707b7ef SHA512 bf90f59110d675606bc8ad5ae2a85a5c022ab419f5acb13ff1297cff9e0270d83b4c6da60e29289f14e2c50a1dffbba05356cb3a48534b77c0611d1400923144
 DIST bcachefs-tools-1.39.5.tar.sign 833 BLAKE2B 79b138ed8a477e33e249f10cca1885a45145b9e5f1a67d445bc877d8536ef64b07f96d238b6be93d86d38c72e5dc1736eec14f25a751a7a7ec286f43d02069c4 SHA512 b21f15f01017269d3481cc035dd7a43bacb4b3107e7a1e9058bb3daa30f47774dbdb53c12bb7032e6f3ed12dbe13b8a9a1eabe7ccd90e1154f9565b6f5c6a33a
 DIST bcachefs-tools-1.39.5.tar.zst 3238396 BLAKE2B 01229450ad212db274f19fc6ab9b831f655032b8a99857ba14b30bdfc6017cbf450c2a6b160ba43deecbbb4533ecbc138bf8d4cacaa93ce30f07c98e19890313 SHA512 b43f7f9e285756419e7f48f62a464607e4ac1ac9d3cd4df91cd3474b3b716fce754d85cc3283dec34fd108f559914137022bbecdcdd6e4eb34b831ea53cb498a
+DIST bcachefs-tools-1.39.6.tar.sign 833 BLAKE2B 9dac61d981c8d0576311bebdc182d9b8b696959717d8f733807e89738be98183ee836a2ea419f0fe1ab375fe86390da03675db8e05cb50a584d0f54293e358f7 SHA512 61690c17a529560bc4928aa22a7005f484539d210d7a49c3bf9162a34f506627cb5952e4a7cf54fa758e7406ce426789bad025e29bed7648c369d5bfda0fae7f
+DIST bcachefs-tools-1.39.6.tar.zst 3243859 BLAKE2B 5504b151bf6a8909ef9576b5dabc3cfcc34983f309e3cb628b85866784f8a33c2ceaec4f9eb20e83a8d818c3d213eb8574b0b7c925eb78f463cf419af78bfc9a SHA512 bd6b055d9a3d707c65f29d8c3b895e4a8282d1525d130fdfa88cfb6cc73117c7b80030e4f65a98384337e21dc7cac656b83dc19997d22b5652d1f1d9ec893b1f
 DIST bindgen-0.69.5.crate 221128 BLAKE2B b89edbf883e1bc11a074c2f37f84bb966749823a6408b9765d6a61ee1179451d67dadde41d27838e8ddc6172dee9c342429f42fbe6959ff9fd7dcbc73d7506ea SHA512 b232b906af7535f8b87198f0a4037a0f09af367e0c913575f3d16453a2c272e7d76033cb3fd12d4223ebda4a0f8130629e67c5883e026a2422db3e0659ed3c3f
 DIST bindgen-0.72.1.crate 246071 BLAKE2B b6db53ca86fa3b5f71abbf6d2fd5f83553e167507db2e869ed7f3acf8865478e49430eddce8c255a8fabf8f6e408e7dcc78a9088201cdeea1e48bc387f8a6f28 SHA512 14f4277b62cfc91661400ed1bacb82a9f28b7e6caa17dd4bb4dbeedd5784299d5915c2235af9da42a8a216fa0b14b49f1e38eaa530f1e906bcd74f864ae8a7e2
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.39.6.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.39.6.ebuild
new file mode 100644
index 000000000000..04bda60e7b1f
--- /dev/null
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.39.6.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.4
+	android_system_properties@0.1.5
+	anstream@1.0.0
+	anstyle-parse@1.0.0
+	anstyle-query@1.1.5
+	anstyle-wincon@3.0.11
+	anstyle@1.0.14
+	anyhow@1.0.103
+	arbitrary@1.4.2
+	ascii@1.1.0
+	autocfg@1.5.1
+	bindgen@0.72.1
+	bitfield@0.14.0
+	bitflags@1.3.2
+	bitflags@2.13.0
+	bumpalo@3.19.1
+	bytemuck@1.25.0
+	bytemuck_derive@1.10.2
+	cc@1.2.66
+	cexpr@0.6.0
+	cfg-if@1.0.4
+	cfg_aliases@0.2.1
+	chrono@0.4.45
+	chunked_transfer@1.5.0
+	clang-sys@1.8.1
+	clap@4.6.1
+	clap_builder@4.6.0
+	clap_complete@4.5.33
+	clap_derive@4.6.1
+	clap_lex@1.1.0
+	clipboard-win@5.4.1
+	colorchoice@1.0.5
+	core-foundation-sys@0.8.7
+	crossterm@0.29.0
+	derive_arbitrary@1.4.2
+	dissimilar@1.0.11
+	document-features@0.2.12
+	either@1.16.0
+	endian-type@0.1.2
+	env_logger@0.10.2
+	equivalent@1.0.2
+	errno@0.3.14
+	error-code@3.3.2
+	fd-lock@4.0.4
+	find-msvc-tools@0.1.9
+	fuser@0.17.0
+	getrandom@0.4.3
+	glob@0.3.3
+	hashbrown@0.17.1
+	heck@0.5.0
+	hermit-abi@0.3.9
+	home@0.5.11
+	httpdate@1.0.3
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.65
+	indexmap@2.14.0
+	io-lifetimes@1.0.11
+	is_terminal_polyfill@1.70.2
+	itertools@0.12.1
+	itoa@1.0.18
+	js-sys@0.3.85
+	libc@0.2.189
+	libloading@0.8.5
+	libudev-sys@0.1.4
+	linux-raw-sys@0.12.1
+	litrs@1.0.0
+	lock_api@0.4.14
+	log@0.4.33
+	memchr@2.8.3
+	memoffset@0.9.1
+	minimal-lexical@0.2.1
+	mio@1.2.1
+	nibble_vec@0.1.0
+	nix@0.30.1
+	nom@7.1.3
+	num-traits@0.2.19
+	num_enum@0.7.5
+	num_enum_derive@0.7.5
+	once_cell@1.21.4
+	once_cell_polyfill@1.70.2
+	owo-colors@4.1.0
+	page_size@0.6.0
+	parking_lot@0.12.5
+	parking_lot_core@0.9.12
+	paste-test-suite@0.0.0
+	paste@1.0.15
+	pkg-config@0.3.33
+	prettyplease@0.2.37
+	proc-macro-crate@3.5.0
+	proc-macro2@1.0.106
+	quote@1.0.46
+	r-efi@6.0.0
+	radix_trie@0.2.1
+	redox_syscall@0.5.18
+	ref-cast-impl@1.0.25
+	ref-cast@1.0.25
+	regex-automata@0.4.14
+	regex-syntax@0.8.11
+	regex@1.12.4
+	rustc-demangle@0.1.27
+	rustc-hash@2.1.2
+	rustix@1.1.4
+	rustversion@1.0.22
+	rustyline@17.0.2
+	scopeguard@1.2.0
+	serde@1.0.228
+	serde_core@1.0.228
+	serde_derive@1.0.228
+	serde_json@1.0.150
+	serde_spanned@1.1.1
+	serde_test@1.0.177
+	shlex@1.3.0
+	shlex@2.0.1
+	signal-hook-mio@0.2.5
+	signal-hook-registry@1.4.8
+	signal-hook@0.3.18
+	smallvec@1.15.2
+	strsim@0.11.1
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@2.0.118
+	target-triple@1.0.0
+	termcolor@1.4.1
+	terminal_size@0.4.4
+	tiny_http@0.12.0
+	toml@1.0.6+spec-1.1.0
+	toml_datetime@1.1.1+spec-1.1.0
+	toml_edit@0.25.10+spec-1.1.0
+	toml_parser@1.1.2+spec-1.1.0
+	toml_writer@1.1.1+spec-1.1.0
+	trybuild@1.0.116
+	udev@0.9.3
+	unicode-ident@1.0.24
+	unicode-segmentation@1.13.3
+	unicode-width@0.2.2
+	utf8parse@0.2.2
+	uuid@1.23.4
+	wasi@0.11.1+wasi-snapshot-preview1
+	wasm-bindgen-macro-support@0.2.108
+	wasm-bindgen-macro@0.2.108
+	wasm-bindgen-shared@0.2.108
+	wasm-bindgen@0.2.108
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.11
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-core@0.62.2
+	windows-implement@0.60.2
+	windows-interface@0.59.3
+	windows-link@0.2.1
+	windows-result@0.4.1
+	windows-strings@0.5.1
+	windows-sys@0.48.0
+	windows-sys@0.59.0
+	windows-sys@0.60.2
+	windows-sys@0.61.2
+	windows-targets@0.48.5
+	windows-targets@0.52.6
+	windows-targets@0.53.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_gnullvm@0.53.1
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.6
+	windows_aarch64_msvc@0.53.1
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.6
+	windows_i686_gnu@0.53.1
+	windows_i686_gnullvm@0.52.6
+	windows_i686_gnullvm@0.53.1
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.6
+	windows_i686_msvc@0.53.1
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnu@0.53.1
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_gnullvm@0.53.1
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.6
+	windows_x86_64_msvc@0.53.1
+	winnow@0.7.15
+	winnow@1.0.3
+	zerocopy-derive@0.8.53
+	zerocopy@0.8.53
+	zeroize@1.9.0
+	zeroize_derive@1.5.0
+	zmij@1.0.21
+"
+
+LLVM_COMPAT=( {17..21} )
+MODULES_INITRAMFS_IUSE=+initramfs
+MODULES_KERNEL_MIN=6.16
+MODULES_OPTIONAL_IUSE=+modules
+PYTHON_COMPAT=( python3_{13..14} )
+RUST_MIN_VER="1.85.0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
+
+inherit cargo flag-o-matic linux-mod-r1 llvm-r2 python-any-r1
+inherit shell-completion sysroot toolchain-funcs unpacker verify-sig
+
+DESCRIPTION="Tools for bcachefs"
+HOMEPAGE="https://bcachefs.org/"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
+else
+	SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst
+		${CARGO_CRATE_URIS}
+	"
+	SRC_URI+=" verify-sig? ( https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="GPL-2"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
+SLOT="0"
+IUSE="debug llvm-libunwind verify-sig"
+RESTRICT="test"
+
+DEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libaio
+	dev-libs/libsodium:=
+	dev-libs/userspace-rcu:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	virtual/udev
+	virtual/zlib:=
+"
+
+RDEPEND="${DEPEND}"
+
+# Clang is required for bindgen
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/docutils[${PYTHON_USEDEP}]
+	')
+	$(unpacker_src_uri_depends)
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+	elibc_musl? ( >=sys-libs/musl-1.2.5 )
+	virtual/pkgconfig
+	modules? (
+		dev-util/bindgen
+		>=sys-kernel/linux-headers-6.16.0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 )
+"
+
+PATCHES=(
+	# https://github.com/koverstreet/bcachefs-tools/pull/894
+	"${FILESDIR}/${PN}-1.39.3-probe-rust-src.patch"
+)
+
+QA_FLAGS_IGNORED="/sbin/bcachefs"
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r2_pkg_setup
+	python-any-r1_pkg_setup
+	rust_pkg_setup
+	if use modules; then
+		# grep -r 'depends on\|select ' ${S}/libbcachefs/Kconfig | grep -v '^#'
+		local CONFIG_CHECK="
+			!BCACHEFS_FS
+			BLOCK
+			EXPORTFS
+			CRC32
+			CRC64
+			FS_POSIX_ACL
+			LZ4_COMPRESS
+			LZ4_DECOMPRESS
+			LZ4HC_COMPRESS
+			ZLIB_DEFLATE
+			ZLIB_INFLATE
+			ZSTD_COMPRESS
+			ZSTD_DECOMPRESS
+			CRYPTO_LIB_SHA256
+			CRYPTO_LIB_CHACHA
+			CRYPTO_LIB_POLY1305
+			KEYS
+			RAID6_PQ
+			RUST
+			XOR_BLOCKS
+			XXHASH
+			SYMBOLIC_ERRNAME
+		"
+		use debug && CONFIG_CHECK+="
+			DEBUG_INFO
+			FRAME_POINTER
+			!DEBUG_INFO_REDUCED
+		"
+		linux-mod-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		S="${S}/src" cargo_live_src_unpack
+	else
+		# Upstream signs the uncompressed tarball
+		if use verify-sig; then
+			einfo "Unpacking ${P}.tar.zst ..."
+			verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+				< <(zstd -fdc "${DISTDIR}"/${P}.tar.zst | tee >(tar -xf -))
+			assert "Unpack failed"
+		fi
+		unpacker ${P}.tar.zst
+		cargo_src_unpack
+	fi
+
+}
+
+src_prepare() {
+	default
+	tc-export CC
+
+	echo "${PV}" > .version || die
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-i Makefile || die
+
+	if use llvm-libunwind; then
+		sed -i s/libunwind// Makefile || die
+	fi
+
+	append-lfs-flags
+}
+
+src_configure() {
+	cargo_src_configure
+
+	MODULE_SRC="module/${PN%-*}-${PV}"
+	use modules && emake DESTDIR="${WORKDIR}" DKMSDIR="/${MODULE_SRC}" install_dkms
+}
+
+src_compile() {
+	export BUILD_VERBOSE=1
+	export VERSION=${PV}
+
+	local modlist=( "bcachefs=:../${MODULE_SRC}:../${MODULE_SRC}/src/fs/bcachefs" )
+	local modargs=(
+		KDIR=${KV_OUT_DIR}
+	)
+
+	# Makefile calls `cargo` directly, so make sure we set our rustflags (etc)
+	cargo_env emake bcachefs || die
+	use modules && linux-mod-r1_src_compile
+
+	# Recent versions mangle the 'bcachefs' symbolic link, work around it.
+	[[ -e bcachefs ]] && die "bcachefs symlink is valid, please remove workaround"
+	ln -rsf target/release/bcachefs bcachefs || die
+
+	local shell
+	for shell in bash fish zsh; do
+		sysroot_try_run_prefixed ./bcachefs completions ${shell} > ${shell}.completion || die
+	done
+}
+
+src_install() {
+	into /
+	dosbin bcachefs
+
+	dosym bcachefs /sbin/fsck.bcachefs
+	dosym bcachefs /sbin/mkfs.bcachefs
+	dosym bcachefs /sbin/mount.bcachefs
+
+	# Uses a crate-based implementation of FUSE, no dependency on sys-fs/fuse and unconditionally included.
+	dosym bcachefs /sbin/fsck.fuse.bcachefs
+	dosym bcachefs /sbin/mkfs.fuse.bcachefs
+	dosym bcachefs /sbin/mount.fuse.bcachefs
+
+	newbashcomp bash.completion bcachefs
+	newfishcomp fish.completion bcachefs.fish
+	newzshcomp zsh.completion _bcachefs
+
+	doman bcachefs.8
+
+	use modules && linux-mod-r1_src_install
+}
diff --git a/sys-kernel/dracut/dracut-112.ebuild b/sys-kernel/dracut/dracut-112.ebuild
index 569f521e8221..fe6819b9b061 100644
--- a/sys-kernel/dracut/dracut-112.ebuild
+++ b/sys-kernel/dracut/dracut-112.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/dracut-ng/dracut"
 else
 	if [[ "${PV}" != *_rc* ]]; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 	fi
 	SRC_URI="https://github.com/dracut-ng/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 fi
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 75ec71471f7b..b5cef0bd7d9f 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,3 +1,4 @@
 DIST linux-7.2.tar.xz 160068116 BLAKE2B cf5f3d87b96f223034c47c6e5fc972fe52c2556310eb2f064632537b8727231135a8540179fd5d51343738c8a51f51f09c7e8da374324b68551c84a4124bb71b SHA512 47e63679363261a864d271277340a6f2d45f544e1a056be4159df081f4f6537d0efa865c4af26611ab33a3079ee65db88ec2f6bc0e5fff43e0c043cde0cd91e1
 DIST patch-7.3-rc1.patch 60208373 BLAKE2B d4852de17810f4ff0f2406c4a4c40a551c662d935bbadac8e103a49f641ebebda9f23a84d9874eefde67d287647a9e3edc5961bc6b7b3de1231e5a049b099bff SHA512 999821c0605c73446ef0d538b6ca09c1bfd6433614fb03b1cda02a3297e4bf6f00703ceb50c588c305b10e2422d1265272de60587972e56d0ad2a9fca35e18dd
 DIST patch-7.3-rc2.patch 61164649 BLAKE2B edd6b6569a52ac8a0435714e22ad95b726a84ad5d62cd3869f8a9892ba3e81723dbb00dc3182d4c54de47d6dff328dd64c0d280f6f5b3b7ffb15c97874cb960c SHA512 a6aab4fad3308e30ac9394244575469921de6ccf48cca0814af651b8eb8669cbe4dbdcd409878b9a828538b55e8803327f2aad34aacc01aa3174665555283bdf
+DIST patch-7.3-rc3.patch 62002991 BLAKE2B e32eb54d83cae41de0bb31ebba3e64125e485121495fcfdcc3dce0aa50b152a4a9b385db9eca9c108989fb67262c624af9a02f565ba73d3dcc61c78d864ff1af SHA512 94203248a0b37f82bfc779e122ffdac6ce555f8ab0be2e806d3a7ab1bc7cdfb23e5ce8b8a8309a6eda7b9d04e444c2732dc543bbc0c7ff09006b59add6f37af8
diff --git a/sys-kernel/git-sources/git-sources-7.3_rc3.ebuild b/sys-kernel/git-sources/git-sources-7.3_rc3.ebuild
new file mode 100644
index 000000000000..60499f05ca99
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-7.3_rc3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="7.2"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+DEPEND="${RDEPEND}
+	sys-devel/patch"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-process/runit/runit-2.3.1.ebuild b/sys-process/runit/runit-2.3.1.ebuild
index a59128814b47..05952b47342a 100644
--- a/sys-process/runit/runit-2.3.1.ebuild
+++ b/sys-process/runit/runit-2.3.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/admin/${P}/
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="+scripts split-usr system-init static"
 
 src_unpack() {
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 46da86e037b3..aff31ed48783 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,4 @@
 DIST phpsysinfo-3.4.4.tar.gz 1109842 BLAKE2B ef192c27e6aff9c95a05b68780287c9118d79df8e95cb04447ab82fd3334dc18b0b790a1b66c903532a259a2243145fd03f8b746502072055c5beeec32e1d36b SHA512 0f2a6be998eb624ff473a9571f4975c2da8909e2f60826b0c713d781e22cd963fd864ce7bd97992321f86b0d69efb123caeeb24603dbd2223a9986d5e6e8720c
 DIST phpsysinfo-3.4.5.tar.gz 1110342 BLAKE2B 7f9a5977cb223dbbfa7d599efa2fbb09c4c323b16c4aeca38d20916ce930ba0b6fe4e20c1293df204817c3e42b33086a436554606c37c2c422e7d424029f76fb SHA512 3e06eb54b4a42874930a9f4a95a5a6ffbad115007d297d528c606a8bd74eec5d9f9ff892a3c75959a1c500a3e323f2e5ead1b3a67a35abdea9d241fea072dcff
 DIST phpsysinfo-3.4.6.tar.gz 1112895 BLAKE2B 6b54fcd32dfc87162b89e298946a1fe2116579600057047652e6a5745e56a33ad93d122c5859274a780a6b6db8f5e4f3149c89e81217b3059a599eaad3bfcb10 SHA512 b9fafa7c36498103f61272689c2b3f9744a914a9584dbd844fcc58d5fca834cec2215ad643f5b0319e93450eb700cbb8b27e4683d82ae132ec4bdd5d89c9cabd
+DIST phpsysinfo-3.4.7.tar.gz 1094330 BLAKE2B e632b45d1bf30a498993620d58cfe4d7e574c51880fe9f1d9aea8123f5b0ee621a153dcdd6ab0be1761bd1ab6999cff804f485d6f5439f89e79afac5e50aab22 SHA512 33ad1d8b0c0645c521f07c93cde517e7e2faac583b61c3cbc373e5c7f2d9a2289b14ff7f3890843ebc647d595ae562717e5988aa089ccfe573170db6f9d66723
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.4.7.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.4.7.ebuild
new file mode 100644
index 000000000000..95289d1e13a6
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.4.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature webapp
+
+DESCRIPTION="A customizable PHP script that displays information about your system nicely"
+HOMEPAGE="https://phpsysinfo.github.io/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+RDEPEND="
+	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore || die
+
+	mv phpsysinfo.ini{.new,} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	optfeature "showing disk temperatures." app-admin/hddtemp
+	optfeature "showing system uptime." app-misc/uptimed
+	optfeature "showing snmp statistics." net-analyzer/net-snmp
+	optfeature "showing iptables rules." net-firewall/iptables
+	optfeature "showing ipmi sensors." sys-apps/ipmitool
+	optfeature "showing ipmi sensors." sys-apps/ipmiutil
+	optfeature "showing system sensors." sys-apps/lm-sensors
+	optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
+	optfeature "showing lsi raid controller health." sys-block/megactl
+	optfeature "showing fake raid statistics." sys-fs/dmraid
+	optfeature "showing software raid statistics." sys-fs/mdadm
+	optfeature "showing quota information." sys-fs/quota
+	optfeature "showing ipmi sensors." sys-libs/freeipmi
+	optfeature "showing apc ups statistics." sys-power/apcupsd
+	optfeature "showing ups statistics." sys-power/nut
+}
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index c6fe01582729..10a06286faa1 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1 +1,2 @@
 DIST epiphany-49.8.1.tar.xz 4241048 BLAKE2B b069a3d6bc02688914b9f8a7118e7387008562d75014bb87a418fd6d62d30eadd69c1cf33b355ba6d73cc6440cdd45c3844e0b377ea17d2cd759014852cf45ca SHA512 b8b14185549d9c745d8019f987184000b32057a1fa612b266a36e01ad06b7e19fa8779d50f119ec8628d0708e479d456b5c1d86655e9cca6b11ac2bdbfdc0214
+DIST epiphany-50.6.tar.xz 4577640 BLAKE2B 46a11b570ed264deff621e4721f4962184123dac2dfe0ada541125e786602b0780af0228c47deea1f09889d9090e77e0e8587eb374c688f690f7a41e813ad9cf SHA512 f4676af5582b01bf799ebe126d4989ea031e5fb2b8a411b4238b59b8d412893f3ad7f1b8b0efb58e8569d36eb904fa24e438c22642df6e6ee3c89d53036341c3
diff --git a/www-client/epiphany/epiphany-50.6.ebuild b/www-client/epiphany/epiphany-50.6.ebuild
new file mode 100644
index 000000000000..09da2fe05084
--- /dev/null
+++ b/www-client/epiphany/epiphany-50.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://apps.gnome.org/Epiphany/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test selinux"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.9.0:4=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=dev-libs/glib-2.78.0:2
+	gnome-base/gsettings-desktop-schemas
+	media-libs/gstreamer:1.0
+	>=gui-libs/gtk-4.21.0:4
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.6
+	app-arch/libarchive:=
+	>=gui-libs/libadwaita-1.8_alpha:1
+	>=app-crypt/libsecret-0.19
+	>=net-libs/libsoup-2.99.4:3.0
+	>=dev-libs/libxml2-2.6.12:2=
+	>=dev-libs/nettle-3.4:=
+	>=dev-libs/libportal-0.6:0=[gtk]
+	>=dev-db/sqlite-3.22:3
+	>=net-libs/webkit-gtk-2.43.4:6
+
+	dev-libs/gmp:0=
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	selinux? ( sec-policy/selinux-mozilla )
+"
+# appstream-glib needed for appdata.xml gettext translation
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/blueprint-compiler
+	dev-python/docutils
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Test not ready to be run in sandboxed systems, also need
+	# mesa[zink]. Skip, as done by Debian.
+	# https://bugs.gentoo.org/928015
+	# https://bugs.gentoo.org/847862
+	# https://gitlab.gnome.org/GNOME/epiphany/-/issues/2209
+	# https://gitlab.gnome.org/GNOME/epiphany/-/issues/2271
+	"${FILESDIR}/${PN}-46.2-disable-web-view-test.patch"
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Dtech_preview=false
+		$(meson_feature test unit_tests)
+		-Dgranite=disabled
+		-Dman-pages=enabled
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/www-client/opera/opera-135.0.5973.133.ebuild b/www-client/opera-developer/opera-developer-137.0.6010.1-r1.ebuild
index f060274f226d..6167b3dd6c49 100644
--- a/www-client/opera/opera-135.0.5973.133.ebuild
+++ b/www-client/opera-developer/opera-developer-137.0.6010.1-r1.ebuild
@@ -31,7 +31,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # or use Chromicler to handle bumps.
 # Does not _need_ to be updated for every new version of Opera, only when it breaks.
-CHROMIUM_VERSION="142"
+CHROMIUM_VERSION="152"
 SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}"
 S=${WORKDIR}
 
diff --git a/www-client/opera-developer/opera-developer-137.0.6010.1.ebuild b/www-client/opera-developer/opera-developer-137.0.6015.0-r1.ebuild
index 810483f55c04..6167b3dd6c49 100644
--- a/www-client/opera-developer/opera-developer-137.0.6010.1.ebuild
+++ b/www-client/opera-developer/opera-developer-137.0.6015.0-r1.ebuild
@@ -31,7 +31,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # or use Chromicler to handle bumps.
 # Does not _need_ to be updated for every new version of Opera, only when it breaks.
-CHROMIUM_VERSION="151"
+CHROMIUM_VERSION="152"
 SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}"
 S=${WORKDIR}
 
diff --git a/www-client/opera-developer/opera-developer-137.0.6015.0.ebuild b/www-client/opera/opera-135.0.5973.133-r1.ebuild
index 810483f55c04..2348f489c77e 100644
--- a/www-client/opera-developer/opera-developer-137.0.6015.0.ebuild
+++ b/www-client/opera/opera-135.0.5973.133-r1.ebuild
@@ -31,7 +31,7 @@ fi
 # Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version
 # or use Chromicler to handle bumps.
 # Does not _need_ to be updated for every new version of Opera, only when it breaks.
-CHROMIUM_VERSION="151"
+CHROMIUM_VERSION="150"
 SRC_URI="${SRC_URI_BASE[*]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}"
 S=${WORKDIR}
 
diff --git a/x11-libs/cairo/cairo-1.18.4-r1.ebuild b/x11-libs/cairo/cairo-1.18.4-r1.ebuild
index 3b59341e5b52..03e61c232784 100644
--- a/x11-libs/cairo/cairo-1.18.4-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.18.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
-inherit meson-multilib python-any-r1
+inherit flag-o-matic meson-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -54,6 +54,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-respect-fontconfig.patch
 )
 
+src_configure() {
+	# Upstream build w/ -fno-strict-aliasing but >= GCC 17 makes
+	# -Werror=strict-aliasing (set by the user here) effective even with
+	# that, so disable both rather than just the error to be safe.
+	append-flags $(test-flags-CC -fno-strict-aliasing -Wno-error=strict-aliasing)
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddwrite=disabled
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index e38267e8bd12..768b684b75b4 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
-inherit meson-multilib python-any-r1
+inherit flag-o-matic meson-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -54,6 +54,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-respect-fontconfig.patch
 )
 
+src_configure() {
+	# Upstream build w/ -fno-strict-aliasing but >= GCC 17 makes
+	# -Werror=strict-aliasing (set by the user here) effective even with
+	# that, so disable both rather than just the error to be safe.
+	append-flags $(test-flags-CC -fno-strict-aliasing -Wno-error=strict-aliasing)
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddwrite=disabled
diff --git a/x11-libs/qtermwidget/qtermwidget-2.4.0.ebuild b/x11-libs/qtermwidget/qtermwidget-2.4.0.ebuild
index c6b5c5559e8d..a2c95758698a 100644
--- a/x11-libs/qtermwidget/qtermwidget-2.4.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-2.4.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 298ac984dd76..9e38c9f64594 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,2 +1,2 @@
-DIST vte-0.82.3.tar.xz 6141808 BLAKE2B 069c660d2018685bdc748931ffe88299e071bdd68925c6fd92ac43eef8667dd52c0911f66dbb59e6f98a240cb583c102fccb8797d5443e9b1ea83c773f38224b SHA512 4b03ff539ea0240b2fe814c4523da248e9b201beb68439990f9590fd8f75024e869e06bf07c2afc06258b588b6750bdb776a1505662c991fddced39adbed15d8
 DIST vte-0.82.4.tar.xz 6148520 BLAKE2B 9b88ea5b589c9a03db0e8673e5c24dd848c0056585384cbf3337e56fc6361aa6c4db2528f6a698b4542c03ccca65a809ea50e3e6775d5d2e900b8868c6f3b73d SHA512 6fde14edfdc25aa65f6993ed513dfd40d55222a09f079bd97e57b7f40c52a224a5e92cdbe590b7ae41d4a4c16645d8aa0e6a904bc5673ab632d4bba8a5618488
+DIST vte-0.84.1.tar.xz 6709136 BLAKE2B 4bc482451287faa5194edaee72004d10ec441ed750491b475a6b5b99e5328946d3eee96a992ec33b4b90bda31fe0fac81d8d0f2a7c33c1a7ff2a0030d2e9913c SHA512 34ac77e712b12b62518a09122ce36c816e4c14a53b01be55f233c8749dd234b6b60a9ab47730e34be44fef1994364002a5f31a0af937e95ed1804752a8dd645e
diff --git a/x11-libs/vte/files/vte-0.84.0-musl-W_EXITCODE.patch b/x11-libs/vte/files/vte-0.84.0-musl-W_EXITCODE.patch
new file mode 100644
index 000000000000..cd0239b5a230
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.84.0-musl-W_EXITCODE.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+https://bugs.gentoo.org/835489
+https://bugs.gentoo/org/554416
+
+From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001
+From:
+Date: Fri, 12 Mar 2021 08:41:13 -0600
+Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility
+
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -20,8 +20,6 @@
+ 
+ #include "widget.hh"
+ 
+-#include <sys/wait.h> // for W_EXITCODE
+-
+ #include <exception>
+ #include <new>
+ #include <string>
+@@ -993,7 +993,7 @@ Widget::dispose() noexcept
+         }
+ 
+         if (m_terminal->terminate_child()) {
+-                int status = W_EXITCODE(0, SIGKILL);
++                int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig)
+                 emit_child_exited(status);
+         }
+ }
+
diff --git a/x11-libs/vte/vte-0.82.4.ebuild b/x11-libs/vte/vte-0.82.4.ebuild
index 13f32b9e5705..53cd77c25ea4 100644
--- a/x11-libs/vte/vte-0.82.4.ebuild
+++ b/x11-libs/vte/vte-0.82.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{13..14} )
 
 inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
@@ -63,6 +64,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream build w/ -fno-strict-aliasing but >= GCC 17 makes
+	# -Werror=strict-aliasing (set by the user here) effective even with
+	# that, so disable both rather than just the error to be safe.
+	append-flags $(test-flags-CC -fno-strict-aliasing -Wno-error=strict-aliasing)
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto
 
diff --git a/x11-libs/vte/vte-0.82.3.ebuild b/x11-libs/vte/vte-0.84.1.ebuild
index 13f32b9e5705..912fcfa2a0f3 100644
--- a/x11-libs/vte/vte-0.82.3.ebuild
+++ b/x11-libs/vte/vte-0.84.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{13..14} )
 
 inherit flag-o-matic gnome.org meson python-any-r1 vala xdg
@@ -13,7 +14,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/vte"
 LICENSE="LGPL-3+ GPL-3+"
 
 SLOT="2.91"      # vte_api_version in meson.build
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
@@ -55,7 +56,7 @@ src_prepare() {
 	use vala && vala_setup
 	xdg_environment_reset
 
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.84.0-musl-W_EXITCODE.patch
 
 	# -Ddebug option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
 	sed -e '/ggdb3/d' -i meson.build || die
@@ -63,6 +64,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream build w/ -fno-strict-aliasing but >= GCC 17 makes
+	# -Werror=strict-aliasing (set by the user here) effective even with
+	# that, so disable both rather than just the error to be safe.
+	append-flags $(test-flags-CC -fno-strict-aliasing -Wno-error=strict-aliasing)
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto
 
diff --git a/x11-terms/wezterm/wezterm-20260616.002039.ebuild b/x11-terms/wezterm/wezterm-20260616.002039.ebuild
index 71e85e1d11a4..8a1ce3b6b03b 100644
--- a/x11-terms/wezterm/wezterm-20260616.002039.ebuild
+++ b/x11-terms/wezterm/wezterm-20260616.002039.ebuild
@@ -163,7 +163,7 @@ pkg_postinst() {
 	einfo "https://wezfurlong.org/wezterm/faq.html?highlight=xcursor_theme#i-use-x11-or-wayland-and-my-mouse-cursor-theme-doesnt-seem-to-work"
 	einfo "It may be necessary to set the environment variable XCURSOR_PATH"
 	einfo "to the directory containing the cursor icons, for example"
-	einfo 'export XCURSOR_PATH="/usr/share/cursors/xorg-x11/"'
+	einfo 'export XCURSOR_PATH="/usr/share/icons"'
 	einfo "before starting the wayland or X11 window compositor to avoid the error:"
 	einfo "ERROR  window::os::wayland::frame > Unable to set cursor to left_ptr: cursor not found"
 	einfo "For example, in the file ~/.wezterm.lua:"
diff --git a/xfce-base/thunar/thunar-4.21.6.ebuild b/xfce-base/thunar/thunar-4.21.6.ebuild
index da645bd6b0f5..575368ae4a5c 100644
--- a/xfce-base/thunar/thunar-4.21.6.ebuild
+++ b/xfce-base/thunar/thunar-4.21.6.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	>=xfce-base/libxfce4ui-4.21.8:=
 	>=xfce-base/libxfce4util-4.17.2:=
 	>=xfce-base/xfconf-4.12.0:=
-	exif? ( >=media-libs/gexiv2-0.14.0 )
+	exif? ( >=media-libs/gexiv2-0.14.0:0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
 	libcanberra? ( >=media-libs/libcanberra-0.30 )
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
author	root <root@alpha.trunkmasters.com>	2026-09-14 03:04:42 -0500
committer	root <root@alpha.trunkmasters.com>	2026-09-14 03:04:42 -0500
commit	d09313d7f2546bde376a20ff739a5e90cb229e25 (patch)
tree	a409e87d73f1fd8dc145a1210d1a44bb1b1982c7
parent	98066fc1faacac449ddea472e456f23ad0e2a515 (diff)
download	srcux-d09313d7f2546bde376a20ff739a5e90cb229e25.tar.gz srcux-d09313d7f2546bde376a20ff739a5e90cb229e25.tar.xz srcux-d09313d7f2546bde376a20ff739a5e90cb229e25.zip