Adding metadata

author: root <root@alpha.trunkmasters.com> 2026-09-07 03:05:50 -0500
committer: root <root@alpha.trunkmasters.com> 2026-09-07 03:05:50 -0500
commit: 8453817910bc2afbb7ab1fbf61c3f06fb7320f35 (patch)
tree: 3d107194f4fc4d247ed6c21875e9dff4562e22e1
parent: e3ac4a99dbb849deb8dd15df4be98e6e14d55ab5 (diff)
download: srcux-8453817910bc2afbb7ab1fbf61c3f06fb7320f35.tar.gz
srcux-8453817910bc2afbb7ab1fbf61c3f06fb7320f35.tar.xz
srcux-8453817910bc2afbb7ab1fbf61c3f06fb7320f35.zip
215 files changed, 2542 insertions, 4325 deletions
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 5c95fa309c6e..3f3e900ffd32 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1,4 @@
 DIST at-spi2-core-2.58.6.tar.xz 589008 BLAKE2B 5940283d8c1c0ee819df48f66e3ad50a1e7ed2f3ad8ef5daa0dd2753da2e2f0ddfc9b75fd420309bfd1633b7fca72eeec3206671a55c3ac39bdf2ba80958e895 SHA512 4b26c4bac5ae99596fbde39f5fdce91fc3f47bc033f37be3ae354f0bb3c44ffeaeaf9b75e43c2fdc715aaa24536f44a353a4e03ccaf45c69d618d99f621a3c92
 DIST at-spi2-core-2.58.8.tar.xz 589752 BLAKE2B 58038b3e16ba9e752091351d0dceab3e622ba01f4cdd7afafe5b22a7489ee8a8df9865512ed1da1b6913a2361b345b8a78e7436e6a1b65f0a6da0f2ee4fc8639 SHA512 f5f504db3b3c25718a83b0151bf831c3fb5e6d1193c12d16bc38cf9c00ff4107242ebbfcc787e6b2f340c287802e5e158ee1fafefe8e9f880086a5291c7f8339
 DIST at-spi2-core-2.60.5.tar.xz 599736 BLAKE2B 94ad495d97b3c43410a2720e341fd90b91b5b33623b2b07abe849e72af874426fd50e92e75e8aecc16f3e5ae7463fa57f3654ca6f5f9293996849a77a7c0e526 SHA512 175811b9ca918908583699ca83e8ec8ec758581da58969e7c2058b3a0ab11179c5361bec035c2a80dbfa77bd10051b1cc947c8851258fac1cb0d8547a4f75342
+DIST at-spi2-core-2.60.6.tar.xz 599128 BLAKE2B f88b4ac1e84a151d925b55c45a9747ae0ad598e432e2128a03ffd6d08e68242bc3b67d1214a14f6234f51193da24ff3a6c1ec081b52a07d87a74f66bc99ef73e SHA512 ed69347a002b805358f05875edff2e2a8ac7b8a64219c820f22ecc3ea7c59f47bf6b6440045bfc9771219223c527c78c0edbdf11fe62083abd3cada96f0f4769
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.58.8.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.58.8.ebuild
index 7e808c94f74b..4281f827feb1 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.58.8.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.58.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/at-spi2-core"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="X dbus-broker gtk-doc +introspection systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.60.6.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.60.6.ebuild
new file mode 100644
index 000000000000..89001c6fca0a
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.60.6.ebuild
@@ -0,0 +1,89 @@
+# 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 meson-multilib python-r1 systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/at-spi2-core"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="X dbus-broker dbus-glib gtk-doc +introspection systemd"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dbus-broker? ( systemd )
+	gtk-doc? ( X )
+"
+
+DEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	dbus-glib? ( >=dev-libs/dbus-glib-0.104[${MULTILIB_USEDEP}] )
+	>=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1:2=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXres
+	)
+
+	!<dev-libs/atk-2.46.0
+"
+RDEPEND="${DEPEND}
+	dbus-broker? ( sys-apps/dbus-broker )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-python/sphinx
+		dev-util/gdbus-codegen
+		>=dev-util/gi-docgen-2021.1
+	)
+	${PYTHON_DEPS}
+	test? ( dev-python/pygobject[${PYTHON_USEDEP}] )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	python_setup
+
+	local emesonargs=(
+		-Ddefault_bus=$(usex dbus-broker dbus-broker dbus-daemon)
+		$(meson_use systemd use_systemd)
+		-Dgtk2_atk_adaptor=true
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_feature introspection)
+		$(meson_feature X x11)
+		-Datk_only=false
+		-Dpython="${EPYTHON}"
+		$(meson_feature dbus-glib dbus_glib)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# Avoid locales using commas as decimal separators and breaking some
+	# tests
+	LC_ALL=C.UTF-8 virtx dbus-run-session meson test -C "${BUILD_DIR}" --print-errorlogs || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_optimize
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/{libatspi,atk} || die
+		mv "${ED}"/usr/share/doc/libatspi "${ED}"/usr/share/gtk-doc/libatspi/html || die
+		mv "${ED}"/usr/share/doc/atk "${ED}"/usr/share/gtk-doc/atk/html || die
+	fi
+}
diff --git a/app-arch/unzip/unzip-6.0_p31.ebuild b/app-arch/unzip/unzip-6.0_p31.ebuild
index 5bd0f5817c21..e710b91d4c73 100644
--- a/app-arch/unzip/unzip-6.0_p31.ebuild
+++ b/app-arch/unzip/unzip-6.0_p31.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-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="bzip2 natspec unicode"
 
 DEPEND="
diff --git a/app-arch/zip/zip-3.0_p16.ebuild b/app-arch/zip/zip-3.0_p16.ebuild
index 0571a0d81cd1..1b7b780303dc 100644
--- a/app-arch/zip/zip-3.0_p16.ebuild
+++ b/app-arch/zip/zip-3.0_p16.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Info-ZIP"
 SLOT="0"
-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="bzip2 crypt natspec unicode"
 
 DEPEND="
diff --git a/app-doc/python-docs/python-docs-3.10.21.ebuild b/app-doc/python-docs/python-docs-3.10.21.ebuild
index 407c3d450f1b..b4430d56da8f 100644
--- a/app-doc/python-docs/python-docs-3.10.21.ebuild
+++ b/app-doc/python-docs/python-docs-3.10.21.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.11.16.ebuild b/app-doc/python-docs/python-docs-3.11.16.ebuild
index 407c3d450f1b..b4430d56da8f 100644
--- a/app-doc/python-docs/python-docs-3.11.16.ebuild
+++ b/app-doc/python-docs/python-docs-3.11.16.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-doc/python-docs/python-docs-3.12.14.ebuild b/app-doc/python-docs/python-docs-3.12.14.ebuild
index 407c3d450f1b..b4430d56da8f 100644
--- a/app-doc/python-docs/python-docs-3.12.14.ebuild
+++ b/app-doc/python-docs/python-docs-3.12.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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"
 
 src_install() {
 	rm -r _sources || die
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 61363bbd053c..1d134190556d 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,2 +1,2 @@
-DIST ghex-48.1.tar.xz 943040 BLAKE2B 5e5b7dbeee09ee5fe3a0b527c1254ebde95dbdca159bb0b0ba76d337af2da1d03a6d5f94f70bd5a2b85f50005c6460aeb7ff0ab5735d284039ac9be514d78b79 SHA512 e916c7d1bfb66a604abef331a605e404583b9e375f7f21ec23c901062f4d5fbee6c90d36825e02878c5c1d3a6e15cc117dcc80c7675455ee8a407ec7f33a8bc1
 DIST ghex-48.3.tar.xz 943140 BLAKE2B 0da42b47fd0f2e0c8bf377d44ea7c0f2ce794f38664460d62348a92f169223179a47a6d9d50282a7c5dab11ab01e77ef60cd1f588190245d62e6f329d5306474 SHA512 8159eec716868f8c66c9a0a136c34dbadaa4552f59add6fe47e0606e3cf3dc9d53c1607702dbdd91444b6f4540ce862da3acc1d69231820282719991fa86d5bf
+DIST ghex-50.3.tar.xz 970180 BLAKE2B cd4180081323066830e42ca749f5a1ab89ecffeb7829f8b381c6275411630a13259b751ac260dadd411feb2f68ebb240979596f81bd6a8cecfbdc74623ee3c06 SHA512 10aaa0425efb0d633fea757cc095b446b3468d93db4ac8b06c06fcc7adf2b8bb860cda8577092aa0ef05505a260fb956e77ccab5bdbbf18e4e6e554ff3b70c9e
diff --git a/app-editors/ghex/ghex-48.1.ebuild b/app-editors/ghex/ghex-50.3.ebuild
index 07285a2839cf..8069253ed659 100644
--- a/app-editors/ghex/ghex-48.1.ebuild
+++ b/app-editors/ghex/ghex-50.3.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
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
@@ -23,9 +23,9 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
-	>=gui-libs/gtk-4.17.5:4
+	>=gui-libs/gtk-4.17.5:4[introspection]
 	>=gui-libs/libadwaita-1.7:1
-	>=dev-libs/gobject-introspection-1.82.0-r2
+	>=dev-libs/gobject-introspection-1.82.0-r2:=
 	!app-editors/ghex:2
 "
 DEPEND="${RDEPEND}"
diff --git a/app-editors/ghex/ghex-9999.ebuild b/app-editors/ghex/ghex-9999.ebuild
index e0bb40343345..8069253ed659 100644
--- a/app-editors/ghex/ghex-9999.ebuild
+++ b/app-editors/ghex/ghex-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
@@ -23,9 +23,9 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
-	>=gui-libs/gtk-4.17.5:4
+	>=gui-libs/gtk-4.17.5:4[introspection]
 	>=gui-libs/libadwaita-1.7:1
-	>=dev-libs/gobject-introspection-1.82.0-r2
+	>=dev-libs/gobject-introspection-1.82.0-r2:=
 	!app-editors/ghex:2
 "
 DEPEND="${RDEPEND}"
diff --git a/app-emulation/virt-firmware/Manifest b/app-emulation/virt-firmware/Manifest
index 163662d7f6f2..b43666d01569 100644
--- a/app-emulation/virt-firmware/Manifest
+++ b/app-emulation/virt-firmware/Manifest
@@ -1,3 +1,4 @@
 DIST virt_firmware-26.2.tar.gz 143457 BLAKE2B fd0b977539af0cde4059e67e86ddf97c6dcffc3f7b1cf5975d181dd51b698334c8b22b2c6a951da2e39327a0dd43b44d03a05d0ff56be6defb4a48f872ac4e80 SHA512 6e7fa94009da095e15880b6be850b130ea3097394572c01fe0404b6d4bc11117b9ae730ca43408cb02b5ae9dc2671ef5635520dd2c8776bb2b6b68c8246d06c7
 DIST virt_firmware-26.5.4.tar.gz 151249 BLAKE2B 05724cb57e33ef4d30cf987bdc7cf71b49be0b32437b27cec5fb43d39fe9fd0456f104da3ecac05e251f8249a974f18286f162f041247de2267436c993864be9 SHA512 5a61d4cf9e4aa025a12eab17f5f61ada197a7fc5c18d1ecdf0a6282d26cec8d261112a88ea24fbcdfd4ef69421667225ad8df1645cd30a1c1c374c8475e5c532
 DIST virt_firmware-26.7.1.tar.gz 157512 BLAKE2B 75267393cd25afd0b0da4aef81390e93840321ac63fb6b846b11bb3e2672674fb593429d306c2a50b5e6efe3037ba9bd9ca28e90e4df6a8d5bddb8867843ce86 SHA512 5ca477eebbdd89be75b25d251757e1207f19f292aa4bc464479a1b33ecf5303b0b66932cfd0a7678fc876737138511a3aba6d8441a347c61d13b1bd958389611
+DIST virt_firmware-26.9.tar.gz 170099 BLAKE2B f8491e0c810e2f93ccd1707da350e580c1f53ee3e82005fb27dada88011b6086e5a3a18a51b059d2d396376002f2018f06685b2598739dc79472e5fa95ab1ed6 SHA512 e52fa77cfc26f92ab2c1ffc17645b375aaa10e47aceedaca377966fee3b2723d19931156704c6a2d7b333a63a8e42c35ed7ee2a4fdec3602840864028685690c
diff --git a/app-emulation/virt-firmware/virt-firmware-26.9.ebuild b/app-emulation/virt-firmware/virt-firmware-26.9.ebuild
new file mode 100644
index 000000000000..a7cd05210312
--- /dev/null
+++ b/app-emulation/virt-firmware/virt-firmware-26.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2024-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 optfeature pypi systemd
+
+DESCRIPTION="Tools for ovmf/armvirt firmware volumes"
+HOMEPAGE="
+	https://gitlab.com/kraxel/virt-firmware
+	https://pypi.org/project/virt-firmware/
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pefile[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+# Need systemd-detect-virt
+BDEPEND="
+	test? (
+		sys-apps/systemd
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Requires crypt module removed in py3.13
+	rm virt/qemutest/cloudinit.py || die
+	sed -e '/from virt.qemutest.cloudinit import CloudInitISO/d' \
+		-i tests/tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	eunittest tests
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/*.1
+
+	doinitd "${FILESDIR}/kernel-bootcfg-boot-successful"
+	systemd_dounit systemd/kernel-bootcfg-boot-successful.service
+
+	# Use our own provided by sys-kernel/installkernel[efistub,systemd]
+	#exeinto /usr/lib/kernel/install.d
+	#doexe systemd/99-uki-uefi-setup.install
+}
+
+pkg_postinst() {
+	optfeature "automatically updating UEFI configuration on each kernel installation or removal" \
+		"sys-kernel/installkernel[systemd,efistub]"
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index b71af30cdfcd..c03e815f7daf 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,3 @@
 DIST VBoxGuestAdditions_7.0.26.iso 54992896 BLAKE2B a52bcf234232723e3c04e7de5fda518a745b3128f2fd3d1213a97d69e3f010647056d407b05e9f7f1debb966e32b0189c4fc4176e096e7b5ac3ba27e1adad57e SHA512 636328e8ccdbbefbcccce1750dcb984bbb52d886e3f6f94f119212e9d9258d6d37029f65a8ce6b86d677014d45f48d255ed9346de4edbd53f609b64ba9b5b1e9
 DIST VBoxGuestAdditions_7.2.14.iso 53489664 BLAKE2B d7311be8f2988b8360c8f7fe55bc2dd2e7a8b95649a4e57fafe2dfbda4d538f86055f757ff17ba3d804d566da529141a683f6728b8dadf009376e6b83277a93a SHA512 e6ec557d3b7fe570704d7714636029a91e20441ad1ca8869a8c0b536287a0deeedd702a2300d7ec006f4252f8704f9f501756d1faba414501b6d5517f2d0acf8
 DIST VBoxGuestAdditions_7.2.16.iso 53098496 BLAKE2B b4ced04afb076880b85e2a900a5301be3e475ce51503cfb5deb13bd79f09b343bce5c6ba8572335cdf590431bb139767b21ae707099797d2c45f563f32142a27 SHA512 b83833a5593373e13a37cdb230ee6cf55e0648e6f8c0279d7c3160667ce5baddc9b51ad8ba2c94a4802e74877a304933481a68265804ef78e9b40f4e8b4bb9b0
-DIST VBoxGuestAdditions_7.2.8.iso 53442560 BLAKE2B 2573b283839d42e7fa3b3e6b37d0c7dfca0bbd223d1a7af3b5452c9b7ee364e465b19e0d1cf70524991579a7b16e134483fef58169bf45ad72b2e176f9696881 SHA512 265a58341b842278c3e2500f605636b3d69af376456c2366abb72e93daf95d419de23f20e8528d6550084253c5b1e953014f20ad53535d716dadff96e01a5ef2
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.2.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.2.8.ebuild
deleted file mode 100644
index fdec5d1d5717..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.2.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_PV=${PV^^}
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-S="${WORKDIR}"
-
-LICENSE="GPL-3 || ( GPL-3 CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 05ac1d212218..c17d4edab310 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,3 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.26.tar.gz 18268793 BLAKE2B 26b53bb022dab26a02fb450252ad07d58b3e9f7fb103752396652e1950b6c77f4f2ff8eff1a1e6d4a0c38de331110b26f26f1750d211aaebb71198513e2fad74 SHA512 bae8dfeea7048a1d7057b27f9815fa626b87beafa182d801b650048dd95cfae7cf87ed7dbf2dc87678748b5f4e46d7d284da1d1aaa0be9b3e214ccb16dd76630
 DIST Oracle_VirtualBox_Extension_Pack-7.2.14.tar.gz 20069087 BLAKE2B b6e3ad53abb3bbe7f7aa5f72f5e8c2786e490ffbe87a59361ea388fb650f1b16ec6ef5bd2600de4a8e0530be71e31bef3290327589e2e1848f94dd4815141848 SHA512 5f8aea7cda208681437ece898ec1784ab222895660e0366f9ec7fba39fbc2060350282a520302d89953f74bcf07600c1b80cc6633dcc7b5f85b72e9e050fe631
 DIST Oracle_VirtualBox_Extension_Pack-7.2.16.tar.gz 20069198 BLAKE2B c752c5c28bfaef767e922ea9e7ecc6ff9cac28ba44b3f6c7c7ba8cbcf2ea5bf3934a2b8025a795b72450e02ed58beb74be8ad8f87bce2953a61ddd7930dfbdd5 SHA512 31ae4ffe9508bc90478cfb6d7816e936c7dd13395a18e9dcfd664f7716263943a7c411657ac1a47927ae30fe518dd2ef8cd011daa808628de3f4d9ad42d35b8b
-DIST Oracle_VirtualBox_Extension_Pack-7.2.8.tar.gz 20069022 BLAKE2B db3176fecee6382cb015c00f708ffad88d5cf4139c165bc453525ec5c059fa2c4f007bafd1ec493bfe3882aad6449b737afa66f9bf4079ffa7ab0998b5af89df SHA512 abef46967131ef0d37ab63a5c0b2d0b843e7c723a31b3f2daae8d9dd05fbef4feb33bd039ff0b7da2b1222e16809fa767736432d3bf533915b786dfaa89e70e0
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.2.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.2.8.ebuild
deleted file mode 100644
index 61f505038ea8..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.2.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV^^}"
-MY_PN="Oracle_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="PUEL-12"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	|| (
-		=app-emulation/virtualbox-${PV}*
-		=app-emulation/virtualbox-kvm-${PV}*
-	)
-"
-
-QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index ddb13ea18b7e..4b46312700c8 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,7 +1,5 @@
 DIST VirtualBox-7.0.26.tar.bz2 174650718 BLAKE2B ba13a940b9566a5ac5b228bf29d49d4b9bf16a72da3212c305538711d363f1e6fddaa8717d4c46394ce488d2c1670874fece356740f421f44f6f40bd655f5551 SHA512 337f62438679f98b342213dbafdd3e07f7d7092a4205bfe388d64d1cc8224499621addea56b70d806c93290bb82e6150c07516e69250460a276e3b7a4484a9b6
 DIST VirtualBox-7.2.14.tar.bz2 223796857 BLAKE2B 040bfe03852cea08e333a4f90285d69ed8727e869b47ed4075d6c0351ee819240bea4b00d375aaba27b0e2f74a4490e40cd498faa61131175a814ae6d1380be3 SHA512 97fde73d0c93cdd26d148429b1f6b92538469b41006888803024505b200cb78e8098e19a101d9cc471991a6be7519bbf42b8818ddd584925946af048dc2ffff3
 DIST VirtualBox-7.2.16.tar.bz2 224818919 BLAKE2B 69b76f2a3b46583f0c4322dad33fd158e4ab03c66e6c588e20c1f9fc36f94fa08c5cb7c4030388b40dbc81d5a947d26a072d533de916111be46a919c1cb31bfc SHA512 273b12490b895ba50f8dd8b9df430d029683ce43823381e332c272712016c7349def83a34075f8c6b96682f79584b8c039bac7fda941fc167a8839a3adedd0d6
-DIST VirtualBox-7.2.8.tar.bz2 207408458 BLAKE2B f57d2cbf02cb6b4b78a203737d1e12916b396e188a58d075b2b6414e83e526f0adecab7e317b33a639de51d30b8351d74dc4beb48e57e5a0feb1bf68d2523339 SHA512 a67256506c870b7fcecb0ec8b1d5e75490ee02379b5e967aead44ed09e2b15c0a2c3fd2d1e021281609d8d1f98b161cd3aa0265938490a999a700a1e01a9013b
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.2.14.tar.bz2 6774 BLAKE2B da85493f23fd5798b3e438a46f6fb16803ae727c846fdb06366e537d333301938805bd83c67f265a95a2c9fd6fd845d1365ddc2cf7e4f6269212eb585659e1b8 SHA512 d7fafbf70de187c2b96ca140bb4f11ee2c2fc1c0e6d324f53fb6aa999f6262fcc7c4b464410ec44816ea1effa3bc1090dd29a57b0485be837915c4a31f789a92
-DIST virtualbox-patches-7.2.6.tar.bz2 6041 BLAKE2B 6bd791a24acccc7ab923f09b5a1a88f557c59f2526b1055c7a877e3ca25ca002c58cc5fb67737e2f53c322bae5c716dba4472da8c977006d6297793fae55fafc SHA512 94a49da99d6affa0c89e0fb349bb09fd1dc7f05ced9c828d52d30455fb8c76a245db1f572491801fa381e7521bc8f4e094ddb3d8fd2d341835f3bd238a24cc25
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.2.8.ebuild
deleted file mode 100644
index c25fe5958d64..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.2.8.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo readme.gentoo-r1 systemd toolchain-funcs udev
-
-MY_PN="VirtualBox"
-MY_PV=${PV^^}
-MY_P=${MY_PN}-${MY_PV}
-PATCHES_PV="7.2.6"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${PATCHES_PV}.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+dbus gui"
-
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	sys-libs/pam
-	virtual/zlib:=
-	~app-emulation/virtualbox-guest-modules-${PV}
-	dbus? ( sys-apps/dbus )
-	gui? (
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-	)
-"
-# some libs here are indirect dependencies, and also needed at compile time.
-# keeping them in DEPEND to avoid warnings from qa-vdb.
-DEPEND="
-	${RDEPEND}
-	gui? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	>=dev-lang/yasm-0.6.2
-	>=dev-build/kbuild-0.1.9998.3660
-	sys-devel/bin86
-	sys-power/iasl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.1.6-disable-vboxvideo-module.patch
-	"${FILESDIR}"/${PN}-7.1-arm64.patch
-	"${WORKDIR}/virtualbox-patches-${PATCHES_PV}/patches"
-)
-
-DOCS=()	# Don't install the default README file during einstalldocs
-
-DOC_CONTENTS="\n
-Please add users to the \"vboxguest\" group so they can\n
-benefit from seamless mode, auto-resize and clipboard.\n
-\n
-The vboxsf group has been added to make automount services work.\n
-These services are part of the shared folders support.\n
-\n
-Please add:\n
-	/etc/init.d/virtualbox-guest-additions\n
-to the default runlevel in order to start\n
-needed services.\n
-\n
-An autostart .desktop file has been installed to start\n
-VBoxClient in desktop sessions.\n
-\n
-You can mount shared folders with:\n
-	mount -t vboxsf <shared_folder_name> <mount_point>\n
-\n
-Warning:\n
-	this ebuild is only needed if you are running gentoo\n
-	inside a VirtualBox Virtual Machine, you don't need\n
-	it to run VirtualBox itself.\n
-\n"
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	if use gui; then
-		echo "VBOX_NO_LEGACY_XORG_X11 := 1" >> LocalConfig.kmk || die
-	else
-		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
-	fi
-
-	# Remove pointless GCC version check
-	sed -e '/ check_gcc$/d' -i configure || die
-
-	# Respect LDFLAGS (bug #759100)
-	sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
-
-	eapply "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-
-	# Build the user-space tools, warnings are harmless
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		$(usev !dbus --disable-dbus)
-		--target-arch=${ARCH}
-		--disable-kmods
-		--build-headless
-	)
-
-	# bug #843437
-	# Respect LDFLAGS (bug #759100)
-	# Cannot use LDFLAGS here because they also get passed to $(LD)
-	cat >> LocalConfig.kmk <<-EOF || die
-		CFLAGS=${CFLAGS}
-		CXXFLAGS=${CXXFLAGS}
-		CCLDFLAGS=${LDFLAGS}
-	EOF
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_ONLY_ADDITIONS=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		LD="$(tc-getCC)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_CXX="$(tc-getCXX)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-		TOOL_YASM_AS=yasm
-	)
-
-	MAKE="kmk" emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	cd out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	if use dbus; then
-		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-	else
-		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
-	fi
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use gui ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-		doins VBoxDRMClient
-		fperms 4755 /usr/bin/VBoxDRMClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	udev_reload
-
-	if ! use gui ; then
-		elog "The use flag \"gui\" is off, enable it to install the"
-		elog "X Window System drivers and integration."
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/virtualbox-guest-modules/Manifest b/app-emulation/virtualbox-guest-modules/Manifest
index f83d1e274544..d8e2f4b1cdd3 100644
--- a/app-emulation/virtualbox-guest-modules/Manifest
+++ b/app-emulation/virtualbox-guest-modules/Manifest
@@ -1,4 +1,3 @@
 DIST vbox-guest-kernel-module-src-7.0.26.tar.xz 691328 BLAKE2B 8bbe434bb34e2046227713ce9d8508754621b6210e29dbfffa18129c8156ee6da265280db0a2d0485abd9f6299bc56ac2490b3a35057b594456ea3ba31445cf2 SHA512 fbdf7bd9fa23e71d1421006424379893d078edc7bb1d9720f941289a754dba9cedbb0eb741beecab2da312b4230effca6ccd2e570923d4c2242be3557e330fd5
 DIST vbox-guest-kernel-module-src-7.2.14.tar.xz 756804 BLAKE2B f5e063ebee8ffca2de35afbc520322a6b871337b6c4af735d57ddfdbb376e58554aba07dce0a32737203a17e55fa60abdb00f3f2491488802e06cfbb4cb49f7e SHA512 5233360abcf3fe58f4dc359beb9ad0a18c1bb5d6104c62dd9731f144687e38ea87b52c7c6dcab1b0915b6e4152fb3d3ec94ceb9a8d15ee8149efffb1182997e0
 DIST vbox-guest-kernel-module-src-7.2.16.tar.xz 757504 BLAKE2B cee55482b5914a78625303a0c381a1b47e6b70d76f16a55b559c1e65be12730d1f3b345152cba13310001850b9ab9e3322063ae181e59387cb57d223c6257e28 SHA512 16bf3b12f4450f128eba01701fc7b6c12b3bb2b81693696b726d1848f1889723df0d513c776a6341154d9bfd121e74a3cd80f98f5bb6cc5e07458742f436cf22
-DIST vbox-guest-kernel-module-src-7.2.8.tar.xz 754192 BLAKE2B ecccd02a83a675e870f362c0ea44d0a7b52d1db9a55fc5ddb24f6a8c1161a2370dbb82adf251de6c80e9e7dfaf4503e0e96f956bd4f756bceb60bbb9cb8d578f SHA512 ea18bdf93aa382a9b81d20f7fbf0c0c4ccbbffe892b3ca4ebd46bd95c5ab7460140dedf9b657ac48bc9cbc13388ae2d0bdf1a8ecab7a8f0dfa180b6394d155cf
diff --git a/app-emulation/virtualbox-guest-modules/virtualbox-guest-modules-7.2.8.ebuild b/app-emulation/virtualbox-guest-modules/virtualbox-guest-modules-7.2.8.ebuild
deleted file mode 100644
index a4ec9ea912ae..000000000000
--- a/app-emulation/virtualbox-guest-modules/virtualbox-guest-modules-7.2.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the sources
-#      using the upstream provided export_modules.sh
-#      https://distfiles.gentoo.org/pub/dev/ceamac@gentoo.org/app-emulation/virtualbox-modules/make-modules-from-source
-
-EAPI=8
-
-inherit linux-mod-r1
-
-MY_P="vbox-guest-kernel-module-src-${PV^^}"
-DESCRIPTION="Kernel Modules for Virtualbox Guest Additions"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://distfiles.gentoo.org/pub/dev/ceamac@gentoo.org/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.2.6-log-use-c99.patch
-	"${FILESDIR}"/${PN}-7.2.8-no-vboxvideo.patch
-)
-
-CONFIG_CHECK="~DRM_TTM ~DRM_VMWGFX"
-WARNING_DRM_TTM="DRM_TTM is needed for running the vboxvideo driver."
-WARNING_DRM_VMWGFX="DRM_VMWGFX is the recommended driver for VMSVGA."
-
-src_compile() {
-	local modlist=( {vboxguest,vboxsf}=misc )
-	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
-	linux-mod-r1_src_compile
-}
-
-src_install() {
-	linux-mod-r1_src_install
-
-	insinto /etc/modprobe.d # 485996
-	newins - vboxsf.conf <<-EOF
-		# modprobe.d configuration file for VBOXSF
-
-		# Internal Aliases - Do not edit
-		# ------------------------------
-		alias fs-vboxsf vboxsf
-	EOF
-}
diff --git a/app-emulation/virtualbox-kvm/Manifest b/app-emulation/virtualbox-kvm/Manifest
index 4ee51d1650fb..8096d5396eef 100644
--- a/app-emulation/virtualbox-kvm/Manifest
+++ b/app-emulation/virtualbox-kvm/Manifest
@@ -1,9 +1,6 @@
 DIST VirtualBox-7.2.14.tar.bz2 223796857 BLAKE2B 040bfe03852cea08e333a4f90285d69ed8727e869b47ed4075d6c0351ee819240bea4b00d375aaba27b0e2f74a4490e40cd498faa61131175a814ae6d1380be3 SHA512 97fde73d0c93cdd26d148429b1f6b92538469b41006888803024505b200cb78e8098e19a101d9cc471991a6be7519bbf42b8818ddd584925946af048dc2ffff3
 DIST VirtualBox-7.2.16.tar.bz2 224818919 BLAKE2B 69b76f2a3b46583f0c4322dad33fd158e4ab03c66e6c588e20c1f9fc36f94fa08c5cb7c4030388b40dbc81d5a947d26a072d533de916111be46a919c1cb31bfc SHA512 273b12490b895ba50f8dd8b9df430d029683ce43823381e332c272712016c7349def83a34075f8c6b96682f79584b8c039bac7fda941fc167a8839a3adedd0d6
-DIST VirtualBox-7.2.8.tar.bz2 207408458 BLAKE2B f57d2cbf02cb6b4b78a203737d1e12916b396e188a58d075b2b6414e83e526f0adecab7e317b33a639de51d30b8351d74dc4beb48e57e5a0feb1bf68d2523339 SHA512 a67256506c870b7fcecb0ec8b1d5e75490ee02379b5e967aead44ed09e2b15c0a2c3fd2d1e021281609d8d1f98b161cd3aa0265938490a999a700a1e01a9013b
 DIST virtualbox-help-7.2.14.tar.xz 8379920 BLAKE2B 5a63006fa6c974c87d9ad31df19f37b7bc26f8edcc6f43b27ce443e3e3447b8c5dd094f1e24908b21c043408a2c290bf8c9be3ece1d213794b87e537b464ad0f SHA512 124014da86b309f6360806c72166e8b544e2045668d6104cf135098123140a6542c8cddb829392002edd18c67d74bb7a0807fec6f83e9fa52287d8795ab98c7f
 DIST virtualbox-help-7.2.16.tar.xz 8380044 BLAKE2B 8765b1ef71d3eeabe029baa0732ce24782e0aa1d5f0b2f7d773d457b932d67b7020e5a063913d01c6aabea5476815aa01dc8d01ec449224aed39bf943a9bb4ce SHA512 6cf9b271b5197b6dab28c4f3b07cdad96a4a76182cd4904d68df16aa81c8219f8c01b0b7e19b96666158bf986f15bb92234acd6f9a31bdabd49e36632c5e4746
-DIST virtualbox-help-7.2.8.tar.xz 8378772 BLAKE2B 6941831bcdabe0017f3b03c4741ac5df5feef8aa376f0686878eb70e8ae7e9bdf878a34db86b4756ac65476ea08e3e0f1417db7870d35619bb4065bd271264dd SHA512 476d9e3ca3c338ec0c54a91204c24b5033af75c60d55e66693093bef30262157437f36a66c5c8184e9eb95b0a243cd6ec5c59f2c5b9c6dc31f94ab5cea393e5f
 DIST virtualbox-kvm-20260201.tar.gz 273470 BLAKE2B 2379d031fdb0c5301bdd947d22817d5cb12067a63c288fa650db9ee940fd88639ff499a0226cfb297494d4a8c46da169d26646671d24229d68bca7966f175439 SHA512 55c5222c82b2854a9a3c7aaa46edcb598ba1272032bb33dd0783ea14d2c2696b85a0aaeb2440fea2da59dd36bba06650c00526d7ca659dce246f9f8678aa8a46
 DIST virtualbox-patches-7.2.14.tar.bz2 6774 BLAKE2B da85493f23fd5798b3e438a46f6fb16803ae727c846fdb06366e537d333301938805bd83c67f265a95a2c9fd6fd845d1365ddc2cf7e4f6269212eb585659e1b8 SHA512 d7fafbf70de187c2b96ca140bb4f11ee2c2fc1c0e6d324f53fb6aa999f6262fcc7c4b464410ec44816ea1effa3bc1090dd29a57b0485be837915c4a31f789a92
-DIST virtualbox-patches-7.2.6.tar.bz2 6041 BLAKE2B 6bd791a24acccc7ab923f09b5a1a88f557c59f2526b1055c7a877e3ca25ca002c58cc5fb67737e2f53c322bae5c716dba4472da8c977006d6297793fae55fafc SHA512 94a49da99d6affa0c89e0fb349bb09fd1dc7f05ced9c828d52d30455fb8c76a245db1f572491801fa381e7521bc8f4e094ddb3d8fd2d341835f3bd238a24cc25
diff --git a/app-emulation/virtualbox-kvm/metadata.xml b/app-emulation/virtualbox-kvm/metadata.xml
index 4e3feaf70f18..0c5c5f7ebc6a 100644
--- a/app-emulation/virtualbox-kvm/metadata.xml
+++ b/app-emulation/virtualbox-kvm/metadata.xml
@@ -14,7 +14,6 @@
     <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
     <flag name="vde">Support for VDE networking via <pkg>net-misc/vde</pkg>
     </flag>
-    <flag name="vmmraw">Enable 32-bit support on a 64-bit kernel.</flag>
   </use>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.2.8_pre20260201.ebuild b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.2.8_pre20260201.ebuild
deleted file mode 100644
index abd01c23353c..000000000000
--- a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.2.8_pre20260201.ebuild
+++ /dev/null
@@ -1,789 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-PATCHES_PV="7.2.6"
-ORIGIN_PN="VirtualBox"
-ORIGIN_PV=${PV%_pre*}
-
-MY_PN=virtualbox
-MY_PV=${PV#*_pre}
-MY_P=${ORIGIN_PN}-${ORIGIN_PV}
-
-PATCHES_DIR="${WORKDIR}"/${PN}-dev-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/ https://github.com/cyberus-technology/virtualbox-kvm"
-SRC_URI="
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${PATCHES_PV}.tar.bz2
-	https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz
-	https://download.virtualbox.org/virtualbox/${ORIGIN_PV%*a}/${MY_P}.tar.bz2
-	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${MY_PN}/${MY_PN}-help-${ORIGIN_PV}.tar.xz ) )
-"
-S="${WORKDIR}/${ORIGIN_PN}-${ORIGIN_PV%*a}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="alsa dbus debug doc dtrace +gui +hardened java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde +vmmraw vnc"
-RESTRICT="!test? ( test )"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	acct-group/vboxusers
-	app-arch/xz-utils
-	dev-libs/libtpms
-	dev-libs/libxml2:=
-	dev-libs/openssl:0=
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libvorbis
-	media-libs/libvpx:0=
-	net-misc/curl
-	virtual/zlib:=
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtbase:6[X,wayland,widgets]
-		dev-qt/qtscxml:6
-		dev-qt/qttools:6[assistant]
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,video]
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	x11-libs/libXt
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-base/xorg-proto
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? (
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-	)
-	pulseaudio? ( media-libs/libpulse )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	!app-emulation/virtualbox
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	>=app-arch/tar-1.34-r2
-	>=dev-lang/yasm-0.6.2
-	dev-util/glslang
-	>=dev-build/kbuild-0.1.9998.3660
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-doc/dita-ot-bin
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qttools:6[assistant]
-		sys-libs/nss_wrapper
-	)
-	gui? ( dev-qt/qttools:6[linguist] )
-	nls? ( dev-qt/qttools:6[linguist] )
-	java? ( virtual/jdk:1.8 )
-	python? (
-		${PYTHON_DEPS}
-		test? (
-			$(python_gen_cond_dep '
-				dev-python/pytest[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk ${PYTHON_REQUIRED_USE} )
-	test? ( !debug )
-	vboxwebsrv? ( java )
-"
-
-PATCHES=(
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-${PATCHES_PV}/patches
-	"${PATCHES_DIR}"/patches
-)
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use nls && use gui; then
-		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
-		einfo "will have NLS support."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python; then
-		mkdir test
-		cp "${FILESDIR}"/test_python.py test/
-		python_fix_shebang test/test_python.py
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${MY_PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# bug #916002, #488176, #925347
-	tc-ld-is-mold || tc-ld-force-bfd
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# bug #940482
-	filter-flags -fno-plt
-
-	# bug #908814
-	filter-lto
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		sed -i 's/sdl-config/sdl2-config/' configure || die
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	if tc-is-clang; then
-		# clang does not support this extension
-		eapply "${FILESDIR}"/${PN}-7.1.0-disable-rebuild-iPxeBiosBin.patch
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# fix help path #891879
-	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VMR3.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-
-	if ! use nls && ! use gui; then
-		cat >> LocalConfig.kmk <<-EOF || die
-			VBOX_WITH_NLS :=
-			VBOX_WITH_MAIN_NLS :=
-			VBOX_WITH_PUEL_NLS :=
-			VBOX_WITH_VBOXMANAGE_NLS :=
-		EOF
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	# --enable-webservice is a no-op
-	# webservice is automagically enabled if gsoap is found
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-		--with-kvm
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !hardened --disable-hardening)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev !vboxwebsrv --with-gsoap-dir=/dev/null)
-		$(usev vde --enable-vde)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-		# disable shared clipboard when headless, it crashes when connecting with RDP: bug #955867
-		echo -e "\nVBOX_WITH_SHARED_CLIPBOARD :=" >> LocalConfig.kmk || die
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	if use python; then
-		cat >> AutoConfig.kmk <<-EOF || die
-			VBOX_WITH_PYTHON=$(usev python 1)
-			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-			VBOX_LIB_PYTHON=$(python_get_library_path)
-		EOF
-
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	else
-		cat >> AutoConfig.kmk <<-EOF || die
-			VBOX_WITH_PYTHON:=
-		EOF
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	if use doc; then
-		# dita needs to write to ~/.fop and ~/.java
-		# but it ignores ${HOME} and tries to write to the real home of user portage
-		# resulting in a sandbox violation
-		# -Duser.home= does not work
-		# force using the temporary homedir with nss_wrapper
-		echo "${LOGNAME}::$(id -u):$(id -g):${USER}:${HOME}:/bin/bash" >> ~/passwd
-		echo "${LOGNAME}::$(id -g):" >> ~/group
-
-		local -x LD_PRELOAD=libnss_wrapper.so
-		local -x NSS_WRAPPER_PASSWD="${HOME}"/passwd
-		local -x NSS_WRAPPER_GROUP="${HOME}"/group
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_test() {
-	if use python; then
-		local -x VBOX_APP_HOME="${S}"/out/linux.${ARCH}/$(usex debug debug release)
-		local -x VBOX_INSTALL_PATH="${VBOX_APP_HOME}"
-		local -x VBOX_PROGRAM_PATH="${VBOX_APP_HOME}"/bin
-		local -x VBOX_SDK_PATH="${VBOX_PROGRAM_PATH}"/sdk
-		local -x PYTHONPATH="${VBOX_SDK_PATH}"/installer/python/vboxapi/src
-		einfo "VBOX_APP_HOME ${VBOX_APP_HOME}"
-		einfo "VBOX_PROGRAM_PATH ${VBOX_PROGRAM_PATH}"
-		einfo "VBOX_SDK_PATH ${VBOX_SDK_PATH}"
-		einfo "PYTHONPATH ${PYTHONPATH}"
-		LD_LIBRARY_PATH="${VBOX_PROGRAM_PATH}" epytest test/
-	fi
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${MY_PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${MY_PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${MY_PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root with USE=hardened.
-	local mode=$(usex hardened 4750 0750)
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} ${mode}
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{-x86,-amd64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	# environment variables used during SDK binding installation
-	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
-	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL ${mode}
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM ${mode}
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		newmenu ${MY_PN}.desktop ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${MY_PN}-${size}px.png ${PN}.png
-		done
-		newicon ${MY_PN}-48px.png ${PN}.png
-		newicon -s scalable ${MY_PN}.svg ${PN}.png
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${MY_PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${MY_PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo ${mode}
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${MY_PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
-	elif use gui; then
-		dodoc "${WORKDIR}"/${MY_PN}-help-${ORIGIN_PV}/UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
-	fi
-	dodoc ${PATCHES_DIR}/README.*
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-
-		# 378871
-		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
-		pushd "${installer_dir}" &> /dev/null || die
-		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
-			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
-			-i vboxapi/__init__.py || die
-		# insert shebang, the files come without one
-		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
-		python_domodule vboxapi
-		popd &> /dev/null || die
-
-		# upstream added a /bin/sh stub here
-		# use /usr/bin/python3, python_doscript will take care of it
-		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
-		python_doscript vboxshell.py
-
-		# do not install the installer
-		rm -r "${installer_dir%vboxapi*}" || die
-	fi
-
-	newtmpfiles "${FILESDIR}"/${MY_PN}-vboxusb_tmpfilesd virtualbox-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${ORIGIN_PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${MY_PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 19b3e602db80..ff19e1445519 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,3 @@
 DIST vbox-host-kernel-module-src-7.2.14.tar.xz 865192 BLAKE2B b88c693d936c042e7122a88d4b9880441576e52a143253a7acd2a7dc06ac5e3482a309b222e784d52f1116a0f044ea9179b6e3d8872d8892ef2717d610db54c8 SHA512 efcaae329ae5305b0917c44bb8761a913c30777a262b7d897fc51a1e093e5fd8fec7a6ee0fc4daad5f1646e0989cd4342fd89f6df6a0afab7606315099bdf122
 DIST vbox-host-kernel-module-src-7.2.16.tar.xz 866660 BLAKE2B 0bdb9e12410da507524ce938e699c4def44355b8d7787d65a18778246147b6b65c749366ca802c2626b7cc075e2f66a3a81b43ac1960bec294969048a509361b SHA512 1701ca3b971d45c3bb82189d4cc9af06bc767ec1fda9e17ff9f8acd90667503ee99be55b835549772f0d6310ff53627c6351345c3f3ad011c1f384e506101ad3
-DIST vbox-host-kernel-module-src-7.2.8.tar.xz 861596 BLAKE2B d04b6bc042738cf4997ff152f1ba92620b32ef99e1b8296e2e1994e0d5b333ce132a0d75e5ee094813b4e2fa96f628b5dcc20e41a013950eefcf066455028989 SHA512 8240a37fe5d673db5b3d865f8a8cf77340b141dabfb70936961ff9364b4b9303d5f727ac90dd60c3cbeaa9e01d9e1ff6c00e80c6fcf72e6d5a72f1e9e61cc4c8
 DIST vbox-kernel-module-src-7.0.26.tar.xz 721876 BLAKE2B 355ac80cc96f4ad259a0fdbb909803bbec884c1d25fc9061f45f7039a0857b4f6cc93d4739cf85a82b9544aae06bf7b689d5d530ffc2fe97a874ef57d123423f SHA512 5980721197b908d5d991b258be395a8b542b8183eac7b146b147e4dbea9ff0b0408de5733b12d02a159b689bde29966a55fa7b64c953b9abe4180dbf6e0ebcb6
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.2.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.2.8.ebuild
deleted file mode 100644
index 32006dde90ca..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.2.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the sources
-#      using the upstream provided export_modules.sh
-#      https://distfiles.gentoo.org/pub/dev/ceamac@gentoo.org/app-emulation/virtualbox-modules/make-modules-from-source
-
-EAPI=8
-
-inherit linux-mod-r1
-
-MY_P="vbox-host-kernel-module-src-${PV^^}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://distfiles.gentoo.org/pub/dev/ceamac@gentoo.org/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-CONFIG_CHECK="~!SPINLOCK JUMP_LABEL ~PREEMPT_NOTIFIERS ~KPROBES"
-KPROBES_ERROR="CONFIG_KPROBES is required for kernel 6.16+; modules fail to build with kernel 6.19+"
-
-src_compile() {
-	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
-	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
-	linux-mod-r1_src_compile
-}
-
-src_install() {
-	linux-mod-r1_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-
-	insinto /etc/modprobe.d # bug #945135
-	newins - virtualbox.conf <<-EOF
-			# modprobe.d configuration file for VBOXSF
-
-			# Starting with kernel 6.12,
-			#   KVM initializes virtualization on module loading by default.
-			# This prevents VirtualBox VMs from starting.
-			# See also:
-			#   https://bugs.gentoo.org/945135
-			#   https://www.virtualbox.org/wiki/Changelog-7.1
-			# ------------------------------
-			options kvm enable_virt_at_load=0
-	EOF
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index dcd467bdb75c..27529d03a8e5 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,12 +1,9 @@
 DIST VirtualBox-7.0.26.tar.bz2 174650718 BLAKE2B ba13a940b9566a5ac5b228bf29d49d4b9bf16a72da3212c305538711d363f1e6fddaa8717d4c46394ce488d2c1670874fece356740f421f44f6f40bd655f5551 SHA512 337f62438679f98b342213dbafdd3e07f7d7092a4205bfe388d64d1cc8224499621addea56b70d806c93290bb82e6150c07516e69250460a276e3b7a4484a9b6
 DIST VirtualBox-7.2.14.tar.bz2 223796857 BLAKE2B 040bfe03852cea08e333a4f90285d69ed8727e869b47ed4075d6c0351ee819240bea4b00d375aaba27b0e2f74a4490e40cd498faa61131175a814ae6d1380be3 SHA512 97fde73d0c93cdd26d148429b1f6b92538469b41006888803024505b200cb78e8098e19a101d9cc471991a6be7519bbf42b8818ddd584925946af048dc2ffff3
 DIST VirtualBox-7.2.16.tar.bz2 224818919 BLAKE2B 69b76f2a3b46583f0c4322dad33fd158e4ab03c66e6c588e20c1f9fc36f94fa08c5cb7c4030388b40dbc81d5a947d26a072d533de916111be46a919c1cb31bfc SHA512 273b12490b895ba50f8dd8b9df430d029683ce43823381e332c272712016c7349def83a34075f8c6b96682f79584b8c039bac7fda941fc167a8839a3adedd0d6
-DIST VirtualBox-7.2.8.tar.bz2 207408458 BLAKE2B f57d2cbf02cb6b4b78a203737d1e12916b396e188a58d075b2b6414e83e526f0adecab7e317b33a639de51d30b8351d74dc4beb48e57e5a0feb1bf68d2523339 SHA512 a67256506c870b7fcecb0ec8b1d5e75490ee02379b5e967aead44ed09e2b15c0a2c3fd2d1e021281609d8d1f98b161cd3aa0265938490a999a700a1e01a9013b
 DIST virtualbox-help-7.1.0.tar.xz 1631644 BLAKE2B 408748619d1e981b9d5b5e615baca75ff297e9b7e745751767361b7b9c74345a3db1980734439f3868c412fe28a6b687b417adc3cc148d2e2b8a9fa60e48463b SHA512 513b8474d4fbf7cdb83624dc8d344122c524d92f9f84b32784161c8e1cac8ddc2c265447621d7cd3cf105d555a044e6abf42155f413ba89d507eba7ce3b2da89
 DIST virtualbox-help-7.2.14.tar.xz 8379920 BLAKE2B 5a63006fa6c974c87d9ad31df19f37b7bc26f8edcc6f43b27ce443e3e3447b8c5dd094f1e24908b21c043408a2c290bf8c9be3ece1d213794b87e537b464ad0f SHA512 124014da86b309f6360806c72166e8b544e2045668d6104cf135098123140a6542c8cddb829392002edd18c67d74bb7a0807fec6f83e9fa52287d8795ab98c7f
 DIST virtualbox-help-7.2.16.tar.xz 8380044 BLAKE2B 8765b1ef71d3eeabe029baa0732ce24782e0aa1d5f0b2f7d773d457b932d67b7020e5a063913d01c6aabea5476815aa01dc8d01ec449224aed39bf943a9bb4ce SHA512 6cf9b271b5197b6dab28c4f3b07cdad96a4a76182cd4904d68df16aa81c8219f8c01b0b7e19b96666158bf986f15bb92234acd6f9a31bdabd49e36632c5e4746
-DIST virtualbox-help-7.2.8.tar.xz 8378772 BLAKE2B 6941831bcdabe0017f3b03c4741ac5df5feef8aa376f0686878eb70e8ae7e9bdf878a34db86b4756ac65476ea08e3e0f1417db7870d35619bb4065bd271264dd SHA512 476d9e3ca3c338ec0c54a91204c24b5033af75c60d55e66693093bef30262157437f36a66c5c8184e9eb95b0a243cd6ec5c59f2c5b9c6dc31f94ab5cea393e5f
 DIST virtualbox-patches-7.0.22-r1.tar.bz2 6972 BLAKE2B e9116cb2ed874f9a0133e756b725a48ee665a412114d04195849f5930782c65678a2aaf581b9b02bc29001be4191116e322643232ee37de5cba0f2b5049b615f SHA512 be72b596f63229bd28b22c026108cf5a5c951f58343a709f158446593e6f872a81734dd83a838dd91c02c80854312e2cad81f3a525035db5ffabeb96729a8276
 DIST virtualbox-patches-7.2.14.tar.bz2 6774 BLAKE2B da85493f23fd5798b3e438a46f6fb16803ae727c846fdb06366e537d333301938805bd83c67f265a95a2c9fd6fd845d1365ddc2cf7e4f6269212eb585659e1b8 SHA512 d7fafbf70de187c2b96ca140bb4f11ee2c2fc1c0e6d324f53fb6aa999f6262fcc7c4b464410ec44816ea1effa3bc1090dd29a57b0485be837915c4a31f789a92
 DIST virtualbox-patches-7.2.4.tar.bz2 6938 BLAKE2B be3ef14c2090f39eeb1fe6fe82231dbf725ff6d20603e72e4c3bbf8b15ae7698d2be86bb321bd1776a15c6385770a393cc8c6b945ea87c54f9c767c3c77b61af SHA512 2e9c403dff97f5146e7632d7f6b5d0230f65f8be172efc6dd2959e72054778f617aa437f8c86d1489f9ce9212899ff08e83433a9eca3e5691353b036d426784a
-DIST virtualbox-patches-7.2.6.tar.bz2 6041 BLAKE2B 6bd791a24acccc7ab923f09b5a1a88f557c59f2526b1055c7a877e3ca25ca002c58cc5fb67737e2f53c322bae5c716dba4472da8c977006d6297793fae55fafc SHA512 94a49da99d6affa0c89e0fb349bb09fd1dc7f05ced9c828d52d30455fb8c76a245db1f572491801fa381e7521bc8f4e094ddb3d8fd2d341835f3bd238a24cc25
diff --git a/app-emulation/virtualbox/virtualbox-7.2.8.ebuild b/app-emulation/virtualbox/virtualbox-7.2.8.ebuild
deleted file mode 100644
index c27a8191b3d9..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.2.8.ebuild
+++ /dev/null
@@ -1,780 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{12..14} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_P=${MY_PN}-${PV^^}
-HELP_PV=${PV}
-PATCHES_PV="7.2.6"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/ https://github.com/VirtualBox/virtualbox"
-SRC_URI="
-	https://download.virtualbox.org/virtualbox/${PV^^}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${PATCHES_PV}.tar.bz2
-	gui? ( !doc? ( https://distfiles.gentoo.org/pub/dev/ceamac@gentoo.org/${CATEGORY}/${PN}/${PN}-help-${HELP_PV}.tar.xz ) )
-"
-S="${WORKDIR}/${MY_PN}-${PV^^}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde vnc"
-RESTRICT="!test? ( test )"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	acct-group/vboxusers
-	app-arch/xz-utils
-	~app-emulation/virtualbox-modules-${PV%*a}
-	dev-libs/libtpms
-	dev-libs/libxml2:=
-	dev-libs/openssl:0=
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libvorbis
-	media-libs/libvpx:0=
-	net-misc/curl
-	virtual/zlib:=
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtbase:6[X,wayland,widgets]
-		dev-qt/qtscxml:6
-		dev-qt/qttools:6[assistant]
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,video]
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	x11-libs/libXt
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-base/xorg-proto
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? (
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-	)
-	pulseaudio? ( media-libs/libpulse )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	>=app-arch/tar-1.34-r2
-	>=dev-lang/yasm-0.6.2
-	dev-util/glslang
-	>=dev-build/kbuild-0.1.9998.3660
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-doc/dita-ot-bin
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qttools:6[assistant]
-		sys-libs/nss_wrapper
-	)
-	gui? ( dev-qt/qttools:6[linguist] )
-	nls? ( dev-qt/qttools:6[linguist] )
-	java? ( virtual/jdk:1.8 )
-	python? (
-		${PYTHON_DEPS}
-		test? (
-			$(python_gen_cond_dep '
-				dev-python/pytest[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk ${PYTHON_REQUIRED_USE} )
-	test? ( !debug )
-	vboxwebsrv? ( java )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel-make.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-${PATCHES_PV}/patches
-)
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use nls && use gui; then
-		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
-		einfo "will have NLS support."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python; then
-		mkdir test
-		cp "${FILESDIR}"/test_python.py test/
-		python_fix_shebang test/test_python.py
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# bug #916002, #488176, #925347
-	tc-ld-is-mold || tc-ld-force-bfd
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# bug #940482
-	filter-flags -fno-plt
-
-	# bug #908814
-	filter-lto
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		sed -i 's/sdl-config/sdl2-config/' configure || die
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	if tc-is-clang; then
-		# clang does not support this extension
-		eapply "${FILESDIR}"/${PN}-7.1.0-disable-rebuild-iPxeBiosBin.patch
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# fix help path #891879
-	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VMR3.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-
-	if ! use nls && ! use gui; then
-		cat >> LocalConfig.kmk <<-EOF || die
-			VBOX_WITH_NLS :=
-			VBOX_WITH_MAIN_NLS :=
-			VBOX_WITH_PUEL_NLS :=
-			VBOX_WITH_VBOXMANAGE_NLS :=
-		EOF
-	fi
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	# --enable-webservice is a no-op
-	# webservice is automagically enabled if gsoap is found
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev !vboxwebsrv --with-gsoap-dir=/dev/null)
-		$(usev vde --enable-vde)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-		# disable shared clipboard when headless, it crashes when connecting with RDP: bug #955867
-		echo -e "\nVBOX_WITH_SHARED_CLIPBOARD :=" >> LocalConfig.kmk || die
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	if use python; then
-		cat >> AutoConfig.kmk <<-EOF || die
-			VBOX_WITH_PYTHON=$(usev python 1)
-			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-			VBOX_LIB_PYTHON=$(python_get_library_path)
-		EOF
-
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	else
-		cat >> AutoConfig.kmk <<-EOF || die
-			VBOX_WITH_PYTHON:=
-		EOF
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	if use doc; then
-		# dita needs to write to ~/.fop and ~/.java
-		# but it ignores ${HOME} and tries to write to the real home of user portage
-		# resulting in a sandbox violation
-		# -Duser.home= does not work
-		# force using the temporary homedir with nss_wrapper
-		echo "${LOGNAME}::$(id -u):$(id -g):${USER}:${HOME}:/bin/bash" >> ~/passwd
-		echo "${LOGNAME}::$(id -g):" >> ~/group
-
-		local -x LD_PRELOAD=libnss_wrapper.so
-		local -x NSS_WRAPPER_PASSWD="${HOME}"/passwd
-		local -x NSS_WRAPPER_GROUP="${HOME}"/group
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_test() {
-	if use python; then
-		local -x VBOX_APP_HOME="${S}"/out/linux.${ARCH}/$(usex debug debug release)
-		local -x VBOX_INSTALL_PATH="${VBOX_APP_HOME}"
-		local -x VBOX_PROGRAM_PATH="${VBOX_APP_HOME}"/bin
-		local -x VBOX_SDK_PATH="${VBOX_PROGRAM_PATH}"/sdk
-		local -x PYTHONPATH="${VBOX_SDK_PATH}"/installer/python/vboxapi/src
-		einfo "VBOX_APP_HOME ${VBOX_APP_HOME}"
-		einfo "VBOX_PROGRAM_PATH ${VBOX_PROGRAM_PATH}"
-		einfo "VBOX_SDK_PATH ${VBOX_SDK_PATH}"
-		einfo "PYTHONPATH ${PYTHONPATH}"
-		LD_LIBRARY_PATH="${VBOX_PROGRAM_PATH}" epytest test/
-	fi
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{-x86,-amd64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	# environment variables used during SDK binding installation
-	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
-	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM 4750
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		domenu ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	elif use gui; then
-		dodoc "${WORKDIR}"/${PN}-help-${HELP_PV}/UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-
-		# 378871
-		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src"
-		pushd "${installer_dir}" &> /dev/null || die
-		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
-			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
-			-i vboxapi/__init__.py || die
-		# insert shebang, the files come without one
-		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
-		python_domodule vboxapi
-		popd &> /dev/null || die
-
-		# upstream added a /bin/sh stub here
-		# use /usr/bin/python3, python_doscript will take care of it
-		sed -e '1 i #! /usr/bin/python3' -i vboxshell.py
-		python_doscript vboxshell.py
-
-		# do not install the installer
-		rm -r "${installer_dir%vboxapi*}" || die
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index ef6e2f9bf965..f1935c07be20 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -2,3 +2,4 @@ DIST fastfetch-2.61.0.tar.gz 1452448 BLAKE2B 1fabd1830fea19d764727e678340456c519
 DIST fastfetch-2.63.1.tar.gz 1477073 BLAKE2B 1a15944a77c95c571e519c85aece5abddc1bcaaaa67506214ed3ec47a55acb19e7f6608f81e02dab4643c1574151760192a1ea7665ff5db6d58850934825d92d SHA512 ff92fe75c29a3418052cf48475eaa08d697825fc41e4d36bab46cfcd91a8f704bde7dae6cacfb6af272be4040fd101bcc5ef7e235540a7427102073d70607464
 DIST fastfetch-2.65.2.tar.gz 1555551 BLAKE2B c5319784aee7f66beb03c043562124ce162c40082099592f37cea5f8dc96583eed995305f392b29affa9f9dc139a0b1dea8d9e589600699953cb396eff73a9b6 SHA512 750b6ea174fe37f0c232ee2d0d76c7c8696c9c25b27a35bc36f598ffa52a165f3a6dca0390cbac1f00c1a1b304e3e8ef1bf5a433e79932f179c4d0b48550dbbf
 DIST fastfetch-2.67.1.tar.gz 1573878 BLAKE2B ff59b9af59008f6e9b4141308bc5b2d7fa44014dd5831d0fc00190fe723dc9f5803f8083feca3c6535237bc80d4fea6a363b09f317d76e480207c309cca493c3 SHA512 b1cc5eba51073471deabaae1f9d8af48218a6ddd2468666bd1826a19da6aa26b8a997ed5a0d06f2e626008bb2a58d1a0c44eb67795c10c4ebc1a3774cf7743d2
+DIST fastfetch-2.68.1.tar.gz 1635873 BLAKE2B 7de1b69166e4868d41cf3f1bfb45205c44e1a9a6fcbef14751df53c80fcf35c7551efeeca1b129b75a61831886ebc4f29ad2d1dcb1513c79bca7a56ecca66f6e SHA512 4819538c23a66fa24383ce7ce872486cbfc7a9e1c3c8e1efa0764fa57b0f47513b9b2a393fd95b5550011db4095532113e2cdaca48756611991e1abefcfbc9a6
diff --git a/app-misc/fastfetch/fastfetch-2.68.1.ebuild b/app-misc/fastfetch/fastfetch-2.68.1.ebuild
new file mode 100644
index 000000000000..ab4725331844
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.68.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake flag-o-matic lua-single
+
+DESCRIPTION="Fast neofetch-like system information tool"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
+else
+	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X chafa dbus ddcutil drm efl elf gnome imagemagick lua opencl opengl pulseaudio sqlite test vaapi vdpau vulkan wayland xcb xrandr"
+RESTRICT="!test? ( test )"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
+RDEPEND="
+	>=dev-libs/yyjson-0.12.0
+	sys-apps/hwdata
+	virtual/zlib:=
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
+	elf? ( virtual/libelf:= )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	lua? ( ${LUA_DEPS} )
+	opencl? ( virtual/opencl )
+	opengl? (
+		media-libs/libglvnd[X?]
+		X? ( x11-libs/libX11 )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	sqlite? ( dev-db/sqlite:3 )
+	vaapi? ( media-libs/libva:=[X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="
+	${RDEPEND}
+	efl? ( dev-libs/efl )
+	opengl? ( X? ( x11-base/xorg-proto ) )
+	xcb? ( x11-base/xorg-proto )
+	xrandr? ( x11-base/xorg-proto )
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	chafa? ( imagemagick )
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-cmake_lua_version.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local glx=no
+	if use X; then
+		if use opengl; then
+			glx=yes
+		else
+			ewarn 'USE="X" adds GLX support for USE="opengl"'
+			ewarn 'This build with USE="X -opengl" will not include any extra X support.'
+		fi
+	fi
+
+	local mycmakeargs=(
+		# requires >=dev-libs/quickjs-ng-0.15
+		-DENABLE_QUICKJS=no
+
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+		-DIS_MUSL=$(usex elibc_musl)
+		-DINSTALL_LICENSE=no
+		-DBUILD_FLASHFETCH=no
+		-DPACKAGES_REMOVE_DISABLED=yes
+
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
+		-DENABLE_EET=$(usex efl)
+		-DENABLE_ELF=$(usex elf)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_GLX=${glx}
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_PULSE=$(usex pulseaudio)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_VADRM=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	if use vaapi && use X; then
+		mycmakeargs+=( -DENABLE_VAX11=1 )
+	else
+		mycmakeargs+=( -DENABLE_VAX11=0 )
+	fi
+
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_VERSION="$(lua_get_version)"
+		)
+	fi
+
+	append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index d0414f8f187f..7440cc9f1ad2 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1 +1,2 @@
 DIST grisbi-3.0.4.tar.bz2 12888285 BLAKE2B 816750d6d2bb2d94f46124613f921f4d4fe3a7b261a8b6a021b5009771fd603764545ea7bafc19319cfdedc07b12e709fe9b311d865e4fe121e031463686645c SHA512 cfaec0c93d7ca535dcdfa214a7222f20ffd826af766c01b0116515830ea72e24ec4a8be420a460d66ea4bac7293bb00bb53bfb32afc805f679a6c04f5f974139
+DIST grisbi-3.90.1.tar.xz 11221536 BLAKE2B 4e0440ca7a9cc73b331d4d63a9b28f2cebb05fe0d2678198e72755fdcbeec6d6d9c47857ce4d5281dfe7e40fb392dcf3d36013d87f2ce73b079d13fc66fce18a SHA512 824dcc891656b028b6d6d82931241d804e595b0bd33de77364a63fb0e2e347c4230f6110f6821e654ad97347047231d4be4e02668e1cc827087c748d45085bd5
diff --git a/app-office/grisbi/grisbi-3.90.1.ebuild b/app-office/grisbi/grisbi-3.90.1.ebuild
new file mode 100644
index 000000000000..bd376fe0c315
--- /dev/null
+++ b/app-office/grisbi/grisbi-3.90.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools gnome2
+
+DESCRIPTION="Grisbi is a personal accounting application for Linux"
+HOMEPAGE="http://www.grisbi.org https://github.com/grisbi/grisbi"
+SRC_URI="https://downloads.sourceforge.net/${PN}/grisbi%20stable/3.0.x/${PV}/${P}.tar.xz"
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="goffice nls ofx ssl"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2=
+	gnome-extra/libgsf
+	virtual/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-misc/xdg-utils
+	ssl? ( >=dev-libs/openssl-1.0.0:0= )
+	ofx? ( >=dev-libs/libofx-0.9.0:= )
+	goffice? ( >=x11-libs/goffice-0.10.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-libxml2 \
+		--without-cunit \
+		--disable-static \
+		$(use_with ssl openssl) \
+		$(use_with ofx) \
+		$(use_with goffice) \
+		$(use_enable nls)
+}
diff --git a/app-office/grisbi/metadata.xml b/app-office/grisbi/metadata.xml
index 914150178b8e..f30d86a2f814 100644
--- a/app-office/grisbi/metadata.xml
+++ b/app-office/grisbi/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>casta@xwing.info</email>
-    <name>Guillaume Castagnino</name>
-  </maintainer>
   <maintainer type="project">
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <use>
     <flag name="goffice">enable goffice graphic support</flag>
   </use>
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 19e21e9d3565..7ef757244664 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1 +1,2 @@
 DIST kmymoney-5.2.2.tar.xz 11354812 BLAKE2B 701ef89f27c50d3b297ff59c8a4b30e6852786fdadabef2d08e4fa17740dbdeb5019a1851a852748fe7808eb29b8aa57afd20f035067dfb66f31612e9be83352 SHA512 3802f75679cbdbda9f2e95a503284c448bc266a0de252b29c57e0dbb076112bf5aa70bff81450f9df22b5324a68c7951af6c3c2ae2f0200f748c49c040ff82e3
+DIST kmymoney-5.2.2_p20260906.tar.xz 11434192 BLAKE2B 03aa9f5be206cf448e01b8d0b5630dd7bc8fda81e03269c04e17e211cc7edf25360d8f402f2fde01027a51deb1eba54bd4ae550c69ba639add9cd14886a3426c SHA512 a9da5eb8a05c5268f60c68717b6a8f02a312072e52f3c2b596ad8ba2e9874efbbf331b74f5ee994a2c1aa6f519f6e96964bbb3bfdad227d36367527d7a75b579
diff --git a/app-office/kmymoney/kmymoney-5.2.2_p20260906.ebuild b/app-office/kmymoney/kmymoney-5.2.2_p20260906.ebuild
new file mode 100644
index 000000000000..37ccf35a32c6
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.2.2_p20260906.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_BRANCH="5.2"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+QTMIN=6.11.2
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org optfeature xdg
+
+DESCRIPTION="Personal finance manager based on KDE Frameworks"
+HOMEPAGE="https://kmymoney.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	# SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~asturm/distfiles/kde/${P}.tar.xz" # at a05ef0f9
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="activities addressbook calendar hbci holidays sql sqlcipher"
+[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
+
+REQUIRED_USE="sqlcipher? ( sql )"
+
+COMMON_DEPEND="
+	dev-cpp/gpgmepp:=
+	dev-libs/qgpgme:=
+	>=app-office/libalkimia-8.2.1:=
+	dev-libs/gmp:0=[cxx(+)]
+	dev-libs/kdiagram:6
+	dev-libs/libgpg-error
+	dev-libs/libofx:=
+	>=dev-libs/qtkeychain-0.16.0:=
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql?,widgets,xml]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6= )
+	addressbook? (
+		kde-apps/akonadi:6=
+		kde-apps/kidentitymanagement:6=
+		>=kde-frameworks/kcontacts-${KFMIN}:6
+	)
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=dev-qt/qtdeclarative-${QTMIN}:6
+		>=net-libs/aqbanking-6.8.4
+		>=sys-libs/gwenhywfar-5.14.1:=[qt6]
+	)
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:6 )
+	sql? ( >=dev-qt/qtbase-${QTMIN}:6[sqlite] )
+	sqlcipher? ( dev-db/sqlcipher )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
+		ewarn "USE experimental set: Building unfinished features."
+		ewarn "This *will* chew up your data. You have been warned."
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	sed -e "/find_program.*CCACHE_PROGRAM/s/^/# /" \
+		-e "/if.*CCACHE_PROGRAM/s/CCACHE_PROGRAM/0/" \
+		-i CMakeLists.txt || die # no, no no.
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON # high level CMake fix
+		-DENABLE_WOOB=OFF # ported to Py3; not yet re-added in Gentoo
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake_use_find_package activities PlasmaActivities)
+		$(cmake_use_find_package addressbook KF6Contacts)
+		$(cmake_use_find_package addressbook KPim6Akonadi)
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DENABLE_KBANKING=$(usex hbci)
+		$(cmake_use_find_package holidays KF6Holidays)
+		-DENABLE_SQLSTORAGE=$(usex sql)
+		$(cmake_use_find_package sql Qt6Sql)
+		-DENABLE_SQLCIPHER=$(usex sqlcipher)
+	)
+	[[ ${KDE_BUILD_TYPE} = live ]] &&
+		mycmakeargs+=( -DENABLE_COSTCENTER=$(usex experimental) )
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "more options for online stock quote retrieval" dev-perl/Finance-Quote
+	fi
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 3d960b28e0bb..17028e0d8f90 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1 +1,2 @@
 DIST skrooge-26.4.0.tar.xz 30298556 BLAKE2B caa339b4c1958949d1102ff387376fd887a8a3475ac6347b76647789d4cac6a88180724c7238b758bdefd79976d4aa2844f40f8f663752598a2bcf315cc182ea SHA512 84efa17c0d5f24258cfc015bccb1cc9daacdeb43d0f237b6c5b54843da2fbad25c4512652f6b9f40a5a25e428aa71dcbce18504d6184e3bfada01cc1b017dc13
+DIST skrooge-26.8.0.tar.xz 25908108 BLAKE2B cbe84d4d1d47ec17bcf788f9d60da3e0e6752b7f853ce6892b82bd480a7af7288b4c1bb1db2a21ffb2244e499ceaaaf7b0af5583f941a66e54a3673d4d87866e SHA512 5811a3ed0eabfad69d54bc02a4e043b22ff41492349635458fa62d1829d43e09198a1f27627da27a4fb57369f1557a9a059f972fad717c4529a6188188eaeaf8
diff --git a/app-office/skrooge/skrooge-26.8.0.ebuild b/app-office/skrooge/skrooge-26.8.0.ebuild
new file mode 100644
index 000000000000..7fddf66334bc
--- /dev/null
+++ b/app-office/skrooge/skrooge-26.8.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.29.0
+QTMIN=6.11.2
+inherit ecm kde.org xdg
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="activities kde ofx"
+
+# hangs + installs files (also requires KF6DesignerPlugin)
+RESTRICT="test"
+
+DEPEND="
+	dev-db/sqlcipher
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexttemplate-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	activities? ( kde-plasma/plasma-activities:6= )
+	kde? ( >=kde-frameworks/krunner-${KFMIN}:6 )
+	ofx? ( dev-libs/libofx:= )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_WEBENGINE=ON
+		-DSKG_DESIGNER=OFF
+		$(cmake_use_find_package activities PlasmaActivities)
+		$(cmake_use_find_package kde KF6Runner)
+		$(cmake_use_find_package ofx LibOfx)
+		-DSKG_BUILD_TEST=$(usex test)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	ecm_src_test
+}
diff --git a/app-text/gspell/gspell-1.14.4.ebuild b/app-text/gspell/gspell-1.14.4.ebuild
index 603b91868f0f..3b193366a396 100644
--- a/app-text/gspell/gspell-1.14.4.ebuild
+++ b/app-text/gspell/gspell-1.14.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-4.20.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.20.0-r1.ebuild
index 493c3157bcf0..a148ac21c6ff 100644
--- a/dev-cpp/gtkmm/gtkmm-4.20.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.20.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.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"
 IUSE="gtk-doc test vulkan"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/mm-common/mm-common-1.0.8.ebuild b/dev-cpp/mm-common/mm-common-1.0.8.ebuild
index 0658dc35b315..ac83395d8cb7 100644
--- a/dev-cpp/mm-common/mm-common-1.0.8.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="${PYTHON_DEPS}"
 
diff --git a/dev-cpp/pangomm/pangomm-2.56.2.ebuild b/dev-cpp/pangomm/pangomm-2.56.2.ebuild
index 43ed395707c9..b7616802b468 100644
--- a/dev-cpp/pangomm/pangomm-2.56.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.56.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gtkmm.gnome.org/en/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="dot gtk-doc"
 
 RDEPEND="
diff --git a/dev-db/postgresql/files/postgresql-14.23-replicadeadlock.patch b/dev-db/postgresql/files/postgresql-14.23-replicadeadlock.patch
deleted file mode 100644
index 79a1dc1dc050..000000000000
--- a/dev-db/postgresql/files/postgresql-14.23-replicadeadlock.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
-Date: Wed, 27 May 2026 08:49:50 +0000 (+0300)
-Subject: Fix self-deadlock when replaying WAL generated by older minor version
-X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=2bb60eb4feab76ac5ea2ea6f15111b569ea48b62
-
-Fix self-deadlock when replaying WAL generated by older minor version
-
-Commit 77dff5d937 introduced a SimpleLruWriteAll() call when replaying
-multixact WAL records generated by older minor versions. However,
-SimpleLruWriteAll() acquires the SLRU lock and on v16 and below, it's
-called while already holding the lock, leading to self-deadlock.
-Version 17 and 18 did not have that problem, because in those versions
-the lock is acquired later in the function.
-
-To fix, acquire MultiXactOffsetSLRULock later in RecordNewMultiXact(),
-at the same place where it's acquired on version 17 and 18.
-
-Author: Andrey Borodin <x4mmm@yandex-team.ru>
-Reported-by: Radim Marek <radim@boringsql.com>
-Discussion: https://www.postgresql.org/message-id/19490-9c59c6a583513b99@postgresql.org
-Backpatch-through: 14-16
----
-
-diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
-index de79d1d6072..0b26ea7be37 100644
---- a/src/backend/access/transam/multixact.c
-+++ b/src/backend/access/transam/multixact.c
-@@ -887,8 +887,6 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 	MultiXactOffset *next_offptr;
- 	MultiXactOffset next_offset;
- 
--	LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
--
- 	/* position of this multixid in the offsets SLRU area  */
- 	pageno = MultiXactIdToOffsetPage(multi);
- 	entryno = MultiXactIdToOffsetEntry(multi);
-@@ -950,6 +948,8 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 		{
- 			elog(DEBUG1, "next offsets page is not initialized, initializing it now");
- 
-+			LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
-+
- 			/* Create and zero the page */
- 			slotno = SimpleLruZeroPage(MultiXactOffsetCtl, next_pageno);
- 
-@@ -957,6 +957,8 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 			SimpleLruWritePage(MultiXactOffsetCtl, slotno);
- 			Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
- 
-+			LWLockRelease(MultiXactOffsetSLRULock);
-+
- 			/*
- 			 * Remember that we initialized the page, so that we don't zero it
- 			 * again at the XLOG_MULTIXACT_ZERO_OFF_PAGE record.
-@@ -975,6 +977,7 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 	 * concurrently, we might race ahead and get called before the previous
- 	 * multixid.
- 	 */
-+	LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
- 
- 	/*
- 	 * Note: we pass the MultiXactId to SimpleLruReadPage as the "transaction"
diff --git a/dev-db/postgresql/files/postgresql-15.18-replicadeadlock.patch b/dev-db/postgresql/files/postgresql-15.18-replicadeadlock.patch
deleted file mode 100644
index 261dfba037e7..000000000000
--- a/dev-db/postgresql/files/postgresql-15.18-replicadeadlock.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
-Date: Wed, 27 May 2026 08:49:50 +0000 (+0300)
-Subject: Fix self-deadlock when replaying WAL generated by older minor version
-X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=2dfe75f9844f29f8b2621ed68ee12e577f05e7f3
-
-Fix self-deadlock when replaying WAL generated by older minor version
-
-Commit 77dff5d937 introduced a SimpleLruWriteAll() call when replaying
-multixact WAL records generated by older minor versions. However,
-SimpleLruWriteAll() acquires the SLRU lock and on v16 and below, it's
-called while already holding the lock, leading to self-deadlock.
-Version 17 and 18 did not have that problem, because in those versions
-the lock is acquired later in the function.
-
-To fix, acquire MultiXactOffsetSLRULock later in RecordNewMultiXact(),
-at the same place where it's acquired on version 17 and 18.
-
-Author: Andrey Borodin <x4mmm@yandex-team.ru>
-Reported-by: Radim Marek <radim@boringsql.com>
-Discussion: https://www.postgresql.org/message-id/19490-9c59c6a583513b99@postgresql.org
-Backpatch-through: 14-16
----
-
-diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
-index 0af1c61a4cc..8b5220d8aab 100644
---- a/src/backend/access/transam/multixact.c
-+++ b/src/backend/access/transam/multixact.c
-@@ -887,8 +887,6 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 	MultiXactOffset *next_offptr;
- 	MultiXactOffset next_offset;
- 
--	LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
--
- 	/* position of this multixid in the offsets SLRU area  */
- 	pageno = MultiXactIdToOffsetPage(multi);
- 	entryno = MultiXactIdToOffsetEntry(multi);
-@@ -950,6 +948,8 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 		{
- 			elog(DEBUG1, "next offsets page is not initialized, initializing it now");
- 
-+			LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
-+
- 			/* Create and zero the page */
- 			slotno = SimpleLruZeroPage(MultiXactOffsetCtl, next_pageno);
- 
-@@ -957,6 +957,8 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 			SimpleLruWritePage(MultiXactOffsetCtl, slotno);
- 			Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
- 
-+			LWLockRelease(MultiXactOffsetSLRULock);
-+
- 			/*
- 			 * Remember that we initialized the page, so that we don't zero it
- 			 * again at the XLOG_MULTIXACT_ZERO_OFF_PAGE record.
-@@ -975,6 +977,7 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 	 * concurrently, we might race ahead and get called before the previous
- 	 * multixid.
- 	 */
-+	LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
- 
- 	/*
- 	 * Note: we pass the MultiXactId to SimpleLruReadPage as the "transaction"
diff --git a/dev-db/postgresql/files/postgresql-16.14-replicadeadlock.patch b/dev-db/postgresql/files/postgresql-16.14-replicadeadlock.patch
deleted file mode 100644
index 733c9d43b8a3..000000000000
--- a/dev-db/postgresql/files/postgresql-16.14-replicadeadlock.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
-Date: Wed, 27 May 2026 08:49:50 +0000 (+0300)
-Subject: Fix self-deadlock when replaying WAL generated by older minor version
-X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=42a3194e548349b658a808347df3d3d5e6b968af
-
-Fix self-deadlock when replaying WAL generated by older minor version
-
-Commit 77dff5d937 introduced a SimpleLruWriteAll() call when replaying
-multixact WAL records generated by older minor versions. However,
-SimpleLruWriteAll() acquires the SLRU lock and on v16 and below, it's
-called while already holding the lock, leading to self-deadlock.
-Version 17 and 18 did not have that problem, because in those versions
-the lock is acquired later in the function.
-
-To fix, acquire MultiXactOffsetSLRULock later in RecordNewMultiXact(),
-at the same place where it's acquired on version 17 and 18.
-
-Author: Andrey Borodin <x4mmm@yandex-team.ru>
-Reported-by: Radim Marek <radim@boringsql.com>
-Discussion: https://www.postgresql.org/message-id/19490-9c59c6a583513b99@postgresql.org
-Backpatch-through: 14-16
----
-
-diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
-index f825579e888..8408492879b 100644
---- a/src/backend/access/transam/multixact.c
-+++ b/src/backend/access/transam/multixact.c
-@@ -888,8 +888,6 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 	MultiXactOffset *next_offptr;
- 	MultiXactOffset next_offset;
- 
--	LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
--
- 	/* position of this multixid in the offsets SLRU area  */
- 	pageno = MultiXactIdToOffsetPage(multi);
- 	entryno = MultiXactIdToOffsetEntry(multi);
-@@ -951,6 +949,8 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 		{
- 			elog(DEBUG1, "next offsets page is not initialized, initializing it now");
- 
-+			LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
-+
- 			/* Create and zero the page */
- 			slotno = SimpleLruZeroPage(MultiXactOffsetCtl, next_pageno);
- 
-@@ -958,6 +958,8 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 			SimpleLruWritePage(MultiXactOffsetCtl, slotno);
- 			Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
- 
-+			LWLockRelease(MultiXactOffsetSLRULock);
-+
- 			/*
- 			 * Remember that we initialized the page, so that we don't zero it
- 			 * again at the XLOG_MULTIXACT_ZERO_OFF_PAGE record.
-@@ -976,6 +978,7 @@ RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset,
- 	 * concurrently, we might race ahead and get called before the previous
- 	 * multixid.
- 	 */
-+	LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE);
- 
- 	/*
- 	 * Note: we pass the MultiXactId to SimpleLruReadPage as the "transaction"
diff --git a/dev-lang/go-bootstrap/files/make-go-bootstraps b/dev-lang/go-bootstrap/files/make-go-bootstraps
index 6ad27296b57e..6ad27296b57e 100644..100755
--- a/dev-lang/go-bootstrap/files/make-go-bootstraps
+++ b/dev-lang/go-bootstrap/files/make-go-bootstraps
diff --git a/dev-lang/python/python-3.10.21.ebuild b/dev-lang/python/python-3.10.21.ebuild
index 3b5799d53f6c..7b1f2281cfa1 100644
--- a/dev-lang/python/python-3.10.21.ebuild
+++ b/dev-lang/python/python-3.10.21.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="
 	bluetooth debug +ensurepip examples gdbm libedit +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.11.16.ebuild b/dev-lang/python/python-3.11.16.ebuild
index 58e364bf25a2..b9fd028a4e3a 100644
--- a/dev-lang/python/python-3.11.16.ebuild
+++ b/dev-lang/python/python-3.11.16.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="
 	bluetooth debug +ensurepip examples gdbm libedit +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.12.14.ebuild b/dev-lang/python/python-3.12.14.ebuild
index f31347ad28b8..8aa2da3b30b3 100644
--- a/dev-lang/python/python-3.12.14.ebuild
+++ b/dev-lang/python/python-3.12.14.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="
 	bluetooth debug +ensurepip examples gdbm libedit +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
diff --git a/dev-libs/gjs/gjs-1.88.1.ebuild b/dev-libs/gjs/gjs-1.88.1.ebuild
index 11727e159a2f..704fc1224c7b 100644
--- a/dev-libs/gjs/gjs-1.88.1.ebuild
+++ b/dev-libs/gjs/gjs-1.88.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gjs.guide"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 IUSE="examples readline sysprof test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/glib/glib-2.88.3.ebuild b/dev-libs/glib/glib-2.88.3.ebuild
index 16b841e59bf2..c4014ef8f97f 100644
--- a/dev-libs/glib/glib-2.88.3.ebuild
+++ b/dev-libs/glib/glib-2.88.3.ebuild
@@ -23,7 +23,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-26.27.39122.12.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-26.27.39122.12-r1.ebuild
index e741b24eb244..1af71399b647 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-26.27.39122.12.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-26.27.39122.12-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	>=dev-util/intel-graphics-system-controller-1.3.0:=
 	media-libs/mesa
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.32.0:= )
+	l0? ( <dev-libs/level-zero-1.33.1:= )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		media-libs/libva
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a051b362802a..901152f09c46 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,2 +1,4 @@
 DIST pcre2-10.47.tar.bz2 2145789 BLAKE2B 9b56eddbc8b6fd6ce925575c337891c4f7790215c77325c1f0ad4a72be07e2a2a6a6b6638a5a2c49d1da6f4715320f240fd17c4ffcb77d1bb00875b990d6ee13 SHA512 889a6fdc80f8a7285e4a75d189c183b4588df81bdf048302cf0830e11bbf9b9eeb387ba43dfd3aff8ffb3aa693291e8c535845c06e8ce92d1028cefa6b474804
 DIST pcre2-10.47.tar.bz2.sig 566 BLAKE2B 0bfe968f32c410a49bf1120b05027d3171b38fdd8fd4d9d77e58cad4811770ef9cabcc3275556116a5cfe28784fc5faa0c5f5bf959e7aae9d6ef2f491ffbb936 SHA512 fbea8f001533c700e0adae881d2d13f2a5f32c272cb1323fd6b76530b011fb3e8eafdc6eb762c36d91296f66fe2fe3861887d6f5219045a2dad8de55f3825051
+DIST pcre2-10.48.tar.bz2 2213024 BLAKE2B 7c500b4271e13c8a965a85c2aac4a72d5f29b7a3318b6077fa9de391512669ad26a5a774eee322c966ed38127ca9dfc139e4dacc1c1b23578d0674d882b3d84c SHA512 b350b8bfc909f3ebf9dfe39c535f04cc4618997f0fa025d12b4d92aaaac3c15ae93b6def62ed220eabbe08df9277cda0b80de4eedb7ec7376daf7e6a78a868b8
+DIST pcre2-10.48.tar.bz2.sig 566 BLAKE2B 13e1820f3b4a5c4175447c078c5c6829194681cbf368a67126ef3108ce3988908b1c8a22f3d82563fa9e13b17cb1d5daa5b274c4292fcfe78cae1512c7eddcbe SHA512 07373ddc9f7687caae29ad632cedeb4fb2306bce91c04e29754672ef98e4f37b4f92bfe135c53f0162d7f7d4d654a77aa6341cd1168c630357e0a685ce8c33dc
diff --git a/dev-libs/libpcre2/libpcre2-10.48.ebuild b/dev-libs/libpcre2/libpcre2-10.48.ebuild
new file mode 100644
index 000000000000..6a7f13d47276
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.48.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Always bump this package with virtual/libpcre2-internals.
+
+# https://pcre2project.github.io/pcre2/project/security/
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nicholaswilson.asc
+inherit dot-a libtool multilib multilib-minimal toolchain-funcs verify-sig
+
+MY_P="pcre2-${PV/_rc/-RC}"
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://pcre2project.github.io/pcre2/ https://www.pcre.org/"
+SRC_URI="
+	https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+	verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+	zlib? ( virtual/zlib:= )
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-nicholaswilson-20250910 )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Only exists in MS Visual C++ (bug #954363)
+	__assume
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	use static-libs && lto-guarantee-fat
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable valgrind)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_test() {
+	emake check VERBOSE=yes
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+
+	# bug #934977
+	if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/libpcre2-8$(get_libname)" ]] ; then
+		eerror "Sanity check for libpcre2-8$(get_libname) failed."
+		eerror "Shared library wasn't built, possible libtool bug"
+		[[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "libpcre2-8$(get_libname) not found in build, aborting"
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+	strip-lto-bytecode
+}
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 12f8570814d2..5b77a43c2190 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,4 @@
-DIST ansi2html-1.9.2.tar.gz 44300 BLAKE2B 6c39a9525a5fe0c7f02b45f56ea515e6b07280cb74a88d54db5e33c77fb679f6ebb446edf50add3d68832ea877ed8861bc1a9f2116ab1214d2a6b3acfbfae19a SHA512 c465259d4c9ea82725bcd8cd286246b806b1bfde06f89b52b1cc3cd5c514be92a19ffcfd147417d64ce6da6627678baabc7ff05226ed392343cdb0496bd375eb
-DIST ansi2html-1.9.3.tar.gz 44781 BLAKE2B 6c02b4a661d6423d9100de3d92a19240767ff84bd9f21116f70cfa19efcc05f92049b5a29f6c288a40fe7e1bf792b01b696439c8cc06e023e9143dcf2ea859e4 SHA512 13cf8a43315c5e91692f06d9dc859517903b763e3e83078f1ea4863ed9fa40ec01e4b477992457fa63c33b719b88eb56caca11dc52f9b2898e4910112f66f28f
-DIST ansi2html-1.9.3.tar.gz.provenance 9713 BLAKE2B 697fc0ce117e3b7a2519767c8f218a73689d7848f6fa77db4158eb21286c09d3fdf8a14ff7eeab7303114809c48f134ad32278ec0cf2ada870b8b70421cfdd29 SHA512 38e46c36f0dc79459c0183920f58c93ed0defa1c0c1e31fba0018a3f4e47d648042b472e52f9f6076a49d9e744ed38d59d3de1d437504ecb58973a713674ae59
 DIST ansi2html-1.9.4.tar.gz 44890 BLAKE2B 1d87bca8c943a05cefe93e67da12d26d82402ae2513853024c0f629646826fe9d47dd27dfb809dcbf8d534dc641150cbd3f5bb383aedea47c92f5a4d407d209b SHA512 11c33415061b526fbf75c436090b58b785123d155e6e7ab630178dfd7ede1c4bf00256a3410c0f72b273fd678f2a0cfcdd5c159781e3ad32cf3e3107d6be9921
 DIST ansi2html-1.9.4.tar.gz.provenance 9807 BLAKE2B 427717400d6187f28ed14f4d1c7adb068571e22d92ef9e81e3f8a2d4ff64b1afe0f9de51721fc250250294ae9df28a5762e9476bb46410b021415fb29bb83505 SHA512 bcd53cb651d6077eb9d246a318684b76bc5857aa3287505edebab55a6b1ee039bf22c63bbbc51940a0177c6990f0cf12c71240353efac57d43f9eca26c2684c9
+DIST ansi2html-1.9.5.tar.gz 45225 BLAKE2B dedce994c7c126f63d7404c08d366201ef26063ecea610d02d938408eee7509d9096797439583d93f40fb7b3e69e314123dca75ba562dec1a14a8d7973e54ad1 SHA512 32124e1957f2d5f4e2cf50d6e79665412a002768aae4347554a74ecb9209145b1ee071f6b09402a1a999229f8d941f9902adb3d2b74656272b58260393c8f739
+DIST ansi2html-1.9.5.tar.gz.provenance 10042 BLAKE2B 4ec5a815c70f86f4caef46da5edb4bceddb2e7e83d22b2d16f339b1723e539f96df2ef21d0aa6214a870bd8b278871b2678a6a6e070fc8910f41a5351ed8baa3 SHA512 e053f352fdd08135ba4c322e34a134c6502bb21faab9027efb6ea1bc0e6bf0a94a56e1ebeaa39d15ff5a03a346da720c247c1369b473f61116e1a7f2dffb10db
diff --git a/dev-python/ansi2html/ansi2html-1.9.2.ebuild b/dev-python/ansi2html/ansi2html-1.9.2.ebuild
deleted file mode 100644
index b7af2552df23..000000000000
--- a/dev-python/ansi2html/ansi2html-1.9.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="
-	https://pypi.org/project/ansi2html/
-	https://github.com/pycontribs/ansi2html/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
diff --git a/dev-python/ansi2html/ansi2html-1.9.3.ebuild b/dev-python/ansi2html/ansi2html-1.9.5.ebuild
index 0a12278a9fc9..0a12278a9fc9 100644
--- a/dev-python/ansi2html/ansi2html-1.9.3.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.9.5.ebuild
diff --git a/dev-python/bleach/files/bleach-6.0.0-py39.patch b/dev-python/bleach/files/bleach-6.0.0-py39.patch
deleted file mode 100644
index 02ecb614c8b9..000000000000
--- a/dev-python/bleach/files/bleach-6.0.0-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d6d734f6fbeee2c091212d42e3ea730a1230aad5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 24 Jan 2023 07:35:45 +0100
-Subject: [PATCH] Remove tests broken by py3.9
-
----
- tests/test_clean.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/test_clean.py b/tests/test_clean.py
-index 73946a1..f798a15 100644
---- a/tests/test_clean.py
-+++ b/tests/test_clean.py
-@@ -551,31 +551,16 @@ def test_attributes_list():
-             {"protocols": {"http"}},
-             '<a href="example.com">valid</a>',
-         ),
--        (
--            '<a href="example.com:8000">valid</a>',
--            {"protocols": {"http"}},
--            '<a href="example.com:8000">valid</a>',
--        ),
-         (
-             '<a href="localhost">valid</a>',
-             {"protocols": {"http"}},
-             '<a href="localhost">valid</a>',
-         ),
--        (
--            '<a href="localhost:8000">valid</a>',
--            {"protocols": {"http"}},
--            '<a href="localhost:8000">valid</a>',
--        ),
-         (
-             '<a href="192.168.100.100">valid</a>',
-             {"protocols": {"http"}},
-             '<a href="192.168.100.100">valid</a>',
-         ),
--        (
--            '<a href="192.168.100.100:8000">valid</a>',
--            {"protocols": {"http"}},
--            '<a href="192.168.100.100:8000">valid</a>',
--        ),
-         pytest.param(
-             *(
-                 '<a href="192.168.100.100:8000/foo#bar">valid</a>',
--- 
-2.39.1
-
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 1c0f12c2f77b..038ae7a70fa2 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1 +1,2 @@
 DIST cattrs-26.1.0.gh.tar.gz 497524 BLAKE2B 52241c4ac57a26d2262af22c8e4e2747d53f52d467699c11f056d30678183ba973629e57c5a8e94d1728b3c83e39a3f5727f622ce074a00d1b3dbf6d03f232a8 SHA512 1431e7694b3f324ad5c4f0628890f689547a5e3596b9b3087afff491a9bf57117c47e131cea4f88cc52c8f6db88b43baafcadb630d11f13b9f340c88eee7c783
+DIST cattrs-26.2.0.gh.tar.gz 528417 BLAKE2B 93417d70b979d505e2a7e40d5e4cc4c8d26dde38c79ccee666133040741f9799153fbeaf3fecdbb1e7f7a28ab02e8dd172b561c72032ab86effdc793958063b5 SHA512 261dd25ae70cd40b1e237264eb807ee3fcef5140da268beaebaa22aa0e189ff8151acd9da361b0c4d65d7a3d0f6ca58e1534951f1b53f974a87d342f281dae97
diff --git a/dev-python/cattrs/cattrs-26.2.0.ebuild b/dev-python/cattrs/cattrs-26.2.0.ebuild
new file mode 100644
index 000000000000..95f5baab225d
--- /dev/null
+++ b/dev-python/cattrs/cattrs-26.2.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1
+
+DESCRIPTION="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/
+"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/attrs-25.4.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.14.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/immutables-0.20[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.5[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
+		>=dev-python/tomli-w-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ujson-5.10.0[${PYTHON_USEDEP}]
+		test-rust? (
+			$(python_gen_cond_dep '
+				>=dev-python/cbor2-5.4.6[${PYTHON_USEDEP}]
+				>=dev-python/orjson-3.11.3[${PYTHON_USEDEP}]
+			' 'python*')
+		)
+	)
+"
+
+# xdist can randomly break tests, depending on job count
+# https://bugs.gentoo.org/941429
+EPYTEST_PLUGINS=( hypothesis )
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# requires msgspec
+		tests/preconf/test_msgspec_cpython.py
+	)
+	local EPYTEST_DESELECT=(
+		# these require msgspec
+		tests/test_preconf.py::test_literal_dicts_msgspec
+		tests/test_preconf.py::test_msgspec_efficient_enum
+		tests/test_preconf.py::test_msgspec_json_converter
+		tests/test_preconf.py::test_msgspec_json_unions
+		tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides
+		tests/test_preconf.py::test_msgspec_native_enums
+	)
+
+	if ! has_version "dev-python/cbor2[${PYTHON_USEDEP}]"; then
+		# https://github.com/python-attrs/cattrs/pull/748
+		sed -i -e '/cbor2_make_converter/d' tests/test_preconf.py || die
+
+		EPYTEST_DESELECT+=(
+			tests/test_preconf.py::test_cbor2
+			tests/test_preconf.py::test_cbor2_converter
+			tests/test_preconf.py::test_cbor2_converter_unstruct_collection_overrides
+			tests/test_preconf.py::test_cbor2_efficient_enum
+			tests/test_preconf.py::test_cbor2_native_enums
+			tests/test_preconf.py::test_cbor2_unions
+		)
+	fi
+	if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_preconf.py::test_orjson
+			tests/test_preconf.py::test_orjson_converter
+			tests/test_preconf.py::test_orjson_converter_unstruct_collection_overrides
+		)
+	fi
+
+	epytest -o addopts= tests
+}
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 76822a7235e5..965c6add6153 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,2 +1,4 @@
 DIST configargparse-1.7.5.tar.gz 53548 BLAKE2B 4ec999d7e5ac68189b6642b15d2bd2ebac7b25816ccee6a0bfaa1e8624e12e501d614bc8a859f103a519364ff7c2d13afa86a6f9f949d545f799cd6c820a3d62 SHA512 7b6541d0e38ef54ecd3c87d4bd986d041db54b069112d01b24bcb5741d729f73826722e8b0c6bb4959c6066a8b5c6b57a4234b78526879ef8472edfd63eb5de6
 DIST configargparse-1.7.5.tar.gz.provenance 9317 BLAKE2B eb08f865429758ab64c6982f51b8d1ef4d85e1c1fd344976e4a1146bc4e98336bbc56205f8ed08ece34e314eb5459d0a00c1a96733f0c7c046025bfcf0a42f1b SHA512 f1b87d21b556e4c59ed2ce74d5507c2af296ebaba7a0dc6a31f67492ca04305a5f93d3e7f751207c3094f2526e7815ecac0080d1c3eebbe2d7e6479f1a78c0d6
+DIST configargparse-1.7.7.tar.gz 73397 BLAKE2B e2362ab5e391f11fd434289e75da15143f612be75fa2bd44605006dc3ed928a03f460dfdceded173c272d5f12c497eee2b6a70361b8a7b25cd68aaac74f68dfd SHA512 3b1e21a8b4fdcdf357ab0c74fe5db09a405dab13e4b84090ef1217e90f82ed84f6e286e56124292d57e4685d47c48afae90fccaa4acb56bb6ea69e0afeb8e31c
+DIST configargparse-1.7.7.tar.gz.provenance 9585 BLAKE2B df4a7c15dfbc2656a501e73af5401c554f1de40e7d632193cfbc613ea819573b92b4150fdb0a4c20bfff11b994ccef7a8038d2b724ec330a768fab85e2c56f45 SHA512 1998aa807c619bd106e86aae5243e619e8e08581968821ae7ee2c598ea2d7085d1b68503ef1eac3029dc28c50bb8de39a9c30b67c1b1d7e5fac80e3a88cf130b
diff --git a/dev-python/configargparse/configargparse-1.7.7.ebuild b/dev-python/configargparse/configargparse-1.7.7.ebuild
new file mode 100644
index 000000000000..3aaef923b444
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.7.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-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/bw2/ConfigArgParse
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="
+	https://github.com/bw2/ConfigArgParse/
+	https://pypi.org/project/ConfigArgParse/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	epytest
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index e95d0ba3a06b..501a5a1a2afd 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,2 +1,2 @@
-DIST django_otp-1.7.1.tar.gz 76923 BLAKE2B 96915810b86a52ac490f6f8a28bd516d07ee5d8890c66bd5120be2ee4bc9a72997cef6f0ac6e42e20a1f83b2a257ad02160b5976343a94a81f7d2f34893dda00 SHA512 db81dc18505a89a1be109d27c700891bb16df8bf2f281a51886c9c4666d3102a70bd0d87284407026b4ab1a478ca2029d348e908a09533e018c8583f65cd261d
 DIST django_otp-1.7.2.tar.gz 77376 BLAKE2B 197ac5c2375159523fbab9a02cba0a7507f8d0731c260c38edc10c08a6d91a27b42a1a28bd91b4c5505cb68a376ebfaa94836587d08358ccab4bf9f0a5b05765 SHA512 ffec0cd2ab0069615dee2e6a87501d89294d9c50ca0d28ef9bee5b600cdfe84a9df4b751aaa81c9fa330cb372fb3fdc9dd6bd0ab19cde26acd6dd1dd566dd051
+DIST django_otp-1.7.3.tar.gz 78996 BLAKE2B ccd9430a6415900a778a3c15163402915493f1162e680e504112beb22d6eff711c8ed48ec09d2b79f456437d3ad410a952790b98ca22c21232779d364eb9ca17 SHA512 2dd1f70cd506f6e8e3f62544c63dac1b6187f2cc4e585be8a44c10807f50a591ca801eb46881f01c52e629afa5dd98fa0205beeacc6e284ce8c0553d98350655
diff --git a/dev-python/django-otp/django-otp-1.7.1.ebuild b/dev-python/django-otp/django-otp-1.7.3.ebuild
index 963a451ff6e8..963a451ff6e8 100644
--- a/dev-python/django-otp/django-otp-1.7.1.ebuild
+++ b/dev-python/django-otp/django-otp-1.7.3.ebuild
diff --git a/dev-python/grpcio-status/grpcio-status-1.83.0.ebuild b/dev-python/grpcio-status/grpcio-status-1.83.0.ebuild
index addabff81e0e..44049e1200fc 100644
--- a/dev-python/grpcio-status/grpcio-status-1.83.0.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.83.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/src/python/grpcio_status
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio/grpcio-1.83.0.ebuild b/dev-python/grpcio/grpcio-1.83.0.ebuild
index 4ab932815131..e1393626c01f 100644
--- a/dev-python/grpcio/grpcio-1.83.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.83.0.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 DEPEND="
 	dev-libs/openssl:=
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 108bdff4cf1c..b59810e2ca2e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -7,3 +7,5 @@ DIST numpy-2.5.1.tar.gz 20755553 BLAKE2B be71d9f5c615cbc6b59fe5ed8a1c346be654a81
 DIST numpy-2.5.1.tar.gz.provenance 10151 BLAKE2B 9070e62cbbc52de179f688c9a5b1249a98ead2c986f81a8b45eba8928ca8585e888df950eaf729cacb5d0389d1bccbcc4816dd99ddff70bd78f0eb1f91ed2cf6 SHA512 82c1b1ab30004cb43b7e471f84200124f3cf2e40e89e2a1163fb7d4859c2b3ccac3de6611d77b94fef45cc7e3bbf4b49156c641862dd98b556d176e477c59b04
 DIST numpy-2.5.2.tar.gz 20773161 BLAKE2B 53f815c3bff9d5b9efc0dcda2ec5c4ce397402ceb38773153c248c277b78ed0f4247541e5c89d6aabe890a8fa27f67699a8767d2e8ec063794d2eb082840feca SHA512 30d0581b90a88f80de49202e9dace7605363e66d1141229cc85a4aef5aad185de4d24820cb7ec8e8860b1e2c593b7795649675ef850d35ef3883b386b5381231
 DIST numpy-2.5.2.tar.gz.provenance 10057 BLAKE2B f60196c4ff61d3a0016024a85bcf2b407a205fad007354d141b73e949fb3d3822697e4973216a30f83a17e551eb1374836224231780e5fbb3c0b714501f7d745 SHA512 1eb508fe4b3f5f1a3e68435efa2c87e81c25cf8bf77cca4a956909733abd16f5dbef9e7ae001db82abe9bacf467d7d1b0b1e92868c063cd8edaf1db6537f1daf
+DIST numpy-2.5.3.tar.gz 20791231 BLAKE2B 37551f1d0066f06a402f6caf1a5c07a7aad255e7bf53402550fb08c19bd52af82e6cd3e4c547e87c2f431d9c803d2db1b0760a958bc1a0afeb0565b8c9393d72 SHA512 667ba01fc13669a8150b0b4797e6c6b953d27ce37d71f8dec02acd7050669fe9a461efc63e162d9732bc297deb3e5587675e40adbac923949da257a255f9b15b
+DIST numpy-2.5.3.tar.gz.provenance 9824 BLAKE2B 1c8ad74e3558242cce309a5540a058397f5dfddee80e7cb0657eb6f34baf4055b9831b82fa139dcebd6f7649a847092707aa0cac1270069652ef438e4f5ea04f SHA512 0d3ad6886fd357fbf4b53b20ea2463ddac3957b95d0aed7e36b4100ff4d0bed0c0372697b37aab00859fc42823700e4badbde3cb3ddc7223393ed98826090122
diff --git a/dev-python/numpy/numpy-2.5.3.ebuild b/dev-python/numpy/numpy-2.5.3.ebuild
new file mode 100644
index 000000000000..d22a019b6c54
--- /dev/null
+++ b/dev-python/numpy/numpy-2.5.3.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYPI_VERIFY_REPO=https://github.com/numpy/numpy-release
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE="threads(+)"
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 pypi
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+
+LICENSE="BSD 0BSD MIT ZLIB CC0-1.0"
+SLOT="0/2"
+if [[ ${PV} != *_rc* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+# +lapack because the internal fallbacks are pretty slow. Building without blas
+# is barely supported anyway, see bug #914358.
+IUSE="big-endian +cpudetection index64 +lapack"
+
+# upstream-flag[:gentoo-flag]
+ARM_FLAGS=( neon{,-fp16} vfpv4 asimd{,hp,dp,fhm} sve )
+PPC_FLAGS=( vsx vsx2 vsx3 vsx4 )
+X86_FLAGS=(
+	avx2 avx512{bw,dq,vl} avx512_{bf16,bitalg,fp16,vbmi2} sse4_2
+)
+IUSE+="
+	${ARM_FLAGS[*]/#/cpu_flags_arm_}
+	${PPC_FLAGS[*]/#/cpu_flags_ppc_}
+	${X86_FLAGS[*]/#/cpu_flags_x86_}
+"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8[index64(-)?]
+		>=virtual/lapack-3.8[index64(-)?]
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-build/meson-1.5.2
+	>=dev-python/cython-3.1.0[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# https://bugs.gentoo.org/925367
+	vrndq_f32
+)
+
+EPYTEST_PLUGINS=( hypothesis pytest-timeout )
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+has_all_x86() {
+	local flag
+	for flag; do
+		if ! use "cpu_flags_x86_${flag}"; then
+			return 1
+		fi
+	done
+	return 0
+}
+
+python_configure_all() {
+	local cpu_baseline=()
+	local map flag
+	case ${ARCH} in
+		arm)
+			# every flag implies the previous one
+			for map in NEON:neon NEON_FP16:neon-fp16 NEON_VFPV4:vfpv4; do
+				if ! use "cpu_flags_arm_${map#*:}"; then
+					break
+				fi
+				cpu_baseline+=( "${map%:*}" )
+			done
+			;&
+		arm64)
+			# on 32-bit ARM, ASIMD implies all NEON* flags
+			# on 64-bit ARM, they are all linked together
+			if use arm64 ||
+				[[ ${cpu_baseline[@]} && ${cpu_baseline[-1]} == NEON_VFPV4 ]]
+			then
+				cpu_baseline+=( $(usev cpu_flags_arm_asimd ASIMD) )
+			fi
+
+			# these two imply ASIMD
+			if [[ ${cpu_baseline[@]} && ${cpu_baseline[-1]} == ASIMD ]]; then
+				for flag in dp hp; do
+					cpu_baseline+=(
+						$(usev "cpu_flags_arm_asimd${flag}" "ASIMD${flag^^}")
+					)
+				done
+			fi
+
+			# these two imply ASIMDHP
+			if [[ ${cpu_baseline[@]} && ${cpu_baseline[-1]} == ASIMDHP ]]; then
+				for flag in asimdfhm sve; do
+					cpu_baseline+=(
+						$(usev "cpu_flags_arm_${flag}" "${flag^^}")
+					)
+				done
+			fi
+			;;
+		ppc64)
+			# every flag implies the previous one
+			for flag in '' 2 3 4; do
+				if ! use "cpu_flags_ppc_vsx${flag}"; then
+					break
+				fi
+				cpu_baseline+=( "VSX${flag}" )
+			done
+			;;
+		amd64|x86)
+			# upstream combines multiple instructions into sets
+			local mapping=(
+				# for these, we just check the newest instruction set,
+				# since all earlier instruction sets imply it
+				"X86_V2=sse4_2"
+				"X86_V3=avx2"
+				# from here on, we check all features that were added
+				# in the lowest CPU supporting them all
+				# https://en.wikipedia.org/wiki/AVX-512
+				"X86_V4=avx512bw avx512dq avx512vl"
+				"AVX512_ICL=avx512_vbmi2 avx512_bitalg"
+				"AVX512_SPR=avx512_bf16 avx512_fp16"
+			)
+
+			local m
+			for m in "${mapping[@]}"; do
+				local feature=${m%=*}
+				local sets=${m#*=}
+
+				if has_all_x86 ${sets}; then
+					einfo "${feature} enabled: all of ${sets} enabled"
+					cpu_baseline+=( "${feature}" )
+				else
+					einfo "${feature} disabled: not all of ${sets} enabled"
+					break
+				fi
+			done
+			;;
+		*)
+			cpu_baseline=MIN
+			;;
+	esac
+
+	DISTUTILS_ARGS=(
+		-Dallow-noblas=$(usex !lapack true false)
+		-Duse-ilp64=$(usex index64 true false)
+		-Dblas=$(usev lapack $(usex index64 cblas64 cblas))
+		-Dlapack=$(usev lapack $(usex index64 lapack64 lapack))
+		-Dcpu-baseline="${cpu_baseline[*]}"
+		-Dcpu-baseline-detect=disabled
+		-Dcpu-dispatch="$(usev cpudetection MAX)"
+	)
+
+	# bug #922457
+	filter-lto
+	# https://github.com/numpy/numpy/issues/25004
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	# We run tests in parallel, so avoid having n^2 threads in lapack
+	# tests.
+	local -x BLIS_NUM_THREADS=1
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local -x OPENBLAS_NUM_THREADS=1
+
+	# don't run tests that require more than 2 GiB of RAM (per process)
+	local -x NPY_AVAILABLE_MEM="2 GiB"
+
+	local EPYTEST_DESELECT=(
+		# Very disk-and-memory-hungry
+		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
+
+		# Precision problems
+		numpy/_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		numpy/typing/tests/test_typing.py
+
+		# Flaky, reruns don't help
+		numpy/f2py/tests/test_crackfortran.py
+		numpy/f2py/tests/test_data.py::TestData{,F77}::test_crackedlines
+		numpy/f2py/tests/test_f2py2e.py::test_gen_pyf
+		numpy/f2py/tests/test_f2py2e.py::test_gh22819_cli
+
+		# Broken by new setuptools
+		numpy/distutils/tests/test_fcompiler.py
+		numpy/distutils/tests/test_fcompiler_gnu.py
+		numpy/distutils/tests/test_fcompiler_intel.py
+		numpy/distutils/tests/test_fcompiler_nagfor.py
+	)
+
+	if [[ $(uname -m) == armv8l ]]; then
+		# Degenerate case of arm32 chroot on arm64, bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/_core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	case ${ARCH} in
+		arm)
+			EPYTEST_DESELECT+=(
+				# TODO: warnings
+				numpy/_core/tests/test_umath.py::TestSpecialFloats::test_unary_spurious_fpexception
+
+				# TODO
+				numpy/_core/tests/test_function_base.py::TestLinspace::test_denormal_numbers
+				numpy/f2py/tests/test_kind.py::TestKind::test_real
+				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precision
+
+				# require too much memory
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
+			)
+			;;
+		hppa)
+			EPYTEST_DESELECT+=(
+				# https://bugs.gentoo.org/942689
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[int]"
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype[float]"
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype_bytes_str_equivalence[datetime64]"
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype_bytes_str_equivalence[timedelta64]"
+				"numpy/_core/tests/test_dtype.py::TestBuiltin::test_dtype_bytes_str_equivalence[<f]"
+				"numpy/_core/tests/test_dtype.py::TestPickling::test_pickle_dtype[dt28]"
+				numpy/f2py/tests/test_kind.py::TestKind::test_real
+				numpy/f2py/tests/test_kind.py::TestKind::test_quad_precision
+				numpy/tests/test_ctypeslib.py::TestAsArray::test_reference_cycles
+				numpy/tests/test_ctypeslib.py::TestAsArray::test_segmentation_fault
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_scalar
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_subarray
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_structure_aligned
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_union
+				numpy/tests/test_ctypeslib.py::TestAsCtypesType::test_padded_union
+			)
+			;;
+		ppc|x86)
+			EPYTEST_DESELECT+=(
+				# require too much memory
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+				'numpy/_core/tests/test_multiarray.py::TestDot::test_huge_vectordot[float64]'
+			)
+			;;
+	esac
+
+	if [[ ${CHOST} == powerpc64le-* ]]; then
+		EPYTEST_DESELECT+=(
+			# long double thingy
+			numpy/_core/tests/test_scalarprint.py::TestRealScalars::test_ppc64_ibm_double_double128
+		)
+	fi
+
+	if use big-endian; then
+		EPYTEST_DESELECT+=(
+			# ppc64 and sparc
+			numpy/linalg/tests/test_linalg.py::TestDet::test_generalized_sq_cases
+			numpy/linalg/tests/test_linalg.py::TestDet::test_sq_cases
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]"
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]"
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]"
+			"numpy/f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]"
+		)
+	fi
+
+	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
+		# depends on importing numpy.random from system namespace
+		EPYTEST_DESELECT+=(
+			'numpy/random/tests/test_extending.py::test_cython'
+		)
+	fi
+
+	if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then
+		# msvccompiler removal
+		EPYTEST_DESELECT+=(
+			numpy/tests/test_public_api.py::test_all_modules_are_expected_2
+			numpy/tests/test_public_api.py::test_api_importable
+		)
+		EPYTEST_IGNORE+=(
+			numpy/distutils/tests/test_mingw32ccompiler.py
+			numpy/distutils/tests/test_system_info.py
+		)
+	fi
+
+	case ${EPYTHON} in
+		pypy3.11)
+			EPYTEST_DESELECT+=(
+				numpy/_core/tests/test_regression.py::TestRegression::test_buffer_hashlib
+				numpy/random/tests/test_generator_mt19937.py::TestIntegers::test_repeatability
+				numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_choice_large_sample
+				numpy/random/tests/test_generator_mt19937.py::test_jumped
+				numpy/random/tests/test_random.py::TestRandint::test_repeatability
+				numpy/random/tests/test_randomstate.py::TestRandint::test_repeatability
+				numpy/random/tests/test_randomstate.py::test_integer_repeat
+			)
+			;;
+	esac
+
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/patatt/files/patatt-0.7.0-py311-tests.patch b/dev-python/patatt/files/patatt-0.7.0-py311-tests.patch
deleted file mode 100644
index 134d88a7baf4..000000000000
--- a/dev-python/patatt/files/patatt-0.7.0-py311-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://git.kernel.org/pub/scm/utils/patatt/patatt.git/commit/?id=3b9f6ecec8e17225b66483ffd0aecb8ba1c328f5
-
-From 3b9f6ecec8e17225b66483ffd0aecb8ba1c328f5 Mon Sep 17 00:00:00 2001
-From: Artur Weber <aweber.kernel@gmail.com>
-Date: Thu, 8 Jan 2026 17:52:00 +0100
-Subject: Use pre-Python 3.13 Generator type syntax in conftest.py
-
-Python 3.13 defaults to None for the other fields of the Generator type,
-but the version of Generator in older versions does not support such syntax.
-Explicitly add the missing fields to allow the tests to run on older Python
-versions.
-
-(An alternative solution would be to use typing-extensions for older
-versions, though that would require adding another dependency.)
-
-Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
-Link: https://patch.msgid.link/20260108165200.11313-1-aweber.kernel@gmail.com
-Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
----
- tests/conftest.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index c5ced78..a9c9157 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -20,7 +20,7 @@ This is a test email body.
- """
- 
- @pytest.fixture
--def temp_data_dir() -> Generator[str]:
-+def temp_data_dir() -> Generator[str, None, None]:
-     """Create a temporary data directory structure for patatt."""
-     with tempfile.TemporaryDirectory() as tmpdirname:
-         # Create directory structure similar to patatt's data dir
--- 
-cgit 1.3-korg
diff --git a/dev-python/python-manilaclient/python-manilaclient-6.2.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-6.2.0.ebuild
index 2c6cf4256b9c..0b2274a1eae7 100644
--- a/dev-python/python-manilaclient/python-manilaclient-6.2.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-6.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/python-openstackclient-10.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-10.2.1.ebuild
index ffdbc1ffb1ff..ac1986428985 100644
--- a/dev-python/python-openstackclient/python-openstackclient-10.2.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-10.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/cliff-4.13.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-tests/python-tests-3.12.14.ebuild b/dev-python/python-tests/python-tests-3.12.14.ebuild
index d0041a04db11..624bf7f19f6a 100644
--- a/dev-python/python-tests/python-tests-3.12.14.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.14.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 # enable by default to help CI handle it (we have no additional deps)
 IUSE="+python_targets_${PYTHON_COMPAT[0]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 608d2a85a786..eddbbc7cdc77 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,4 +1,3 @@
-DIST types_psutil-7.2.2.20260408.tar.gz 26556 BLAKE2B 9348e17cc616c3f6dc8e5de62bda803f97d6648585aa7d0156ee583a6d95197383fc0886f011c28b366005915ad43791524457f981bf566ef89f916e51e17c6c SHA512 969b6424777e01c6a7ec9d15f6cd0455cec21295c8494f5ba37581149e11679bd0d1cf8b266484e24443cc872d711787207a1961c7303afc31dd66fd15d6708e
-DIST types_psutil-7.2.2.20260508.tar.gz 26575 BLAKE2B 8d31e14a16e6c701543c0bc71a2966a765a4dc8746e6513375fa1b9ea19b795629aa86c38f09d1fa21e29477f0e6f2bc3792e91d706da1e6a5b44f82d7d499f8 SHA512 4de979a1228bed858f0ef5e87229a5630b29d232f286948edff2e0fe2033aeaf3f7b26b298b86ffda51380f9883d4f0bcdaebc247956e3f2db8f3b3013d74627
 DIST types_psutil-7.2.2.20260518.tar.gz 26660 BLAKE2B 1c42cc5dbfcd370ee786a6645b6d1fc5612f6c1be9a9d30a8fcac109340480bc47e0b79a08b18018d636c9827c53872263a65e5035b8bfc22492252dcebcbf65 SHA512 957ed853813101dd8f50c92ea7ba554f40d0c0b57bb3a4172226860a4dbcaa259d3aa242faa5c6a6ca6921a3800a42b575d0b3c3a8686c2813a27b0af895e8a0
 DIST types_psutil-7.2.2.20260827.tar.gz 27294 BLAKE2B 2eb8a7f13bab2cd74ff57214ecc428967411cb4272ff52b2d87456dde43389cc260cfc2dba79b56234672dc64acd43d137b743fe6ffbc123c52d06a7a9970acd SHA512 75e34c30d5f2a1758ef6e7e698bef68e7db0c46cb1172d0c271e90a7acc8241dc5667c167ba59ccf9f1ab978847199a5c3cb6da7c0cd8c3eb0e8de2e8e8222f4
+DIST types_psutil-7.2.2.20260906.tar.gz 27396 BLAKE2B 8a4bd5928c6fb234b81ce50b724bccf70aeb4baf760aeb77241feabd1eb7252b3699dcc46fdd24e1060a779ca7ed19b96c1d20f57fbdffcc851bcb1608bd0a6f SHA512 9af0b0d271ca3d1cbc5d302b21e36a06e7a72d33ad0b45a442930ac78eb04f37c9db2bb4d271c052376611123aa1ac6aaae99ad0e0d527c31f63ddc538359c0d
diff --git a/dev-python/types-psutil/types-psutil-7.2.2.20260408.ebuild b/dev-python/types-psutil/types-psutil-7.2.2.20260408.ebuild
deleted file mode 100644
index 29098b07458a..000000000000
--- a/dev-python/types-psutil/types-psutil-7.2.2.20260408.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2023-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="Typing stubs for psutil"
-HOMEPAGE="https://pypi.org/project/types-psutil/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-BDEPEND="
-	>=dev-python/setuptools-82.0.1[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/types-psutil/types-psutil-7.2.2.20260508.ebuild b/dev-python/types-psutil/types-psutil-7.2.2.20260906.ebuild
index e240c1b6afa5..e240c1b6afa5 100644
--- a/dev-python/types-psutil/types-psutil-7.2.2.20260508.ebuild
+++ b/dev-python/types-psutil/types-psutil-7.2.2.20260906.ebuild
diff --git a/dev-python/yaspin/Manifest b/dev-python/yaspin/Manifest
index 5d7bc67ad291..4927a2f851f8 100644
--- a/dev-python/yaspin/Manifest
+++ b/dev-python/yaspin/Manifest
@@ -1,2 +1,4 @@
 DIST yaspin-3.4.0.tar.gz 42396 BLAKE2B f8a21978a109bddd3bfd0cd870b54cd0f3f9eaaf80d1c9440c24269267d832a2eedf87df1236b43c855bfc474a41a2d5971fc867e0f75867102f4d1416d1e9a1 SHA512 7aac314c2a306326bdc1f0aff8f58d7b916f143134adcb22a365393c58a73e1247ab8cfbc5a70ab6c5fd59f396572a0a5d18fcd92f96993709b2257d88acfd45
 DIST yaspin-3.4.0.tar.gz.provenance 9171 BLAKE2B dd7e0af802e6cca324d36702b89ca48f5e57c7143a5e412f7d70e391f8bc5cfcdf662db7d972e9cba34f25336dbbf81a457043aa534e437b33f0132eb0ba7479 SHA512 a2f306104256c469e0540df5f1df4e3f8729a68373fd4020890ceae00c40d615091619f9745c88856e42c6ec96237196ed4fec9dda90e18233e76413e27e864e
+DIST yaspin-3.5.0.tar.gz 44051 BLAKE2B fe921d5feb80f16c2dddc9f284facce5d7cf6b3e05e58ae20005580d2a7a585283fd46f3e52d856024198d09ae2576f151ea1256925ed358500d3c78279f36f5 SHA512 1933a03adf5277e0e16ca0bdca745dc6763351f0c46599d5cb563812f53cafeb4895a84cce8191eb730b43a17a31e4408dca31712aa96b4f7cf1c21e2536c5f1
+DIST yaspin-3.5.0.tar.gz.provenance 9796 BLAKE2B 79a3c8ef5232696c1f9fe6dc14ec66cb0ae24959480fa0ae673d9f1e5d97a45e722e6c0ec5e86c3cc902496ee9020a0cb8534e6deb16922a049f1b475639a830 SHA512 45562792ad58846599c9c815aa07c8360191a7535f9b710e86af1bad091bab5895c06f73b8601ffba8feb6599fbebdca82847df74309b4a4c5be97b1183f494c
diff --git a/dev-python/yaspin/yaspin-3.5.0.ebuild b/dev-python/yaspin/yaspin-3.5.0.ebuild
new file mode 100644
index 000000000000..15305ac7b41d
--- /dev/null
+++ b/dev-python/yaspin/yaspin-3.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry-core
+PYTHON_COMPAT=( python3_{13..14} )
+PYPI_VERIFY_REPO=https://github.com/pavdmyt/yaspin
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet Another Terminal Spinner"
+HOMEPAGE="
+	https://github.com/pavdmyt/yaspin
+	https://pypi.org/project/yaspin/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	=dev-python/termcolor-3*[${PYTHON_USEDEP}]
+	>=dev-python/termcolor-3.3[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+EPYTEST_PLUGINS=( pytest-mock )
+distutils_enable_tests pytest
diff --git a/dev-ruby/net-imap/net-imap-0.5.15.ebuild b/dev-ruby/net-imap/net-imap-0.5.15.ebuild
index 096267612921..9984085cf689 100644
--- a/dev-ruby/net-imap/net-imap-0.5.15.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.5.15.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.88.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.88.3.ebuild
index 986dbc47f92c..1845ac6ee16b 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.88.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.88.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 LICENSE="LGPL-2+"
 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"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/git-bug/git-bug-0.10.1.ebuild b/dev-util/git-bug/git-bug-0.10.1.ebuild
index 31512bf2db4c..a923e6931b46 100644
--- a/dev-util/git-bug/git-bug-0.10.1.ebuild
+++ b/dev-util/git-bug/git-bug-0.10.1.ebuild
@@ -1,32 +1,54 @@
-# Copyright 2020-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit go-module
+inherit go-module shell-completion
 
-DESCRIPTION="distributed, offline-first bug tracker"
+DESCRIPTION="Distributed, offline-first bug tracker embedded in git"
 HOMEPAGE="https://github.com/git-bug/git-bug"
 SRC_URI="https://github.com/git-bug/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://xwaretech.info/godeps/${P}-deps.tar.xz"
+	https://dev.gentoo.org/~laumann/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
 
 LICENSE="GPL-3"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-RESTRICT="strip"
+BDEPEND=">=dev-lang/go-1.24.0"
+
+QA_PRESTRIPPED=usr/bin/git-bug
 
 src_compile() {
 	ego generate
-	ego build \
-		-ldflags "-s -w -X github.com/git-bug/git-bug/commands.GitLastTag=${PV} -X github.com/git-bug/git-bug/commands.GitExactTag=${PV}" \
+	local ego_build_args=(
+		-ldflags "-s -w -X github.com/git-bug/git-bug/commands.GitLastTag=${PV} -X github.com/git-bug/git-bug/commands.GitExactTag=${PV}"
 		-o ${PN}
+	)
+	ego build "${ego_build_args[@]}"
 }
 
-src_install() {
-	dobin ${PN}
+src_test() {
+	local toskip=(
+		# Fails with FEATURES=network-sandbox
+		TestValidateProject
+	)
+
+	if ! use amd64 && ! use x86; then
+		# arch-dependent test, reported upstream
+		# https://github.com/git-bug/git-bug/issues/1591
+		toskip+=( TestGitFileHandlers )
+	fi
+	toskip="$(tr ' ' '|' <<< "${toskip[@]}")"
+
+	CI=true ego test -v ./... -skip "${toskip}"
 }
 
-src_test() {
-	CI=true ego test
+src_install() {
+	dobin git-bug
+	doman doc/man/*.1
+	dobashcomp misc/completion/bash/git-bug
+	newzshcomp misc/completion/zsh/git-bug _git-bug
+	newfishcomp misc/completion/fish/git-bug git-bug.fish
 }
diff --git a/dev-util/git-bug/git-bug-9999.ebuild b/dev-util/git-bug/git-bug-9999.ebuild
deleted file mode 100644
index 6036833e3e6a..000000000000
--- a/dev-util/git-bug/git-bug-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="distributed, offline-first bug tracker"
-HOMEPAGE="https://github.com/git-bug/git-bug"
-
-inherit git-r3
-EGIT_REPO_URI="https://github.com/git-bug/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-src_unpack() {
-	default
-	git-r3_src_unpack
-	go-module_live_vendor
-}
-
-src_compile() {
-	ego generate
-	ego build \
-		-ldflags "-s -w -X github.com/git-bug/git-bug/commands.GitLastTag=${PV} -X github.com/git-bug/git-bug/commands.GitExactTag=${PV}" \
-		-o ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-}
-
-src_test() {
-	CI=true ego test
-}
diff --git a/dev-util/git-bug/metadata.xml b/dev-util/git-bug/metadata.xml
index 78afaac6f78d..deadd97065b7 100644
--- a/dev-util/git-bug/metadata.xml
+++ b/dev-util/git-bug/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>laumann@gentoo.org</email>
+    <name>Thomas Bracht Laumann Jespersen</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:git-bug_project:git-bug</remote-id>
   </upstream>
diff --git a/dev-util/glib-utils/glib-utils-2.88.3.ebuild b/dev-util/glib-utils/glib-utils-2.88.3.ebuild
index 27540d04280f..06c96686f72e 100644
--- a/dev-util/glib-utils/glib-utils-2.88.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.88.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.40-py315.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.40-py315.patch
deleted file mode 100644
index c2db4faadad8..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.40-py315.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/pkgcore/pkgcheck/issues/787
-https://github.com/pkgcore/pkgcheck/commit/d649977e79984afca90c61315fcab89cb8f9ef6a
-
-From d649977e79984afca90c61315fcab89cb8f9ef6a Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin <arthurzam@gentoo.org>
-Date: Sun, 5 Jul 2026 22:14:30 +0300
-Subject: [PATCH] tests: replace deprecated Loader.load_module with exec_module
-
-load_module() was removed in Python 3.15, breaking test_scan_repo[eclass].
-Use the recommended spec_from_loader + module_from_spec + exec_module API.
-
-Resolves: https://github.com/pkgcore/pkgcheck/issues/787
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
----
- tests/scripts/test_pkgcheck_scan.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/scripts/test_pkgcheck_scan.py b/tests/scripts/test_pkgcheck_scan.py
-index 7aee972e8..11deb686b 100644
---- a/tests/scripts/test_pkgcheck_scan.py
-+++ b/tests/scripts/test_pkgcheck_scan.py
-@@ -1,5 +1,6 @@
- import importlib
- import importlib.machinery
-+import importlib.util
- import io
- import os
- import pathlib
-@@ -608,9 +609,10 @@ def _load_expected_data(self, base: pathlib.Path) -> _expected_data_result:
-             with (custom_handler_path := base / "handler.py").open():
-                 # We can't import since it's not a valid python directory layout, nor do
-                 # want to pollute the namespace.
--                module = importlib.machinery.SourceFileLoader(
--                    "handler", str(custom_handler_path)
--                ).load_module()
-+                loader = importlib.machinery.SourceFileLoader("handler", str(custom_handler_path))
-+                spec = importlib.util.spec_from_loader("handler", loader)
-+                module = importlib.util.module_from_spec(spec)
-+                loader.exec_module(module)
-                 if (
-                     custom_handler := typing.cast(
-                         typing.Callable[[Result], bool], getattr(module, "handler")
-
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 7196b323d176..b32c4370ef39 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,4 +1,2 @@
-DIST uftrace-0.17.tar.gz 1164457 BLAKE2B 7e9ed9af07d9f2ca8b78d7b7651408f5065917207c57855e6486c6d0d8acdaf3f87096a789f74e4458705c2fd59393fb6973f8e43750bc0bb4e3ab56268e6177 SHA512 b76ac32e68b474522f7d9c470940093bc37cf5d3d2d119d10ffad2954262e83c4092f593f307a41c765a6975416bfc62b844436a4d1888639741eb328e16e1d8
-DIST uftrace-0.18.1.tar.gz 1173722 BLAKE2B 2185205b0cbaafcb497adce672611f5bc28c6dbecd02b757fc5f2ee3c5d9967ac8aa539c66dc106e40ad3e19adce33e984da4dd6aa336a45c8bec9396f53f7dd SHA512 372b7ab0f9b87904493c21e58497d886c212708129334203c11bce1a86da212d2b44f6c66a12d813bab5ab581c866a114d34ffbc403089497942142c7bfb8315
-DIST uftrace-0.18.tar.gz 1173673 BLAKE2B 866e4489e482b60fc487de77dfcb5cb1c4733c7e1d5a4fa43728fd1d7129ff53c6dcce493ca7478a554cfba5462c7e457d7fb3d8046cf4804963c6521e1f246d SHA512 07b3559248698c9c5155a6a97e0781b1f16778e773f3522d7f9b553998e69285ddb69e29be9e271c439edd95adb6a12fa57967015716c3e450498f6835b7c613
 DIST uftrace-0.19.tar.gz 1176532 BLAKE2B b7dea0ce0e5e895828f09c8591787a12415eaed8ed5bbd25629508e9564f97f2ee8f4109620a89f5b1cdf8b3b25570c9eedf55ff0dee8c3a044e528ff6598a43 SHA512 725b265e103a933fe9dfccaf19d3846077519c86a24380ced15f1eb5ab30400efd5ce9fd50f704b51dd2b738e4e9c849df647a7be5d6373ac2834a64a10808ce
+DIST uftrace-0.20.tar.gz 1211889 BLAKE2B 2a8aa701ffe6813ed872c2741c1967fe19f6dd0f6cb3207a345607bc9b42317c6fed9ec51db3f06354449c0877eae2fa9eb2a1e7e2b8638a1e646b66562aa1d7 SHA512 7da8237682e5475faa88c93b7793ab2b951e8edb2d0c57a110f3953a1a45c143f4f0c9612690a23e1a9c80bfadc2ad315e2bc936452a117d871e05990ccec4cf
diff --git a/dev-util/uftrace/uftrace-0.17.ebuild b/dev-util/uftrace/uftrace-0.17.ebuild
deleted file mode 100644
index 4f8674728437..000000000000
--- a/dev-util/uftrace/uftrace-0.17.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-PYTHON_COMPAT=( python3_{9..13} ) # fails to compile with python3.13t
-
-inherit bash-completion-r1 flag-o-matic lua-single python-single-r1 toolchain-funcs
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="capstone lua python unwind"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/libelf:=
-	capstone? ( dev-libs/capstone:0= )
-	lua? ( ${LUA_DEPS} )
-	python? ( ${PYTHON_DEPS} )
-	unwind? ( sys-libs/libunwind:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
-	sed -i -e '/PYTHON_LDFLAGS/{s/$(PYTHON_LDFLAGS)/$(COMMON_LDFLAGS) $(PYTHON_LDFLAGS)/g; p}' Makefile || die
-}
-
-src_configure() {
-	# bug #858503 (https://github.com/namhyung/uftrace/issues/1343)
-	filter-lto
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)/uftrace"
-		$(use_with capstone)
-		$(use_with unwind libunwind)
-		$(use_with python libpython)
-	)
-	if use lua && use lua_single_target_luajit; then
-		myconf+=(
-			--with-libluajit
-		)
-	else
-		myconf+=(
-			--without-libluajit
-		)
-	fi
-	CC="$(tc-getCC)" LD="$(tc-getLD)" econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-
-	dodoc doc/*.{md,gif,png}
-	newbashcomp misc/bash-completion.sh uftrace
-}
diff --git a/dev-util/uftrace/uftrace-0.18.ebuild b/dev-util/uftrace/uftrace-0.18.ebuild
deleted file mode 100644
index 426184fdfb60..000000000000
--- a/dev-util/uftrace/uftrace-0.18.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-PYTHON_COMPAT=( python3_{9..14} ) # fails to compile with python3.13t
-
-inherit bash-completion-r1 flag-o-matic lua-single python-single-r1 toolchain-funcs
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="capstone lua python unwind"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/libelf:=
-	capstone? ( dev-libs/capstone:0= )
-	lua? ( ${LUA_DEPS} )
-	python? ( ${PYTHON_DEPS} )
-	unwind? ( sys-libs/libunwind:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
-	sed -i -e '/PYTHON_LDFLAGS/{s/$(PYTHON_LDFLAGS)/$(COMMON_LDFLAGS) $(PYTHON_LDFLAGS)/g; p}' Makefile || die
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)/uftrace"
-		$(use_with capstone)
-		$(use_with unwind libunwind)
-		$(use_with python libpython)
-	)
-	if use lua && use lua_single_target_luajit; then
-		myconf+=(
-			--with-libluajit
-		)
-	else
-		myconf+=(
-			--without-libluajit
-		)
-	fi
-	CC="$(tc-getCC)" LD="$(tc-getLD)" econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-
-	dodoc doc/*.{md,gif,png}
-	newbashcomp misc/bash-completion.sh uftrace
-}
diff --git a/dev-util/uftrace/uftrace-0.18.1.ebuild b/dev-util/uftrace/uftrace-0.20.ebuild
index afb227d2afc3..0394f738545c 100644
--- a/dev-util/uftrace/uftrace-0.18.1.ebuild
+++ b/dev-util/uftrace/uftrace-0.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="capstone lua python unwind"
 
 REQUIRED_USE="
diff --git a/dev-util/vulkan-tools/files/vulkan-tools-1.4.357.0-libcxx-23.patch b/dev-util/vulkan-tools/files/vulkan-tools-1.4.357.0-libcxx-23.patch
new file mode 100644
index 000000000000..36a66708c3bb
--- /dev/null
+++ b/dev-util/vulkan-tools/files/vulkan-tools-1.4.357.0-libcxx-23.patch
@@ -0,0 +1,13 @@
+https://github.com/KhronosGroup/Vulkan-Tools/commit/462d9819e5953e064e1dcdc04d3edc5fc6bc9431
+diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp
+index 571a8d6..df7ce02 100644
+--- a/vulkaninfo/vulkaninfo.cpp
++++ b/vulkaninfo/vulkaninfo.cpp
+@@ -28,6 +28,7 @@
+  *
+  */
+
++#include <ctime>
+ #include <string>
+ #ifdef _WIN32
+ #include <crtdbg.h>
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.357.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.357.0.ebuild
index 97d3bb675d86..0fb1e2708c8e 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.4.357.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.4.357.0.ebuild
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
 	test? ( ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.357.0-libcxx-23.patch
+)
+
 pkg_setup() {
 	MULTILIB_CHOST_TOOLS=(
 		/usr/bin/vulkaninfo
diff --git a/dev-vcs/gitstats/gitstats-0_pre20201124-r1.ebuild b/dev-vcs/gitstats/gitstats-0_pre20201124-r1.ebuild
new file mode 100644
index 000000000000..c1eec15d6c7f
--- /dev/null
+++ b/dev-vcs/gitstats/gitstats-0_pre20201124-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit python-r1
+
+DESCRIPTION="Statistics generator for git"
+HOMEPAGE="http://gitstats.sourceforge.net/"
+SRC_URI="https://github.com/gktrk/gitstats/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-visualization/gnuplot[gd]
+	dev-vcs/git"
+DEPEND="
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl:*
+"
+
+DOCS=( doc/{AUTHOR,README,TODO.txt} )
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-py312.patch"
+
+	sed \
+	-e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \
+	-i gitstats || die "failed to fix static files path"
+
+	default
+}
+
+src_compile() {
+	emake VERSION="${PV}" man
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr VERSION="${PV}" install
+	doman doc/${PN}.1
+	einstalldocs
+	python_replicate_script "${ED}"/usr/bin/${PN}
+}
diff --git a/eclass/tests/daemons.sh b/eclass/tests/daemons.sh
index ccd0ded8107d..ccd0ded8107d 100644..100755
--- a/eclass/tests/daemons.sh
+++ b/eclass/tests/daemons.sh
diff --git a/eclass/tests/databases.sh b/eclass/tests/databases.sh
index 08dd75472f72..08dd75472f72 100644..100755
--- a/eclass/tests/databases.sh
+++ b/eclass/tests/databases.sh
diff --git a/games-rpg/comi/comi-1-r1.ebuild b/games-rpg/comi/comi-1-r1.ebuild
index a50addf24a8a..11ea6fbe944f 100644
--- a/games-rpg/comi/comi-1-r1.ebuild
+++ b/games-rpg/comi/comi-1-r1.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
@@ -26,7 +26,7 @@ dotar() {
 	# Remainder into data
 	# Avoid copying files twice
 
-	tar -c -f - \
+	gtar -c -f - \
 		--mode=u+w \
 		--ignore-case \
 		--xform='s:^[^a-z]+$:\L\0:x' \
diff --git a/games-strategy/settlers-2-gold-data/settlers-2-gold-data-0.ebuild b/games-strategy/settlers-2-gold-data/settlers-2-gold-data-0.ebuild
index 9f4e38c59670..a1ac4125fd52 100644
--- a/games-strategy/settlers-2-gold-data/settlers-2-gold-data-0.ebuild
+++ b/games-strategy/settlers-2-gold-data/settlers-2-gold-data-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=7
@@ -43,7 +43,7 @@ dotar() {
 	# Avoid copying files twice
 	# Don't include *.ENG or *.GER files as they are unused by RTTR
 
-	tar -c -f - \
+	gtar -c -f - \
 		--mode=u+w \
 		--ignore-case \
 		--xform='s:.*:\U\0:x' \
diff --git a/gnome-base/dconf/dconf-0.49.0.ebuild b/gnome-base/dconf/dconf-0.49.0.ebuild
index e3984c2422d2..0b0a3a19bcee 100644
--- a/gnome-base/dconf/dconf-0.49.0.ebuild
+++ b/gnome-base/dconf/dconf-0.49.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 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"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/gnome-control-center/gnome-control-center-49.9.ebuild b/gnome-base/gnome-control-center/gnome-control-center-49.9.ebuild
index a363285f9e26..fc48d28530fe 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-49.9.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-49.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg
 # Logo is CC-BY-SA-2.5
 LICENSE="GPL-2+ CC-BY-SA-2.5"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test X"
 REQUIRED_USE="
diff --git a/gnome-base/gnome-session/gnome-session-49.3.ebuild b/gnome-base/gnome-session/gnome-session-49.3.ebuild
index 468ba46f9d7c..d3683e25cff2 100644
--- a/gnome-base/gnome-session/gnome-session-49.3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-49.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc elogind systemd X"
 
 REQUIRED_USE="^^ ( elogind systemd )"
diff --git a/gnome-base/librsvg/librsvg-2.62.3.ebuild b/gnome-base/librsvg/librsvg-2.62.3.ebuild
index 7875bb0daea7..35c76a154ca2 100644
--- a/gnome-base/librsvg/librsvg-2.62.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.62.3.ebuild
@@ -25,7 +25,7 @@ LICENSE+="
 "
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE="+gtk-doc +introspection test +vala"
 RESTRICT="!test? ( test )"
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-50.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-50.0.ebuild
index 507a90a28ca1..02db4a223b13 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-50.0.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-50.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://apps.gnome.org/Calculator/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+introspection test"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 7ee482487487..0f5e1f6f33dc 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-clocks-48.0.tar.xz 462784 BLAKE2B 9f346651737f00d7ed3124f0557557ccff6a1f0dbdbb34c1d3de0000d3235a13e0b0ff61a516d56fbd146eea6d0b3a8d3682905cff3eedd0f7ae7455d7343687 SHA512 6bf6c4c4b8827ccf04df8bf899098145566eeb9bcd5d4df437ef2193fa7c56d7309ab9447cecdd7bec56c2a247b7ed93b1ae4b7a2d099f8fcf34151b4eb11ecb
 DIST gnome-clocks-49.0.tar.xz 465244 BLAKE2B 69c16075473592413daafd08e62a59fdb8ea43dc3aa4e44e4d30680f9576f9ee77ea113eb76ea8c320b96ac2a8fc3e8c552facd3f8b0613bac053f04b72fef94 SHA512 598007600779b2aee369c7aec77391ce64f2b045e91508c6c2158c39b1bb084f20663ca2b6c89749acec85d23a7178361ce954084c1957b403b3c79a5793bd2a
+DIST gnome-clocks-50.0.tar.xz 11497040 BLAKE2B 5a1c0a22c003134083cfb7fe1b284103d4f9c1f3c3097686dba85c0cf3060487c87387e50bd868eab2d1fde06454d9a33eb9ad37865aa32e313dcc7dd15bf4c6 SHA512 73b5a21ae72df96f61b3f3c6797c8cadb7bfcd026d6bea0bf1f90d59c7a897be411d2fdf960caaa169ddf17f70a352afb96c7adf534d1395f0cd24566aa840c0
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-48.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-50.0.ebuild
index 01ddad4d4caa..5ed4a61ae1bd 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-48.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-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,7 +10,7 @@ HOMEPAGE="https://apps.gnome.org/Clocks/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.72:2
@@ -18,16 +18,21 @@ RDEPEND="
 	>=dev-libs/libgweather-4.2.0:4=
 	gnome-base/gnome-desktop:4=
 	>=sci-geosciences/geocode-glib-1:2
+	>=dev-libs/icu-60.0
 	>=app-misc/geoclue-2.4:2.0
-	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gui-libs/libadwaita-1.8_rc:1
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-libs/libxml2:2
 	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	$(vala_depend)
+	>=sys-devel/gettext-0.19.8
+	dev-util/desktop-file-utils
+	dev-libs/appstream
+	dev-libs/glib:2
+	media-sound/vorbis-tools
 	>=dev-libs/libgweather-4.2.0:4[vala]
 	>=gui-libs/libadwaita-1.6_alpha:1[vala]
 "
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index ac97d65f90ee..0228649a89fa 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-shell-extension-alphabetical-grid-43.0.tar.gz 218999 BLAKE2B fadbf8282f3b369903d98fe262ff0799be551e939812e0c8f262e1c1c983db47ef12db3451ebd2224ee98101831b288ced7f3c3e3c1b30992b1cd8d2e0ab10fa SHA512 e7da06d66cca311188a69c4cbbe22b5f63e0f2cc304b7e3727e534dd193b7f18280d996542b25f34071ec6246e95bf8b62bcadd3459006d97d9ae677572767fc
 DIST gnome-shell-extension-alphabetical-grid-44.0.tar.gz 218946 BLAKE2B f4e91b83c20eb9aa2f515596438b6916fd5a6e454e7bb21674f8beb7376bbc5eff1354e6226aaba30142cdf0e9464c44ffaa41636a3ca5e9ab92aed70df75496 SHA512 487cfe3f34d9f358c064f3d1657a3a62809f8870767e866487e77bbe1dcb30a20f2308bb73a61a97424d51631998c538b625e898bac1e296c4bb89c8840e5eae
+DIST gnome-shell-extension-alphabetical-grid-46.0.tar.gz 219024 BLAKE2B a7726eeead47dddc8de3c13846d348b23fe963521fd9d5fa75424438ff8813b00c1d4acc5040af3a6356b2ce7e09180c50eeb8ce0b4194d2a34f87abc97337dc SHA512 80e0c9213c308230a9fe069755848778cd800e285ecd3d6f48390fddced976c77861a8fad675ca7ba64666c9e7a6b6591b12857b3740f89682afdc18fa30d76a
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-43.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-46.0.ebuild
index 9d92f113a5d6..c13d3969d9f3 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-43.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-46.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit gnome2-utils
 
 # Useful specially to prevent
@@ -9,12 +10,12 @@ inherit gnome2-utils
 # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
 DESCRIPTION="Restore the alphabetical ordering of the app grid"
 HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
-SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/alphabetical-grid-extension-${PV}"
+SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}-1.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/alphabetical-grid-extension-${PV}-1"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-49.9.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-49.9.ebuild
index c0d6d01c6c9c..f649d9c83dbe 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-49.9.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-49.9.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"
diff --git a/gui-libs/libadwaita/libadwaita-1.8.7.ebuild b/gui-libs/libadwaita/libadwaita-1.8.7.ebuild
index 1d9e5f29f114..2c232a124ee2 100644
--- a/gui-libs/libadwaita/libadwaita-1.8.7.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.8.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 IUSE="examples gtk-doc +introspection test +vala"
 REQUIRED_USE="
diff --git a/gui-libs/vte-common/vte-common-0.82.4.ebuild b/gui-libs/vte-common/vte-common-0.82.4.ebuild
index b193b3b3d37f..3226e7b59a7e 100644
--- a/gui-libs/vte-common/vte-common-0.82.4.ebuild
+++ b/gui-libs/vte-common/vte-common-0.82.4.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"
 
diff --git a/gui-libs/vte/vte-0.82.4.ebuild b/gui-libs/vte/vte-0.82.4.ebuild
index b2fd3f9287eb..4bfa4c923c48 100644
--- a/gui-libs/vte/vte-0.82.4.ebuild
+++ b/gui-libs/vte/vte-0.82.4.ebuild
@@ -13,7 +13,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 )
diff --git a/media-fonts/adwaita-fonts/Manifest b/media-fonts/adwaita-fonts/Manifest
index 35d523abee6f..dc960f83709d 100644
--- a/media-fonts/adwaita-fonts/Manifest
+++ b/media-fonts/adwaita-fonts/Manifest
@@ -1 +1,2 @@
 DIST adwaita-fonts-49.0.tar.xz 2104412 BLAKE2B 49d01d2147ed47299e724b7aa5bd86e3db2d9fc0534ddf70f67cfb7cf054e5c95e4cf334f4ab3cf3983b54877fafdb670f4b81b42b66e1a3117a5fe1e973758a SHA512 38c991817ad0e737bfa901d62d6366f132a77cf452d210bbf33691dc3c6c396a7ec50f75b6655bf2d16a05bc3c3d0b648057dd58b9cc65ab93234661bd547fef
+DIST adwaita-fonts-50.0.tar.xz 2120492 BLAKE2B e5492165471cb11bc017eb5dc1f6d97e010b26d3bdcb75d4ac5ca0495982451e4329b6cfe6cacb6ebb7fc4598ee72be17d1d6baca39b4537616431531ad34396 SHA512 546f03c89461c9cc998d54b0df003e6cb13daea2149ecb8e414e27934e7e29227e8886af276964cacef23dec48c5be32b59963abc61370bebba0d2bda96d178e
diff --git a/media-fonts/adwaita-fonts/adwaita-fonts-50.0.ebuild b/media-fonts/adwaita-fonts/adwaita-fonts-50.0.ebuild
new file mode 100644
index 000000000000..47ef16e8841c
--- /dev/null
+++ b/media-fonts/adwaita-fonts/adwaita-fonts-50.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font gnome.org meson
+
+DESCRIPTION="The typefaces for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-fonts"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Font eclass settings
+FONT_SUFFIX="ttf"
+
+src_configure() {
+	local emesonargs=(
+		-Ddatadir="${EPREFIX}/usr/share"
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 488ee9f97f90..745a7a9a4f8e 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,2 @@
-DIST eog-47.0.tar.xz 4658256 BLAKE2B 8e1162c3ca5ee89605eb8d6b616f3e2d034725948a32f568e3f1608247d6e35b67ad98351b5a0396b72031c0c3e1bcfa5f9e97f7e159e6020b7c7ba6c23a204a SHA512 5a3907988031360c53d7a2c9ba8c5e1c03c714f41f55bb980414e35591d522f32d9ae1c9e6c0ac6ca58e559074cd060572225417e30f39281a8f93473ec42159
-DIST eog-49.3.tar.xz 4735780 BLAKE2B 1f5528f3e138b84eb739c7ea31f76e9fdd5fc2b46af438353c22b9425372ccdf1300657a33e41a8ebee59a9256096bea3c017e5fe82b59311422d1c866274762 SHA512 f5c4233fb6bfcdb4a0d38c311a65968a20be50c0c9765a8b4a31374e686059b7ed9aa25e22cec3540d272e2438b7a02ed75b02d557d618d970b4f769012dbb76
 DIST eog-50.1.tar.xz 4734824 BLAKE2B df076f25bd0ded65f0421404993685b77a89374d9f6189373f8fec277ae9403eec9e4e3cceb52c4500cb4a6b91fe9a68ca3ca0faa0bc6ea556a3b1b00c5b812e SHA512 f96b7168183b12b108734239ff4a5c4458754c3b8374cedc7235f9338702ded03b0e7215d4d3e970dc33aef155a499e3f90a306cba79437402acd4037f295049
+DIST eog-50.3.tar.xz 4734916 BLAKE2B 04a546f43947770c39cb39dae3e2c415484cb0ce5b408d537f390355894242130c5d20b1b4228d321e91eb11e21f35c9efacf11b4ef7c77589655b6a7da95c9f SHA512 1e0bc128e1f43ffe0ec0002fffb99245ffca96865adf25081802b4bf223b87ffdb512a12020e1c8516c933aa61036a4394fd26f2d2de25b5eb1a264841b97536
diff --git a/media-gfx/eog/eog-47.0.ebuild b/media-gfx/eog/eog-47.0.ebuild
deleted file mode 100644
index c27cd2dc4633..000000000000
--- a/media-gfx/eog/eog-47.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/eog"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="
-	exif? ( jpeg )
-	gtk-doc? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.73.2:2
-	>=dev-libs/libpeas-0.7.4:0[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-42_beta
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.24.15:3[introspection,X]
-	>=gui-libs/libhandy-1.5.0:1
-	virtual/zlib:=
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/eog/eog-49.3.ebuild b/media-gfx/eog/eog-50.3.ebuild
index 44c2c04e9e1f..4e915079eff8 100644
--- a/media-gfx/eog/eog-49.3.ebuild
+++ b/media-gfx/eog/eog-50.3.ebuild
@@ -20,8 +20,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/glib-2.73.2:2
-	>=dev-libs/libpeas-0.7.4:0[gtk]
+	>=dev-libs/glib-2.86:2[introspection?]
+	>=dev-libs/libpeas-1.38:0=[gtk]
 	>=gnome-base/gnome-desktop-2.91.2:3=
 	>=gnome-base/gsettings-desktop-schemas-42_beta
 	>=x11-misc/shared-mime-info-0.20
@@ -34,7 +34,6 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	xmp? ( media-libs/exempi:2= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
 	svg? ( >=gnome-base/librsvg-2.44.0:2 )
 
 	x11-libs/libX11
@@ -61,7 +60,7 @@ src_configure() {
 		$(meson_use gtk-doc gtk_doc)
 		$(meson_use introspection)
 		-Dinstalled_tests=false
-		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+		-Dlibportal=false # All libportal usages are flatpak-specific
 	)
 	meson_src_configure
 }
diff --git a/media-gfx/feh/feh-3.12.2.ebuild b/media-gfx/feh/feh-3.12.2.ebuild
index 0d4b5efbfb17..6bad3a9f2b9e 100644
--- a/media-gfx/feh/feh-3.12.2.ebuild
+++ b/media-gfx/feh/feh-3.12.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="debug curl exif magic test xinerama inotify"
 RESTRICT="test" # Tests are broken.
 
diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407-r1.ebuild b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407-r1.ebuild
new file mode 100644
index 000000000000..fcd86633925c
--- /dev/null
+++ b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+DESCRIPTION="Brushes for GIMP with the styles arrow, handpointer, button arrow and cursor"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+# http://www.gimphelp.org/DL/ refuses wget without user-agent
+SRC_URI="
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_color_1.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_color_2.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_BW_1.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_BW_2.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_black_gloss.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/hand_pointer_brushes.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/button_arrow_brushes.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/arrow_action.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/cursor_brushes-1.0.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/circle_brushes-1.0.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/checkmark_brushes-1.0.tar.bz2
+	https://dev.gentoo.org/~pacho/${PN}/star_brushes.tar.bz2
+"
+S="${WORKDIR}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_install() {
+	for i in */*.gbr; do
+		insinto /usr/share/gimp/3.0/brushes
+		doins $i
+	done
+}
diff --git a/media-gfx/gimp-arrow-brushes/metadata.xml b/media-gfx/gimp-arrow-brushes/metadata.xml
index d3ef05d99402..2d903691bf96 100644
--- a/media-gfx/gimp-arrow-brushes/metadata.xml
+++ b/media-gfx/gimp-arrow-brushes/metadata.xml
@@ -5,5 +5,6 @@
     <email>pacho@gentoo.org</email>
     <name>Pacho Ramos</name>
   </maintainer>
+  <stabilize-allarches />
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/media-libs/gexiv2/gexiv2-0.14.7.ebuild b/media-libs/gexiv2/gexiv2-0.14.7.ebuild
index 092de3ae5531..3c5ee0414846 100644
--- a/media-libs/gexiv2/gexiv2-0.14.7.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.14.7.ebuild
@@ -14,7 +14,7 @@ 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+"
diff --git a/media-libs/glycin/Manifest b/media-libs/glycin/Manifest
index 5259a7ed9910..641385437829 100644
--- a/media-libs/glycin/Manifest
+++ b/media-libs/glycin/Manifest
@@ -1,5 +1,7 @@
 DIST glycin-2.1.1-crates.tar.xz 18049564 BLAKE2B 628319dc5d3d6d12c63fdb023720c282d90aaf92c1303e8ac757dcaf2aedce68c109c8367a86e579b1cfbe69204ec2abeec74ec08cdda629955d94638a7ec36c SHA512 5f1d25187825d2e6a21a882beb77d765a80dc16bc78e570a43053a5cdc527ce138bd57c3c900b48b3295a6cc1939a6dafb99aee0e493a660c17100dbb6d1757d
 DIST glycin-2.1.1.tar.xz 7169112 BLAKE2B 68afbb2e070b0fe8d396daa438c152a4091d320a47ac71e65bd93549b30ee8c04cfa75017ab6b3dcd03f93016913bb0429ed88acf791d9c4de08e30f08cbd4dd SHA512 af8da5f8154f7e15a6594ffdacd707384c0ca5805c65049583edb10e1499736b13d7082f193941518b3200e871baf2baadeb43feaa70a8c5fd21e0c864462236
+DIST glycin-2.1.5-crates.tar.xz 18050756 BLAKE2B 94af2ef6733df65ee735df76d0dc2610611995cce1b1463eba3b92adf110c5e7ecacce26b752e43704fa2ece0e60e7d028360dd95064bfb394c5f40487a72a09 SHA512 bd10a030b995605777f46af7ae6aa8f8296cdf3d2f7702e8f9b4ef435b4e4efcb4640b8f6f2f1f37f4369fa1dcb4e09efb7aff1e79f3a42881dea84b916696da
+DIST glycin-2.1.5.tar.xz 7169040 BLAKE2B 0de55336b1a4096ff00e8a88e72d1340b8c74088f9069414c43b03cc55e10477e7f4a12615887005821d9da7c70c64838e8b419fdf48fab32ef5b85b07615b9c SHA512 2a88559033944793548bd8f40a7babc58faa273a0f2bc852315a8d17e022b27ac8cc9ae33281974547c2fffd93cc8d071c68501a1bd53768deb3920ecec71397
 DIST glycin-3.1.0.crate 70320 BLAKE2B cbad2d6beb926122af537f1cd9290c3a1d6ff3b4768b034043b32727f27415dd08936f39ad28e257ec33f872679a0344f1636da5d26e5524006e17f721f15738 SHA512 1af8f685ca41108f31605ccde115b6584565ed8af0e62fd226cca0ad09a6d3931df0b0cca3a8cb901f05672b80043ac1c5aae581acd5045ed7057868f02afaa1
 DIST glycin-common-1.0.4.crate 26728 BLAKE2B cf80040828e1405833e5f3511f11ac300eb2458c76b700dc2817c766e829af4223497e0b2a4e73d4d59d948ff8c5298973ae5ba515ab3ec71f407499b679161f SHA512 51a18f0048eb7fcaf1438a2bc1623378bdb7b950ee4b0cd9f054c9d0d3839fbe7f862fbd2a0bf61d1745fe43a4336c24652e5b7a936c9644521039c31ae8d692
 DIST glycin-utils-4.1.0.crate 39794 BLAKE2B 8f3956da116ea588ae3ca7bca573565bf4ed0c4b04504e3d35800e31c7eb55af8c33d573de9adddce6f248756648491f9e1756e7c7774ac41d07632ac8cd6043 SHA512 9425e6bdd77d85955fd9968bdea720d425e827e2d690071b506a2a761b40f737f499d0e05c7a3837bdc1f1368f1c8c56152179925b61b9cd3d2dddc229241ef5
diff --git a/media-libs/glycin/glycin-2.1.1.ebuild b/media-libs/glycin/glycin-2.1.5.ebuild
index b825190317c0..caadf6fab15c 100644
--- a/media-libs/glycin/glycin-2.1.1.ebuild
+++ b/media-libs/glycin/glycin-2.1.5.ebuild
@@ -30,10 +30,11 @@ LICENSE+="
 	|| ( LGPL-2.1+ MPL-2.0 )
 "
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="gtk +introspection vala test"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="gtk gtk-doc +introspection vala test"
 REQUIRED_USE="
 	gtk? ( introspection )
+	gtk-doc? ( introspection )
 	vala? ( introspection )
 "
 RESTRICT="!test? ( test )"
@@ -44,7 +45,7 @@ DEPEND="
 	>=sys-libs/libseccomp-2.5.0
 	>=media-libs/fontconfig-2.13.0:1.0
 	media-libs/glycin-loaders:2
-	introspection? ( dev-libs/gobject-introspection )
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
 	gtk? ( >=gui-libs/gtk-4.16.0:4 )
 "
 
@@ -53,6 +54,7 @@ RDEPEND="${DEPEND}
 "
 
 BDEPEND="
+	gtk-doc? ( dev-util/gi-docgen )
 	vala? ( $(vala_depend) )
 	virtual/pkgconfig
 "
@@ -64,7 +66,7 @@ QA_FLAGS_IGNORED="
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig-thumbnailer.patch" #973052
+	"${FILESDIR}/${PN}-2.1.1-pkgconfig-thumbnailer.patch" #973052
 )
 
 src_prepare() {
@@ -80,6 +82,7 @@ src_configure() {
 		$(meson_use introspection)
 		-Dglycin-thumbnailer=true
 		$(meson_use gtk libglycin-gtk4)
+		$(meson_use gtk-doc capi_docs)
 		-Dtests=$(usex test true false)
 		# required if glycin-loaders is installed seperately
 		-Dtest_skip_install=true
@@ -88,3 +91,14 @@ src_configure() {
 	meson_src_configure
 	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
 }
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/libglycin-2 "${ED}"/usr/share/gtk-doc/html/ || die
+		if use gtk; then
+			mv "${ED}"/usr/share/doc/libglycin-gtk4-2 "${ED}"/usr/share/gtk-doc/html/ || die
+		fi
+	fi
+}
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 305c94ab4c91..37b1711b89f8 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,3 @@
-DIST netpbm-11.15.6.tar.xz 3833764 BLAKE2B 26b2e795d82cd9376b87f99c14bc160c86ecc260437438069c956f5c00f465fdba28ae0673d7ee53103a8e9eda7b0deed2ed12f5af99ef99fd9536a5039d7934 SHA512 4ff88a682d06682be8d7264fc305682b1d090c2599d1ed6a38cf29fe7432b590eb73e996b22d259f242781c9b86cd9b981fd6db9480b6441ee3523bff0bf47b0
+DIST netpbm-11.15.7.tar.xz 3834404 BLAKE2B a7993dc229185a8fc260bcd7f2a25218bdfde31e1406755ef20c740854fb265ff4749fa808ffaf2c40177b2ef9ef8edd53e4b979eb72d41f1cc473320eaeb74e SHA512 294d438c3a994ab26fd4bd8f1294668f001307a6e7ad18e5940708c19814d0582b7fec3bc2c6c7d75a95bd7911d5645408134a64b6090079122bf61e2f3ba191
 DIST netpbm-11.2.22.tar.xz 3791232 BLAKE2B 1c3abe2e1c4be2264216530516f46a00c2b21f8e680dadfe6c83773e4982ed08726c99e661a46fe4c0fa02093992b13ac7ec691cfef104d6b27afc09c4500ce5 SHA512 2d419548f4dc2a3ad7667bae858121e000d48c77d3a04e3d4075eede8962343c723a0cd954495b6d0e9eddb2cc15e377691b11ff99d58b46f4f68990eecbc3f2
-DIST netpbm-11.2.28.tar.xz 3794220 BLAKE2B 8c19c2e9ac9c7df6d857b9ebb413b4f8435b225aade9904716027b63668ff37203078dc26080c6888e22dbb799903d3aa2040ceb0f2a40bddd0b06cd01ad341f SHA512 df46cb128fe91479cea3037ab8e339c1a6d6998a22b466dfbb2ad41d01903063d300ae0c5aaa9ff2d1b6c6a547b46ac2cb10d849ef6764fcabddda38d29f0beb
+DIST netpbm-11.2.29.tar.xz 3794768 BLAKE2B c8a4c2fb3f8849dcf7220e2db1fd50288395e4d778ca10d364f1e07445c5ffa881cb114bf0d7f775c3122128eb123d6dae7e48ba14a5cfa027930da9ee506ed5 SHA512 b2e133022538c4d80380c47268a7356255f51d77144faedbe43981083e55f528f8656a59365fbb7e053b44288065c604c968c57d6d8f1f0128d57ba8e2b6f241
diff --git a/media-libs/netpbm/netpbm-11.15.6.ebuild b/media-libs/netpbm/netpbm-11.15.7.ebuild
index f86f6183c0b0..873a5f8e687e 100644
--- a/media-libs/netpbm/netpbm-11.15.6.ebuild
+++ b/media-libs/netpbm/netpbm-11.15.7.ebuild
@@ -168,6 +168,12 @@ src_prepare() {
 			-e 's:pnmindex.*::' \
 			-i test/Test-Order || die
 	fi
+
+	# gif-transparent1 broken by the latest changes; disable it temporarily
+	sed \
+		-e 's:gif-transparent1.*::' \
+		-i test/Test-Order || die
+
 }
 
 src_configure() {
diff --git a/media-libs/netpbm/netpbm-11.2.28.ebuild b/media-libs/netpbm/netpbm-11.2.29.ebuild
index 2c06c7e72e9e..aad73dbc422a 100644
--- a/media-libs/netpbm/netpbm-11.2.28.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.29.ebuild
@@ -176,6 +176,12 @@ src_prepare() {
 	sed -i \
 		-e 's/^o#!/#!/' \
 		-i test/stdin-ppm3.test || die
+
+	# gif-transparent1 broken by the latest changes; disable it temporarily
+	sed \
+		-e 's:gif-transparent1.*::' \
+		-i test/Test-Order || die
+
 }
 
 src_configure() {
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 008ced509d36..fa200bde8682 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,3 +1,4 @@
 DIST taglib-1.13.1.tar.gz 1372618 BLAKE2B 36cf9b59ded95c9996d04a86055a36a7b74a2a01c13f75826d4907abca0b982c5f9b0e4bcd6648707013108f8eaf424ab95f07c383130452aa169e2cab33f466 SHA512 986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b
 DIST taglib-2.3.1.tar.gz 1594864 BLAKE2B d29eca8d44f19c1306d1dab79768b293f29de0b25cd91e1689648286762c7102be7934f4b0ea4317e73940428261de26cd56300af946894a2466f376292d9d31 SHA512 f3988a78692527af0cb006c2cf5767f2ca624a35eaf75a594ce29f26f8b8f233d9e79c7925305cb362fa600491a9b5f34a81b622b6456e62e32d94d769be3762
+DIST taglib-2.3.2.tar.gz 1754204 BLAKE2B a301dc9d866f97b51bec389d52dea4f31a4a66647acd0aa6c0c13d49bc3a7334c638ce1dd84a55d07d08ec3d72d36cdbd7d43c0ba49a9312af63920dd3e34407 SHA512 800fe379d22d863111a22257a57d81b8e561722e8baf41dc06719913276c31f80f29dda8afd1b99f02c277d9f22e813c54c3329564bbf0ea3448c0bc6575862a
 DIST taglib-2.3.tar.gz 1590005 BLAKE2B 5392808f5adb77dbd3d31d60212ab206de627d6a4b1debbb2f3d701c85275e277b788f74d6a97698b5f3e38ffc995f0b5ec2e158d2b8da5c80a2104ef833b33d SHA512 ff19464e2fb19db46823dedd7cecb713875de0c47e55852c5e1032c71fdaf7c129b65beefa6112ca1233a890e2756a89032ec3174b0f83e2d0c0e3d18fdf238c
diff --git a/media-libs/taglib/taglib-2.3.2.ebuild b/media-libs/taglib/taglib-2.3.2.ebuild
new file mode 100644
index 000000000000..53544f7889d3
--- /dev/null
+++ b/media-libs/taglib/taglib-2.3.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/zlib:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-libs/utfcpp
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen[dot] )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		cmake_build docs
+	fi
+}
+
+multilib_src_test() {
+	eninja -C "${BUILD_DIR}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/vpl-gpu-rt/Manifest b/media-libs/vpl-gpu-rt/Manifest
index b9992c0c308e..9749a8bf0f4e 100644
--- a/media-libs/vpl-gpu-rt/Manifest
+++ b/media-libs/vpl-gpu-rt/Manifest
@@ -2,3 +2,4 @@ DIST vpl-gpu-rt-26.2.0.tar.gz 9202837 BLAKE2B c386cb7811a54b57ea26f70a18967efd5f
 DIST vpl-gpu-rt-26.2.1.tar.gz 9198354 BLAKE2B c35cfc4b29827e746f10d46278292dd7bc58b3adeb3c08e9746aa83b0619fd01d64473ec7dcd633f135235f337913fd50ae12cf498409e85fa6c0a60919c1adc SHA512 a26f5fa0f9dad1f41f28b5ef4ce754025e8f885e248e22b287cd0c7740e2840ea4931fcb10e54d99b1747ab354984d5310974066c6e5ca199f5706a52e501cf2
 DIST vpl-gpu-rt-26.2.3.tar.gz 9198486 BLAKE2B b752d4338de4fa788a079c32359bceeb746e3d975ee1ae444c6dde236ed48a528936346b526d674beba258b1b3ad1b9026a4790c2d480d45dd948c754f524efb SHA512 bf4e3e6a2be7ba7d947c12346b1568ab14b4a58bf881958be844ff9ff1bc36f50cd0d9655a9fbeb7a692a830b1fa82d17e3a5537f6172203c1db7f0d4da9fce7
 DIST vpl-gpu-rt-26.2.4.tar.gz 9198734 BLAKE2B 99eb2184753f822088196bb827b8922538d6ddc5bd776483f901e6df7a242b679d477f42b2640dcc1604dd93751c8324d7dfe907243c241a29cd5ecb39c47e7b SHA512 b0f786e4fa0767d238e7d88ffb0f8a275638938443e7a8faa70e50bb924976b0c9dc8b77de32d68f30a8d5b6cdbf5da8e5409ccab617220c1bcdfb4b2b49a908
+DIST vpl-gpu-rt-26.3.2.tar.gz 9207714 BLAKE2B 17ed52dca0096a678e7cc7666a242af1f22136823d309eaf0ef5b23477f32ba863a8ab5b52f8c5edae24791a639e2c3f42414d38e932432b85666c4a4de2f9ab SHA512 eb4b3ce5b66889d93e517f945ee3855be7d5b7d9e78389f9342ee14a8ad7bd01d9e76ea3be7abe9b7b2956c82c0b84a3c76aaa5780ae00c58616e6e768128e9c
diff --git a/media-libs/vpl-gpu-rt/vpl-gpu-rt-26.3.2.ebuild b/media-libs/vpl-gpu-rt/vpl-gpu-rt-26.3.2.ebuild
new file mode 100644
index 000000000000..f522c709e3f3
--- /dev/null
+++ b/media-libs/vpl-gpu-rt/vpl-gpu-rt-26.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: please bump with the other parts of intel's media stack, listed below
+# https://github.com/intel/vpl-gpu-rt/releases
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Video Processing Library GPU Runtime"
+HOMEPAGE="https://github.com/intel/vpl-gpu-rt/"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/gmmlib
+	media-libs/libva
+	x11-libs/libdrm[video_cards_intel]
+"
+# At runtime we need a dispatcher, libvpl is preferred but mediasdk also works
+RDEPEND="${DEPEND}
+	>=media-libs/libva-intel-media-driver-${PV}
+	|| (
+		media-libs/libvpl
+		media-libs/intel-mediasdk
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUNTIME=ON
+		# To build the kernels we need to package the cm-compiler, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_TESTS="$(usex test)"
+		# This only seems to do something if we BUILD_KERNELS=ON
+		#-DBUILD_TOOLS="$(usex tools)"
+		# OpenCL only has an effect if we build kernels
+		-DENABLE_OPENCL=OFF
+	)
+	cmake_src_configure
+}
diff --git a/media-plugins/dtmediawiki/files/enable.sh b/media-plugins/dtmediawiki/files/enable.sh
index c37d6f999773..c37d6f999773 100644..100755
--- a/media-plugins/dtmediawiki/files/enable.sh
+++ b/media-plugins/dtmediawiki/files/enable.sh
diff --git a/media-sound/apulse/files/apulse b/media-sound/apulse/files/apulse
index 32633b2d9a50..32633b2d9a50 100644..100755
--- a/media-sound/apulse/files/apulse
+++ b/media-sound/apulse/files/apulse
diff --git a/media-video/celluloid/Manifest b/media-video/celluloid/Manifest
index 48e77b9548b0..76379d2dd85a 100644
--- a/media-video/celluloid/Manifest
+++ b/media-video/celluloid/Manifest
@@ -1,2 +1,2 @@
-DIST celluloid-0.26.tar.xz 305420 BLAKE2B d74f5be26427ac0798f67e37066f0840d6af1a5a43e4bf714d02519e57231c57c34e191a678d11ebdca0ccbfd8f40eed4a23410f054394cc9f42559c6bbc934c SHA512 bcbb970b8ce512d4d7e64833a309a2e32631b262989ee7f9e1ec4b7f0015387b3978c8cbc0206a5aa86bd9e74fae3b7d38776e71be8c16996444d234bc37d42f
 DIST celluloid-0.29.tar.xz 362568 BLAKE2B c83dcfbf4f7a0c622040048a3abbd2bf36784c7a66d78b07cf0b1de4987d33083c696132de7c138ec531bf524370bf0dc2c38d4a86bbe85406f65efb07348668 SHA512 5df44379473f9f5aaca80aff25bf1f3d2d6e8bc634657292e9d57a06c7a35b29e4dfb0310b8a0381c37f5325c9225c8de72aa2dcf324af3c60141e8f8e445b03
+DIST celluloid-0.30.tar.xz 365256 BLAKE2B 3a22dabb9235bef5995233d7906766bacf183b5b9e2383640c9eb9b887eecf3568bf4c9f367604144b6abf2183667245dcb0b23a030eca3d7cffcd1df6ab59d7 SHA512 18eb7f65b4956f42b13243ef8c33f296e5f6a0a9f6b06e355ab892265566762a116aad73fe59eca4733cf210d05bed52c9180fc1f8bdddfb623891d2bbcc06bf
diff --git a/media-video/celluloid/celluloid-0.26.ebuild b/media-video/celluloid/celluloid-0.30-r1.ebuild
index ff6acaa91b82..10cec5fd3cad 100644
--- a/media-video/celluloid/celluloid-0.26.ebuild
+++ b/media-video/celluloid/celluloid-0.30-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit gnome2-utils meson xdg
+PYTHON_COMPAT=( python3_{13..14} )
+inherit flag-o-matic gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Simple GTK+ frontend for mpv"
 HOMEPAGE="https://celluloid-player.github.io/"
@@ -11,19 +12,34 @@ SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+IUSE="wayland X"
 
-RDEPEND=">=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.6.1:4
-	>=gui-libs/libadwaita-1.2.0:1
+RDEPEND="
+	>=dev-libs/glib-2.68:2
+	>=gui-libs/gtk-4.16:4[wayland?,X?]
+	>=gui-libs/libadwaita-1.8.0:1
 	>=media-video/mpv-0.32:=[libmpv]
-	media-libs/libepoxy"
+	media-libs/libepoxy
+	>=x11-libs/gdk-pixbuf-2.30:2
+"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-libs/appstream-glib
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream
 	>=dev-util/gdbus-codegen-2.80.5-r1
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# defang automagic dependencies
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	meson_src_configure
+}
 
 pkg_postinst() {
 	xdg_pkg_postinst
diff --git a/media-video/untrunc/Manifest b/media-video/untrunc/Manifest
index f588aeb5eb4b..290974c7f47f 100644
--- a/media-video/untrunc/Manifest
+++ b/media-video/untrunc/Manifest
@@ -1,2 +1,2 @@
-DIST untrunc-0_pre20260204.tar.gz 88490 BLAKE2B cfcf71583bb0b7a1efb3de96f8a60f6cad97470ab42a4e9b398503f1acc76b2dfb002bf0d1be057e672c92d3ab68134e8cc2ff63cd9a0decca7d23f69544ab3a SHA512 b9dd56f466d98bfdfbc6853ca2fa542bf849b9cd8db9765517664c0070a96484eecd634891c390ca04d027cbe5a1a1cc536d8786b87556954d69afcd3f0bd118
 DIST untrunc-0_pre20260605.tar.gz 90444 BLAKE2B d315a00d7546f7408228b535821aa811e79cb8189bdd75af2a3b45d2056a08643f3f749b5439d19b5c47ea7f68a4b58a20194d3bc92069bd25e02581fdd5c5b6 SHA512 d615a6fbc526e2e1ee20cf368ce1d9f395ece4c4542b67f0df952e9758a4f295197a991ca6737ed9fdc55e16bc487c2174a142f0350f30dc4812b059e71b0e58
+DIST untrunc-0_pre20260820.tar.gz 90478 BLAKE2B f98d5396b1b890586ef9343ec32a251d3d3576c3ec3811a64c2663cdfd8569607d63446aa960f190171bf199308e9b123b2b028c4d99df1c8f0283166190c955 SHA512 88d348067d58505017b1965bd664d46dcae6444d18837ee7e0cb563927e3a090ef823451e3fea9ec95ff6452684ebfb410929fe213a0997bdffc07401b9b0c6b
diff --git a/media-video/untrunc/untrunc-0_pre20260204.ebuild b/media-video/untrunc/untrunc-0_pre20260820.ebuild
index 2878f1c9fad9..6c14929398ae 100644
--- a/media-video/untrunc/untrunc-0_pre20260204.ebuild
+++ b/media-video/untrunc/untrunc-0_pre20260820.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=9
 
 DESCRIPTION="Restore truncated mp4/mov files"
 HOMEPAGE="https://github.com/anthwlock/untrunc"
 
-COMMIT="d286625fb51bf67b7f8536ce7d0340455d3b208b"
+COMMIT="9d86ec9ef2ffed1bf8131abe80742c0574db52b6"
 SRC_URI="https://github.com/anthwlock/untrunc/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
diff --git a/metadata/stabilization-groups/base/pcre2.group b/metadata/stabilization-groups/base/pcre2.group
new file mode 100644
index 000000000000..7b45fd3a34f0
--- /dev/null
+++ b/metadata/stabilization-groups/base/pcre2.group
@@ -0,0 +1,2 @@
+dev-libs/libpcre2
+virtual/libpcre2-internals
diff --git a/net-analyzer/nmap/nmap-7.991.ebuild b/net-analyzer/nmap/nmap-7.991.ebuild
index e411d6919aab..067085502b45 100644
--- a/net-analyzer/nmap/nmap-7.991.ebuild
+++ b/net-analyzer/nmap/nmap-7.991.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 fi
 
 SRC_URI+=" https://distfiles.gentoo.org/pub/dev/sam@gentoo.org/${CATEGORY}/${PN}/${PN}-7.991-patches-1.tar.xz"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index ed1b6a28898a..3f88ee12f11c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -2,16 +2,12 @@ DIST zabbix-6.0.46-go-deps.tar.xz 32420472 BLAKE2B 71cdd86635191b1af9834a063a227
 DIST zabbix-6.0.46.tar.gz 41430362 BLAKE2B b3859ee77e815ac05e9fbb8ab15e4aead764ff7bc67fb15ba09cd52f985a35e8b9c26e2ecacb34d9384a617a4d5ac5423c6c4fff0df99f63633fe395ce48e22c SHA512 bcc4ffa3727886d0a45b846a3b5071e1e6e51bbebaa3342356185bdfd8639409afafa85686d2d4a37a4c932618179929d8980fefda2b9ce1c149f065dec29bc8
 DIST zabbix-6.0.48-go-deps.tar.xz 32104880 BLAKE2B bd66466782ac1a823a3097b837255688ec02ec2f7a6302fe324b59714ab636a9a11905de86aa40d684fd761dfce5a077944a949ea340a91ff07491474baaf76a SHA512 4d61e41620287b1997d513886ae6ed08193b287c5d3b777fea0686f824773f91f93be73e1ff6c18f783daea36ceca504e028ca3937bddab0f04d5f9762cbf667
 DIST zabbix-6.0.48.tar.gz 41986053 BLAKE2B a15353ab1be52e545b48fceb54c03db34c367f9db4a763cb683fc2a2ded1e0165a9539d4de9aabbf79f319793b2750950d1833fbf4efa55a5687dc4b18323041 SHA512 8005c970f9d041abf00ae470be30cd220a59c93ed9ac06333c279a87c09082ba3637072a7fec2ca89d07e4db266ba8c87188fa538f7069c992daf99413615759
-DIST zabbix-7.0.26-go-deps.tar.xz 36969604 BLAKE2B 53a7456092f2fb98c96218d65217d9e5e67f9b91ce7d30658a2485236cf2e1320db46e6e03a68d8460f053e1f818bde2e94a494987bca466cb880bf0c9c92b9f SHA512 61841a88db7387e787ee93ab09ac6aa423e11970d045c84eabce0e44292eb1130c4767545eabd10165b56a8788d576e9069fce1ae8aa1b636edae03f6752748c
-DIST zabbix-7.0.26.tar.gz 46875037 BLAKE2B c54bded1a8d3498d82cc4c45f47f0d2cc98b7baf0d429a653b2f5e667a3745037a27490d8c2787e7e27af1fbfc5333c9d20856154d9c5d9da8f3ad7d7651a727 SHA512 b615bc09eaeca0880579bdab8e002d8a0af7d0ef6cead056261d0326df6763fe1aea3619e8e94ea53243f9d33dc2665a0d0b55032bf2031556fff0813ccf0bb8
 DIST zabbix-7.0.27-go-deps.tar.xz 37263272 BLAKE2B 71cbc3e64ae7ccbd3614e3795dd3d396f2ffe2390dd9e9d6d3465e4a8e340b8f172df0934d437f19a267297f124d7acd6e3cb5b2b5f8ace4ce3a4e696e86d475 SHA512 0e1f1acb5208b66f48ad7d3126de5de95a7b71fcf24dddc6b20cb835ff3d620dd2f25977dae85e6bdb73442f216b63758714a3b1d1f68b6a6c37c7e865acd804
 DIST zabbix-7.0.27.tar.gz 46883404 BLAKE2B bfe680d0cefc75386ace9288ebaf4b2f430d64b55275ce980f984accf4ca06f1f1bce2385985a030af40c488c01360860f5ea429d1548397a726435136e5761a SHA512 6d412788e752645c172b2eef99bb33838d05cddec29054308698c5a1aecca9f1a826178278018bf6b1f626996ddda8151a6ad631ed9bb9b76e37c7b94a566ab0
 DIST zabbix-7.0.29-go-deps.tar.xz 36973116 BLAKE2B 5953236ba3bc18980cec73cee73eb5d0fdd6ea3906f9cc817798e9090515ef027b750feec0e694f1c8a6e4f54d2a94e5cb05b72b2002cf2c3a981a43955b3dc7 SHA512 fdc8e33d11e4c1adfcc0fbde5c4f7120795fcef9b668206a120e2c5698060fad0cd60554060abe79c19d3530785136bf0c219c8ad95fad4d6c664ac6b4fd6d44
 DIST zabbix-7.0.29.tar.gz 47492568 BLAKE2B d013d271842464658bdb05f5d60ee591e60cfd7a9406c30f91ed96da8ec3a24c8f145154541190bf09d2819cba8c57cc7e264eb5148d257177f81d40b307cbb4 SHA512 f8a6122f058bd89238e24210ffb85b4040f7fb727ba4e04d756d41a31a549256e7627e4e5a74d4c39a35591f6356b23f279e032bf106c148b00ad19ca335c771
 DIST zabbix-7.0.30-go-deps.tar.xz 36991656 BLAKE2B 6874a5d14af314ebeef88bdf4e7a8a2e30ac79ff4d78c2c1b4f62fe95921d84089531b647f667fc4ad3e2c15835c26cea5dae1b4ce81f409783f1b88c9e36b2d SHA512 02c7c4530a1042579a387dd120726e5cd3c15c8203648d559ffc1c281a1878a9f2dbce01c3141d8d74a8f9e2073443cebd0abdee5db93a5928de91d1bac0b647
 DIST zabbix-7.0.30.tar.gz 47492748 BLAKE2B 52b6f7e120944af7408754a7f18f9647b199f1caa7e3dd8b0d5d4d777ac36ca3cba02aab0bfbb31d5a0dcdb40b4b29b3a94bfc9765af517668fe8c8abcaf79f9 SHA512 772b450225375b634e3da789bb252d52306b8262c53e91a10318eafd434dc6a487c9fbfd7d176fed7c598e45ca6f55bb9fa8911f6d6e23867fbfcc1b59612923
-DIST zabbix-7.4.10-go-deps.tar.xz 36870880 BLAKE2B 253e43cb9e199b9c2625276dad39a8688c37ac15f82a6e59b278830a0696a0a0a440bc200ad3ab64148d4c7ccd38c3a1bb5900a62b4e4edb3e98fb07e8c156f9 SHA512 da27b99a9657b84a8d3fc1121854c69945a58d6eacec735909b59e53fd432f1d83c34cf4bac04d08e7aed9dff85f944c3d4075e33b5e5fcd88b657ab28ea29a5
-DIST zabbix-7.4.10.tar.gz 43527563 BLAKE2B 740745d789da8fdf5ece6883c11cabb44b80dc4ed73507d0774e94cb213b1a20fe86714476420f29be8a2217b0347b1b4aa80703600833b063d42a6c4126aa6d SHA512 cdd78ebf0c5e83525b70cbf69c3bead4900770f0a78e065b48ebf4f531487ff5dc6b2451fb0b757e29fa0271e7a0afcad7cadcfdfac8ccd537bbfeaeb2a6f8a6
 DIST zabbix-7.4.11-go-deps.tar.xz 36906032 BLAKE2B 1a45ac5ff2c7c1ee5ffb387d91f0e3e488a3fec12e6fb306ab22cacd5d32d5cff5341ed076e529d9680850eb0e1f0c0f8d1320f1ed6113e48cf84654a632bc97 SHA512 c8e5355c16f5475921a8cd2fc3164355b1db0b96df92bcba1bf3a9ecf4a13301eb4dafaf5117303e8f81711f44e83a07406b31cd89dd443ca5c0a8aff09c5ed5
 DIST zabbix-7.4.11.tar.gz 43533153 BLAKE2B a12d9c8476bc187714b9b77f367bfeb682729eb56d12a447508c24dcd301ada47c0602732c958dc3e505e362531b30b549b3c155d37a6950cc62f2dcaa0cf771 SHA512 47d07d3acdbf6cb2c726e49ce3bd5f72558e1ce90f1f27fb62a28a7bb81bb5fe4dd181d4f88a4cf9c79864258bd959947bfc898bb63777e584ff08fbe6e497b2
 DIST zabbix-7.4.13-go-deps.tar.xz 36884932 BLAKE2B cdcd2e60d67c0676481975a48021d22a34644534da0b00fe0e05fb3a91504239934b0533a1c66335e08c9bac198bd18b85e7bf8357c508fe5dd0ed9389a3cfee SHA512 cb00fee08710552ecc327e2963772a0c47d8f48cfe691fda420e781199c7af03c33bb6faa7530b1ab8fc0f0d7974777a71e879ee7452a580c428a63415e185da
diff --git a/net-analyzer/zabbix/zabbix-7.0.26.ebuild b/net-analyzer/zabbix/zabbix-7.0.26.ebuild
deleted file mode 100644
index d7a0e181a09e..000000000000
--- a/net-analyzer/zabbix/zabbix-7.0.26.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="AGPL-3"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	agent2? ( !gnutls )
-	proxy? ( ^^ ( mysql postgres sqlite ) )
-	server? ( ^^ ( mysql postgres ) !sqlite )
-	static? ( !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		virtual/zlib:=
-	)
-	server? (
-		dev-libs/libevent:=
-		virtual/zlib:=
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	selinux? ( sec-policy/selinux-zabbix )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,gd,jpeg(+),nls,png(+),session,sockets,sysvipc,truetype,unicode,xml,xmlreader,xmlwriter]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
-)
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
-	eautoreconf
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.5.16.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.5.16.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-2.0.16.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-7.0.27.ebuild b/net-analyzer/zabbix/zabbix-7.0.27.ebuild
index 413c39cf06c6..d7a0e181a09e 100644
--- a/net-analyzer/zabbix/zabbix-7.0.27.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.27.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-7.4.10.ebuild b/net-analyzer/zabbix/zabbix-7.4.10.ebuild
deleted file mode 100644
index a21efc204f3b..000000000000
--- a/net-analyzer/zabbix/zabbix-7.4.10.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="AGPL-3"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	agent2? ( !gnutls )
-	proxy? ( ^^ ( mysql postgres sqlite ) )
-	server? ( ^^ ( mysql postgres ) !sqlite )
-	static? ( !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		virtual/zlib:=
-	)
-	server? (
-		dev-libs/libevent:=
-		virtual/zlib:=
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	selinux? ( sec-policy/selinux-zabbix )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,gd,jpeg(+),nls,png(+),session,sockets,sysvipc,truetype,unicode,xml,xmlreader,xmlwriter]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.24.10
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
-)
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
-	eautoreconf
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.5.16.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.5.16.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-2.0.16.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-7.4.11.ebuild b/net-analyzer/zabbix/zabbix-7.4.11.ebuild
index 70f4f48a77c1..a21efc204f3b 100644
--- a/net-analyzer/zabbix/zabbix-7.4.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.4.11.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-firewall/firewalld/firewalld-2.4.4.ebuild b/net-firewall/firewalld/firewalld-2.4.4.ebuild
index ef4392904cc7..beea7ccb08fd 100644
--- a/net-firewall/firewalld/firewalld-2.4.4.ebuild
+++ b/net-firewall/firewalld/firewalld-2.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui selinux test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"
diff --git a/net-fs/openafs/files/systemd/openafs-client-systemd-helper.sh b/net-fs/openafs/files/systemd/openafs-client-systemd-helper.sh
index ae3b5220e252..ae3b5220e252 100644..100755
--- a/net-fs/openafs/files/systemd/openafs-client-systemd-helper.sh
+++ b/net-fs/openafs/files/systemd/openafs-client-systemd-helper.sh
diff --git a/net-im/bbctl/files/bbctl.initd b/net-im/bbctl/files/bbctl.initd
index 7060cbf93dd6..7060cbf93dd6 100644..100755
--- a/net-im/bbctl/files/bbctl.initd
+++ b/net-im/bbctl/files/bbctl.initd
diff --git a/net-im/fractal/fractal-14.1.ebuild b/net-im/fractal/fractal-14.1.ebuild
index 76313a929db8..d34af4bfd12c 100644
--- a/net-im/fractal/fractal-14.1.ebuild
+++ b/net-im/fractal/fractal-14.1.ebuild
@@ -35,7 +35,7 @@ LICENSE+="
 	CDLA-Permissive-2.0 GPL-3+ ISC MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 DEPEND="
 	>=dev-libs/glib-2.86
diff --git a/net-im/kaidan/Manifest b/net-im/kaidan/Manifest
index b4726c9951b7..f4230c463643 100644
--- a/net-im/kaidan/Manifest
+++ b/net-im/kaidan/Manifest
@@ -1 +1 @@
-DIST kaidan-0.13.0.tar.xz 898696 BLAKE2B 67dfe4d39aa4967ddcc7b9365a3cb33ac2d07394b0d8f8a36535779adb9c2687cb687f37595a3379ea3862b84bf3cbce5990b188e290353027b7e2f604cbcc42 SHA512 07fd45b75e219158c12add248127e405339d099b9abf5f4d264afcbcea19d47d14a19fb95f605bc5291208697cc585f23b43a370f9fca25ca4b770b02c59afb6
+DIST kaidan-0.16.0.tar.xz 1081856 BLAKE2B 165455a0fdf25d3122e55acf6545dbc8f851523323f9931d4b74e137466d606d3fca7d57cc2f9ef994252c6e09cc1d94f7e5351266d39e10833624ddb06adb31 SHA512 ca396998e1ef8617a1db12eedc49b948ade2d0c152a79f2d0f4892b756f36f01ddb69674ee945abce76be4b410f33136a7bd72329bf2e99c69470d70ee5ce3ff
diff --git a/net-im/kaidan/files/kaidan-0.13.0-qt6.10.patch b/net-im/kaidan/files/kaidan-0.13.0-qt6.10.patch
deleted file mode 100644
index 9b10353cdf5e..000000000000
--- a/net-im/kaidan/files/kaidan-0.13.0-qt6.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 26942b401070e6628e4c85768632ca33538bb99c Mon Sep 17 00:00:00 2001
-From: Melvin Keskin <melvo@olomono.de>
-Date: Mon, 13 Oct 2025 21:02:48 +0200
-Subject: [PATCH] Add dependency Qt6GuiPrivate needed since Qt 6.10.0
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index abbd885df..f9ea0e47c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,11 @@ set(AUTOMOC_MOC_OPTIONS -Muri=${APPLICATION_ID})
- 
- # Find packages
- find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Concurrent Qml Quick Svg Sql QuickControls2 Xml Multimedia Positioning Location)
-+
-+if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0" AND NOT WIN32 AND NOT APPLE)
-+    find_package(Qt6GuiPrivate ${QT_MIN_VERSION} REQUIRED NO_MODULE)
-+endif()
-+
- find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS KIO Kirigami Prison)
- if (NOT ANDROID)
-    find_package(KF6 ${KF_MIN_VERSION} OPTIONAL_COMPONENTS Crash)
--- 
-GitLab
-
diff --git a/net-im/kaidan/kaidan-0.13.0.ebuild b/net-im/kaidan/kaidan-0.16.0.ebuild
index e6da929fa917..8b5e4b6116a0 100644
--- a/net-im/kaidan/kaidan-0.13.0.ebuild
+++ b/net-im/kaidan/kaidan-0.16.0.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_TEST="true"
-KFMIN=6.11.0
-QTMIN=6.8.0
+QTMIN=6.11.2
 inherit ecm kde.org xdg
 
 DESCRIPTION="Modern XMPP chat app for every device"
-HOMEPAGE="https://www.kaidan.im"
+HOMEPAGE="https://www.kaidan.im/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
@@ -19,11 +18,11 @@ fi
 LICENSE="CC-BY-SA-4.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/icu:=
-	dev-libs/kdsingleapplication
-	>=dev-libs/qtkeychain-0.15:=
-	>=dev-libs/kirigami-addons-1.4.0:6
+	dev-libs/kdsingleapplication:=
+	>=dev-libs/qtkeychain-0.16:=
+	>=dev-libs/kirigami-addons-1.8.0:6
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,sql,ssl,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtlocation-${QTMIN}:6
@@ -34,19 +33,26 @@ RDEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-frameworks/knotifications-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/prison-${KFMIN}:6[qml]
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	media-libs/gstreamer:1.0
 	media-libs/kquickimageeditor:6
-	>=net-libs/qxmpp-1.11.0:=[omemo]
+	media-plugins/gst-plugins-qt6:1.0
+	>=net-libs/qxmpp-1.16.0:=[gstreamer,omemo]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
 "
-BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
-
-PATCHES=( "${FILESDIR}/${P}-qt6.10.patch" )
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	virtual/pkgconfig
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-im/telegram-desktop/files/tdesktop-6.9.3-no-dispatch.patch b/net-im/telegram-desktop/files/tdesktop-6.9.3-no-dispatch.patch
deleted file mode 100644
index b402f03ba231..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-6.9.3-no-dispatch.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/desktop-app/lib_crl/pull/8
-https://github.com/Jamim/lib_crl/commit/8826978a51b8084f9af884b79782ac6450252465
-
-From 8826978a51b8084f9af884b79782ac6450252465 Mon Sep 17 00:00:00 2001
-From: Aliaksei Urbanski <aliaksei.urbanski@gmail.com>
-Date: Fri, 12 Jun 2026 14:25:13 +0300
-Subject: [PATCH] Disable libdispatch support
-
-Telegram Desktop 6.9.3 build fails in case libdispatch is installed.
-Removing #define CRL_USE_DISPATCH fixes that.
----
- crl/common/crl_common_config.h | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/crl/common/crl_common_config.h b/crl/common/crl_common_config.h
-index 2abbcfd..42cb47b 100644
---- a/Telegram/lib_crl/crl/common/crl_common_config.h
-+++ b/Telegram/lib_crl/crl/common/crl_common_config.h
-@@ -31,20 +31,7 @@
- #define CRL_USE_WINAPI_LIST
- #endif // !CRL_FORCE_COMMON_LIST
- 
--#elif __has_include(<dispatch/dispatch.h>) && !defined CRL_FORCE_QT // _MSC_VER && !CRL_FORCE_QT
--
--// gcc compatibility
--#ifndef __has_feature
--#define __has_feature(x) 0
--#endif // !__has_feature
--
--#ifndef __has_extension
--#define __has_extension __has_feature
--#endif // !__has_extension
--
--#define CRL_USE_DISPATCH
--
--#elif __has_include(<tmc/ex_cpu.hpp>) && !defined CRL_FORCE_QT // dispatch && !CRL_FORCE_QT
-+#elif __has_include(<tmc/ex_cpu.hpp>) && !defined CRL_FORCE_QT // _MSC_VER && !CRL_FORCE_QT
- 
- #define CRL_USE_TMC
- 
diff --git a/net-im/telegram-desktop/files/tdesktop-6.9.3-qt6-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-6.9.3-qt6-no-wayland.patch
deleted file mode 100644
index 1d891989edb2..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-6.9.3-qt6-no-wayland.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Allow disabling wayland integration for Qt6 builds
-
-Upstream has removed the required toggle for wayland integration, and instead
-is forcing it when qt has been built with USE=wayland.
-
-I'm not certain keeping patching it like this is feasible in the long term. A
-method of disabling QT_FEATURE_wayland should be more appropriate.
-
-https://bugs.gentoo.org/928451
-https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766ac7da0cb381c
-
---- tdesktop-6.9.3-orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-+++ tdesktop-6.9.3-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-@@ -340,7 +340,7 @@
- 	}
- 	static const bool result =
- #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
--#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 		qApp->nativeInterface<QNativeInterface::QWaylandApplication>()
- #else // wayland
- 		false
---- tdesktop-6.9.3-orig/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
-+++ tdesktop-6.9.3-full/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
-@@ -15,7 +15,7 @@
- namespace base::Platform {
- 
- void RunWithXdgActivationToken(Fn<void(QString)> callback) {
--#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 	const auto window = QGuiApplication::focusWindow();
- 	if (!window) {
- 		callback({});
---- tdesktop-6.9.3-orig/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
-+++ tdesktop-6.9.3-full/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
-@@ -529,7 +529,7 @@
- }
- #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
- 
--#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- constexpr auto kWaylandMarshalFlagDestroy = uint32_t(1);
- const auto kWaylandImportedObjectName = u"_td_wayland_foreign_imported"_q;
- 
-@@ -1086,7 +1086,7 @@
- }
- 
- bool WindowMarginsSupported() {
--#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 	static const auto WaylandResult = [] {
- 		using namespace QNativeInterface::Private;
- 		QWindow window;
-@@ -1113,7 +1113,7 @@
- }
- 
- void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
--#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 	using namespace QNativeInterface::Private;
- 	const auto window = not_null(widget->windowHandle());
- 	const auto platformWindow = not_null(window->handle());
-@@ -1135,7 +1135,7 @@
- }
- 
- void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
--#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 	if (::Platform::IsWayland()) {
- 		ShowWaylandWindowMenu(widget, point);
- 		return;
---- tdesktop-6.9.3-orig/Telegram/lib_ui/ui/widgets/popup_menu.cpp
-+++ tdesktop-6.9.3-full/Telegram/lib_ui/ui/widgets/popup_menu.cpp
-@@ -900,7 +900,7 @@
- 			0),
- 		_padding.top() - _topShift);
- 	auto r = screen ? screen->availableGeometry() : QRect();
--#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 	using namespace QNativeInterface::Private;
- 	if (const auto native
- 			= windowHandle()->nativeInterface<QWaylandWindow>()) {
---- tdesktop-6.9.3-orig/Telegram/lib_ui/ui/widgets/tooltip.cpp
-+++ tdesktop-6.9.3-full/Telegram/lib_ui/ui/widgets/tooltip.cpp
-@@ -115,7 +115,7 @@
- 		p.setX(m.x() - (s.width() / 2));
- 	}
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland)
- 	using namespace QNativeInterface::Private;
- 	create();
- 	if (const auto native
---- tdesktop-6.9.3-orig/cmake/options.cmake
-+++ tdesktop-6.9.3-full/cmake/options.cmake
-@@ -22,6 +22,13 @@
-     )
- endif()
- 
-+if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-+    target_compile_definitions(common_options
-+    INTERFACE
-+    	DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-+    )
-+endif()
-+
- if (WIN32)
-     include(cmake/options_win.cmake)
- elseif (APPLE)
---- tdesktop-6.9.3-orig/cmake/variables.cmake
-+++ tdesktop-6.9.3-full/cmake/variables.cmake
-@@ -33,6 +33,7 @@
- option(DESKTOP_APP_LOTTIE_DISABLE_RECOLORING "Disable recoloring of lottie animations." OFF)
- option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON)
- cmake_dependent_option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration." OFF LINUX ON)
-+cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF LINUX ON)
- cmake_dependent_option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer." OFF LINUX OFF)
- option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF)
- option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-6.9.3-use-pkgconfig-for-cmark-gfm.patch b/net-im/telegram-desktop/files/tdesktop-6.9.3-use-pkgconfig-for-cmark-gfm.patch
deleted file mode 100644
index 177e9d257878..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-6.9.3-use-pkgconfig-for-cmark-gfm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Use pkg-config file for cmark-gfm
-
-The upstream-provided cmake installation isn't set up to allow the use of
-find_package(), and while vcpkg has a patch for this[1], none of the linux
-distributions I've checked carry this. Thankfully, cmark-gfm carries a
-pkg-config file, which should be perfect for this situation.
-
-[1]: https://github.com/microsoft/vcpkg/blob/9dd12f8d791f6fa4e396adbebc714d51cbee2143/ports/cmark-gfm/add-feature-tools.patch
-
-Submitted: https://github.com/desktop-app/cmake_helpers/pull/440
-
---- tdesktop-6.9.3-full.orig/cmake/external/cmark_gfm/CMakeLists.txt
-+++ tdesktop-6.9.3-full/cmake/external/cmark_gfm/CMakeLists.txt
-@@ -18,6 +18,16 @@
-         )
-         return()
-     endif()
-+
-+    find_package(PkgConfig)
-+    if (PkgConfig_FOUND)
-+        pkg_check_modules(DESKTOP_APP_CMARK_GFM IMPORTED_TARGET libcmark-gfm)
-+    endif()
-+
-+    if (DESKTOP_APP_CMARK_GFM_FOUND)
-+        target_link_libraries(external_cmark_gfm INTERFACE PkgConfig::DESKTOP_APP_CMARK_GFM)
-+        return()
-+    endif()
- endif()
- 
- # Everything that follows is scoped to this block(). All variables, the
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 8f4ecb07ca11..530a018c0d70 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,2 +1,2 @@
 DIST davix-0.8.10.tar.gz 6100049 BLAKE2B 46f48562d7eaf77c0dfb9fccd928243f727adc12579f2b25ab195f176e7e7b39cce0b255dac89ba2a53e11d4643037676ac889030545fc79a5ecbdf659785137 SHA512 8d9b118ca333fc7b66a640cd174a78839ed3fbe15b0ec709771473c06a5625fed35944f09485aa91c4e64b65f1b4add6e5d1668fda33d30b73d323819b2c8e7d
-DIST davix-0.8.7.tar.gz 7376826 BLAKE2B 3f1c3f8ece934df9a989bd89257e351c5be154a550108278d815451534f41fdfdda21136312a01d393fe52755e13b76bf401da13cbe276911d61d5fb26eb8383 SHA512 652914fefd51f42277a56668466f2182be8100473ffd281fbed2f57980b93f6560840f6f4a87531faf54f66d98b9d3e291dd5f8c1fceab1e6c19d83ae9f05828
+DIST davix-0.9.0.tar.gz 2974537 BLAKE2B a3e46d1a2ebde2fb02d44a9cfafa9de95bfc6a3b6714283f0a84ae592f451ea379068d9f0549b0ed5a5f9c1245f829126a943b3371b3b6055fb7a6ab59b53395 SHA512 f3b43b72532ed758529509b8544c3d6f27add20d7199c1d40e5cc95be3601e6094963b27d42ba03ee7d9ecd7a258eb4574bc44ca7309eaf68b073bc50ff42a38
diff --git a/net-libs/davix/davix-0.8.7.ebuild b/net-libs/davix/davix-0.9.0.ebuild
index 4d52571fa7bf..4a6384f25b95 100644
--- a/net-libs/davix/davix-0.8.7.ebuild
+++ b/net-libs/davix/davix-0.9.0.ebuild
@@ -1,10 +1,9 @@
-# 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 cmake python-any-r1
 
 DESCRIPTION="High-performance file management over WebDAV/HTTP"
@@ -13,39 +12,36 @@ SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test tools"
+
+REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-		dev-libs/rapidjson:0=
-		net-libs/gsoap[ssl,-gnutls]
-		net-misc/curl:0=
-		kernel_linux? ( sys-apps/util-linux )
+RDEPEND="
+	dev-libs/libxml2:2=
+	dev-libs/openssl:0=
+	dev-libs/rapidjson:0=
+	net-libs/gsoap[ssl,-gnutls]
+	net-misc/curl:0=
+	kernel_linux? ( sys-apps/util-linux )
 "
-
-DEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND="
-		doc? (
-			app-text/doxygen[dot]
-			dev-python/sphinx
-		)
-		virtual/pkgconfig
-		${PYTHON_DEPS}
+	doc? (
+		app-text/doxygen[dot]
+		dev-python/sphinx
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
 "
 
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="test? ( tools )"
-
 src_prepare() {
 	cmake_src_prepare
 
 	for x in doc test; do
 		if ! use $x; then
-			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
+			cmake_comment_add_subdirectory $x
 		fi
 	done
 }
@@ -53,15 +49,14 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DPython_EXECUTABLE="${PYTHON}"
-		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DEMBEDDED_LIBCURL=OFF
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DLIBCURL_BACKEND_BY_DEFAULT=OFF
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=TRUE
 		-DENABLE_TCP_NODELAY=TRUE
 		-DENABLE_THIRD_PARTY_COPY=TRUE
 		-DENABLE_TOOLS=$(usex tools)
-		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
+		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
 		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
 		-DSTATIC_LIBRARY=OFF
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
diff --git a/net-libs/davix/davix-9999.ebuild b/net-libs/davix/davix-9999.ebuild
index 9db2db990604..0732803515ae 100644
--- a/net-libs/davix/davix-9999.ebuild
+++ b/net-libs/davix/davix-9999.ebuild
@@ -55,15 +55,14 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DPython_EXECUTABLE="${PYTHON}"
-		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DEMBEDDED_LIBCURL=OFF
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DLIBCURL_BACKEND_BY_DEFAULT=OFF
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=TRUE
 		-DENABLE_TCP_NODELAY=TRUE
 		-DENABLE_THIRD_PARTY_COPY=TRUE
 		-DENABLE_TOOLS=$(usex tools)
-		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
+		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
 		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
 		-DSTATIC_LIBRARY=OFF
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
diff --git a/net-libs/gssdp/gssdp-1.6.6.ebuild b/net-libs/gssdp/gssdp-1.6.6.ebuild
index 5538557e4f5a..2f81a9e2aa54 100644
--- a/net-libs/gssdp/gssdp-1.6.6.ebuild
+++ b/net-libs/gssdp/gssdp-1.6.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gssdp"
 
 LICENSE="LGPL-2+"
 SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk gtk-doc +introspection man +vala"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
diff --git a/net-libs/nodejs/files/nodejs-24.11.1-gcc15-ppc.patch b/net-libs/nodejs/files/nodejs-24.11.1-gcc15-ppc.patch
deleted file mode 100644
index 0d0f65b8820a..000000000000
--- a/net-libs/nodejs/files/nodejs-24.11.1-gcc15-ppc.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-https://bugs.gentoo.org/971054 / https://github.com/google/highway/commit/dcc0ca1cd4245ecff9e5ba50818e47d5e2ccf699
-From: John Platts <john_platts@hotmail.com>
-Date: Fri, 17 Jan 2025 12:16:49 -0600
-Subject: [PATCH] Fix for GCC 15 compiler error on PPC8/PPC9/PPC10
-
---- a/deps/v8/third_party/highway/src/hwy/ops/ppc_vsx-inl.h
-+++ b/deps/v8/third_party/highway/src/hwy/ops/ppc_vsx-inl.h
-@@ -3701,16 +3701,73 @@ static HWY_INLINE V VsxF2INormalizeSrcVals(V v) {
- #endif
- }
- 
-+template <class VF32>
-+static HWY_INLINE HWY_MAYBE_UNUSED VFromD<Repartition<int64_t, DFromV<VF32>>>
-+VsxXvcvspsxds(VF32 vf32) {
-+  using VI64 = VFromD<Repartition<int64_t, DFromV<VF32>>>;
-+#if (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1500) || \
-+    HWY_HAS_BUILTIN(__builtin_vsx_xvcvspsxds)
-+  // Use __builtin_vsx_xvcvspsxds if it is available (which is the case with
-+  // GCC 4.8 through GCC 14 or Clang 13 or later on PPC8/PPC9/PPC10)
-+  return VI64{__builtin_vsx_xvcvspsxds(vf32.raw)};
-+#elif HWY_COMPILER_GCC_ACTUAL >= 1500 && HWY_IS_LITTLE_ENDIAN
-+  // On little-endian PPC8/PPC9/PPC10 with GCC 15 or later, use the F32->I64
-+  // vec_signedo intrinsic as the __builtin_vsx_xvcvspsxds intrinsic has been
-+  // removed from GCC in GCC 15
-+  return VI64{vec_signedo(vf32.raw)};
-+#elif HWY_COMPILER_GCC_ACTUAL >= 1500 && HWY_IS_BIG_ENDIAN
-+  // On big-endian PPC8/PPC9/PPC10 with GCC 15 or later, use the F32->I64
-+  // vec_signede intrinsic as the __builtin_vsx_xvcvspsxds intrinsic has been
-+  // removed from GCC in GCC 15
-+  return VI64{vec_signede(vf32.raw)};
-+#else
-+  // Inline assembly fallback for older versions of Clang that do not have the
-+  // __builtin_vsx_xvcvspsxds intrinsic
-+  __vector signed long long raw_result;
-+  __asm__("xvcvspsxds %x0, %x1" : "=wa"(raw_result) : "wa"(vf32.raw) :);
-+  return VI64{raw_result};
-+#endif
-+}
-+
-+template <class VF32>
-+static HWY_INLINE HWY_MAYBE_UNUSED VFromD<Repartition<uint64_t, DFromV<VF32>>>
-+VsxXvcvspuxds(VF32 vf32) {
-+  using VU64 = VFromD<Repartition<uint64_t, DFromV<VF32>>>;
-+#if (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1500) || \
-+    HWY_HAS_BUILTIN(__builtin_vsx_xvcvspuxds)
-+  // Use __builtin_vsx_xvcvspuxds if it is available (which is the case with
-+  // GCC 4.8 through GCC 14 or Clang 13 or later on PPC8/PPC9/PPC10)
-+  return VU64{reinterpret_cast<__vector unsigned long long>(
-+      __builtin_vsx_xvcvspuxds(vf32.raw))};
-+#elif HWY_COMPILER_GCC_ACTUAL >= 1500 && HWY_IS_LITTLE_ENDIAN
-+  // On little-endian PPC8/PPC9/PPC10 with GCC 15 or later, use the F32->U64
-+  // vec_unsignedo intrinsic as the __builtin_vsx_xvcvspuxds intrinsic has been
-+  // removed from GCC in GCC 15
-+  return VU64{vec_unsignedo(vf32.raw)};
-+#elif HWY_COMPILER_GCC_ACTUAL >= 1500 && HWY_IS_BIG_ENDIAN
-+  // On big-endian PPC8/PPC9/PPC10 with GCC 15 or later, use the F32->U64
-+  // vec_unsignedo intrinsic as the __builtin_vsx_xvcvspuxds intrinsic has been
-+  // removed from GCC in GCC 15
-+  return VU64{vec_unsignede(vf32.raw)};
-+#else
-+  // Inline assembly fallback for older versions of Clang that do not have the
-+  // __builtin_vsx_xvcvspuxds intrinsic
-+  __vector unsigned long long raw_result;
-+  __asm__("xvcvspuxds %x0, %x1" : "=wa"(raw_result) : "wa"(vf32.raw) :);
-+  return VU64{raw_result};
-+#endif
-+}
-+
- }  // namespace detail
- #endif  // !HWY_S390X_HAVE_Z14
- 
- template <class D, HWY_IF_I64_D(D)>
- HWY_API VFromD<D> PromoteTo(D di64, VFromD<Rebind<float, D>> v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspsxds))
--  const __vector float raw_v =
--      detail::VsxF2INormalizeSrcVals(InterleaveLower(v, v)).raw;
--  return VFromD<decltype(di64)>{__builtin_vsx_xvcvspsxds(raw_v)};
-+#if !HWY_S390X_HAVE_Z14
-+  const Repartition<float, decltype(di64)> dt_f32;
-+  const auto vt_f32 = ResizeBitCast(dt_f32, v);
-+  return detail::VsxXvcvspsxds(
-+      detail::VsxF2INormalizeSrcVals(InterleaveLower(vt_f32, vt_f32)));
- #else
-   const RebindToFloat<decltype(di64)> df64;
-   return ConvertTo(di64, PromoteTo(df64, v));
-@@ -3719,12 +3776,11 @@ HWY_API VFromD<D> PromoteTo(D di64, VFromD<Rebind<float, D>> v) {
- 
- template <class D, HWY_IF_U64_D(D)>
- HWY_API VFromD<D> PromoteTo(D du64, VFromD<Rebind<float, D>> v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspuxds))
--  const __vector float raw_v =
--      detail::VsxF2INormalizeSrcVals(InterleaveLower(v, v)).raw;
--  return VFromD<decltype(du64)>{reinterpret_cast<__vector unsigned long long>(
--      __builtin_vsx_xvcvspuxds(raw_v))};
-+#if !HWY_S390X_HAVE_Z14
-+  const Repartition<float, decltype(du64)> dt_f32;
-+  const auto vt_f32 = ResizeBitCast(dt_f32, v);
-+  return detail::VsxXvcvspuxds(
-+      detail::VsxF2INormalizeSrcVals(InterleaveLower(vt_f32, vt_f32)));
- #else
-   const RebindToFloat<decltype(du64)> df64;
-   return ConvertTo(du64, PromoteTo(df64, v));
-@@ -3829,12 +3885,10 @@ HWY_API VFromD<D> PromoteUpperTo(D df64, Vec128<uint32_t> v) {
- 
- template <class D, HWY_IF_V_SIZE_D(D, 16), HWY_IF_I64_D(D)>
- HWY_API VFromD<D> PromoteUpperTo(D di64, Vec128<float> v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspsxds))
--  const __vector float raw_v =
--      detail::VsxF2INormalizeSrcVals(InterleaveUpper(Full128<float>(), v, v))
--          .raw;
--  return VFromD<decltype(di64)>{__builtin_vsx_xvcvspsxds(raw_v)};
-+#if !HWY_S390X_HAVE_Z14
-+  (void)di64;
-+  return detail::VsxXvcvspsxds(
-+      detail::VsxF2INormalizeSrcVals(InterleaveUpper(Full128<float>(), v, v)));
- #else
-   const RebindToFloat<decltype(di64)> df64;
-   return ConvertTo(di64, PromoteUpperTo(df64, v));
-@@ -3843,13 +3897,10 @@ HWY_API VFromD<D> PromoteUpperTo(D di64, Vec128<float> v) {
- 
- template <class D, HWY_IF_V_SIZE_D(D, 16), HWY_IF_U64_D(D)>
- HWY_API VFromD<D> PromoteUpperTo(D du64, Vec128<float> v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspuxds))
--  const __vector float raw_v =
--      detail::VsxF2INormalizeSrcVals(InterleaveUpper(Full128<float>(), v, v))
--          .raw;
--  return VFromD<decltype(du64)>{reinterpret_cast<__vector unsigned long long>(
--      __builtin_vsx_xvcvspuxds(raw_v))};
-+#if !HWY_S390X_HAVE_Z14
-+  (void)du64;
-+  return detail::VsxXvcvspuxds(
-+      detail::VsxF2INormalizeSrcVals(InterleaveUpper(Full128<float>(), v, v)));
- #else
-   const RebindToFloat<decltype(du64)> df64;
-   return ConvertTo(du64, PromoteUpperTo(df64, v));
-@@ -3937,20 +3988,18 @@ HWY_INLINE VFromD<D> PromoteEvenTo(hwy::SignedTag /*to_type_tag*/,
-                                    hwy::SizeTag<8> /*to_lane_size_tag*/,
-                                    hwy::FloatTag /*from_type_tag*/, D d_to,
-                                    V v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspsxds))
-+#if !HWY_S390X_HAVE_Z14
-   (void)d_to;
-   const auto normalized_v = detail::VsxF2INormalizeSrcVals(v);
- #if HWY_IS_LITTLE_ENDIAN
--  // __builtin_vsx_xvcvspsxds expects the source values to be in the odd lanes
--  // on little-endian PPC, and the vec_sld operation below will shift the even
-+  // VsxXvcvspsxds expects the source values to be in the odd lanes on
-+  // little-endian PPC, and the Shuffle2103 operation below will shift the even
-   // lanes of normalized_v into the odd lanes.
--  return VFromD<D>{
--      __builtin_vsx_xvcvspsxds(vec_sld(normalized_v.raw, normalized_v.raw, 4))};
-+  return VsxXvcvspsxds(Shuffle2103(normalized_v));
- #else
--  // __builtin_vsx_xvcvspsxds expects the source values to be in the even lanes
--  // on big-endian PPC.
--  return VFromD<D>{__builtin_vsx_xvcvspsxds(normalized_v.raw)};
-+  // VsxXvcvspsxds expects the source values to be in the even lanes on
-+  // big-endian PPC.
-+  return VsxXvcvspsxds(normalized_v);
- #endif
- #else
-   const RebindToFloat<decltype(d_to)> df64;
-@@ -3965,22 +4014,18 @@ HWY_INLINE VFromD<D> PromoteEvenTo(hwy::UnsignedTag /*to_type_tag*/,
-                                    hwy::SizeTag<8> /*to_lane_size_tag*/,
-                                    hwy::FloatTag /*from_type_tag*/, D d_to,
-                                    V v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspuxds))
-+#if !HWY_S390X_HAVE_Z14
-   (void)d_to;
-   const auto normalized_v = detail::VsxF2INormalizeSrcVals(v);
- #if HWY_IS_LITTLE_ENDIAN
--  // __builtin_vsx_xvcvspuxds expects the source values to be in the odd lanes
--  // on little-endian PPC, and the vec_sld operation below will shift the even
--  // lanes of normalized_v into the odd lanes.
--  return VFromD<D>{
--      reinterpret_cast<__vector unsigned long long>(__builtin_vsx_xvcvspuxds(
--          vec_sld(normalized_v.raw, normalized_v.raw, 4)))};
-+  // VsxXvcvspuxds expects the source values to be in the odd lanes
-+  // on little-endian PPC, and the Shuffle2103 operation below will shift the
-+  // even lanes of normalized_v into the odd lanes.
-+  return VsxXvcvspuxds(Shuffle2103(normalized_v));
- #else
--  // __builtin_vsx_xvcvspuxds expects the source values to be in the even lanes
-+  // VsxXvcvspuxds expects the source values to be in the even lanes
-   // on big-endian PPC.
--  return VFromD<D>{reinterpret_cast<__vector unsigned long long>(
--      __builtin_vsx_xvcvspuxds(normalized_v.raw))};
-+  return VsxXvcvspuxds(normalized_v);
- #endif
- #else
-   const RebindToFloat<decltype(d_to)> df64;
-@@ -4022,20 +4067,18 @@ HWY_INLINE VFromD<D> PromoteOddTo(hwy::SignedTag /*to_type_tag*/,
-                                   hwy::SizeTag<8> /*to_lane_size_tag*/,
-                                   hwy::FloatTag /*from_type_tag*/, D d_to,
-                                   V v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspsxds))
-+#if !HWY_S390X_HAVE_Z14
-   (void)d_to;
-   const auto normalized_v = detail::VsxF2INormalizeSrcVals(v);
- #if HWY_IS_LITTLE_ENDIAN
--  // __builtin_vsx_xvcvspsxds expects the source values to be in the odd lanes
-+  // VsxXvcvspsxds expects the source values to be in the odd lanes
-   // on little-endian PPC
--  return VFromD<D>{__builtin_vsx_xvcvspsxds(normalized_v.raw)};
-+  return VsxXvcvspsxds(normalized_v);
- #else
--  // __builtin_vsx_xvcvspsxds expects the source values to be in the even lanes
--  // on big-endian PPC, and the vec_sld operation below will shift the odd lanes
--  // of normalized_v into the even lanes.
--  return VFromD<D>{
--      __builtin_vsx_xvcvspsxds(vec_sld(normalized_v.raw, normalized_v.raw, 4))};
-+  // VsxXvcvspsxds expects the source values to be in the even lanes
-+  // on big-endian PPC, and the Shuffle0321 operation below will shift the odd
-+  // lanes of normalized_v into the even lanes.
-+  return VsxXvcvspsxds(Shuffle0321(normalized_v));
- #endif
- #else
-   const RebindToFloat<decltype(d_to)> df64;
-@@ -4050,22 +4093,18 @@ HWY_INLINE VFromD<D> PromoteOddTo(hwy::UnsignedTag /*to_type_tag*/,
-                                   hwy::SizeTag<8> /*to_lane_size_tag*/,
-                                   hwy::FloatTag /*from_type_tag*/, D d_to,
-                                   V v) {
--#if !HWY_S390X_HAVE_Z14 && \
--    (HWY_COMPILER_GCC_ACTUAL || HWY_HAS_BUILTIN(__builtin_vsx_xvcvspuxds))
-+#if !HWY_S390X_HAVE_Z14
-   (void)d_to;
-   const auto normalized_v = detail::VsxF2INormalizeSrcVals(v);
- #if HWY_IS_LITTLE_ENDIAN
--  // __builtin_vsx_xvcvspuxds expects the source values to be in the odd lanes
-+  // VsxXvcvspuxds expects the source values to be in the odd lanes
-   // on little-endian PPC
--  return VFromD<D>{reinterpret_cast<__vector unsigned long long>(
--      __builtin_vsx_xvcvspuxds(normalized_v.raw))};
-+  return VsxXvcvspuxds(normalized_v);
- #else
--  // __builtin_vsx_xvcvspuxds expects the source values to be in the even lanes
--  // on big-endian PPC, and the vec_sld operation below will shift the odd lanes
--  // of normalized_v into the even lanes.
--  return VFromD<D>{
--      reinterpret_cast<__vector unsigned long long>(__builtin_vsx_xvcvspuxds(
--          vec_sld(normalized_v.raw, normalized_v.raw, 4)))};
-+  // VsxXvcvspuxds expects the source values to be in the even lanes
-+  // on big-endian PPC, and the Shuffle0321 operation below will shift the odd
-+  // lanes of normalized_v into the even lanes.
-+  return VsxXvcvspuxds(Shuffle0321(normalized_v));
- #endif
- #else
-   const RebindToFloat<decltype(d_to)> df64;
--- 
-2.52.0
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 8f8c23a1cd81..aee093c7bf3c 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1 +1,2 @@
 DIST qxmpp-1.15.1.tar.xz 566468 BLAKE2B dc98fcce4c14afbe4456a07b6fb631195cfa5d9db24582bcd69c0ffb812d09119ee03f26618caad11ef5872d7231afbadf317d80b3d37ce503353dd5abcdbb9d SHA512 f692bb1ab5309abfac999559ae7c2a592a91a149dd8c994cebca47714997512137bb59d0acac004e1089e8d64b818b9931e54cef8994d7645e4549da89bc74fc
+DIST qxmpp-1.16.3.tar.xz 634584 BLAKE2B 67ba1855207fd38134740ff7c99cb58fbb268ecdd1ca0c467a28f4e8092cf37b9f0ad28c5ff0311c8f60b78f26b66ab773fdd524d332a4df5d4bd8eb2f685df4 SHA512 9c0be1fa79020b26e8cd97ec70ead056b2c18017cb1e27351ca8bb8d7a03784ab0f9c6e2ecca22ac6223947e3c0b54910bea7243820f24a952dabd4c3b5d49a4
diff --git a/net-libs/qxmpp/qxmpp-1.16.3.ebuild b/net-libs/qxmpp/qxmpp-1.16.3.ebuild
new file mode 100644
index 000000000000..03b76871bad9
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-1.16.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake kde.org
+
+DESCRIPTION="Cross-platform C++ XMPP client and server library"
+HOMEPAGE="https://invent.kde.org/libraries/qxmpp"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1 CC0-1.0"
+SLOT="0/10"
+IUSE="doc gstreamer omemo test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-qt/qtbase-6.11.2:6[network,ssl,xml]
+	gstreamer? ( media-libs/gstreamer )
+	omemo? (
+		>=dev-libs/openssl-3:=
+		net-libs/libomemo-c
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_ECM=ON # clang-format only
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_OMEMO=$(usex omemo)
+		-DWITH_ENCRYPTION=$(usex omemo)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# require network connection, bug #623708
+		tst_qxmpptransfermanager
+		tst_qxmppiceconnection
+	)
+	cmake_src_test
+}
diff --git a/net-libs/xrootd/xrootd-5.8.2.ebuild b/net-libs/xrootd/xrootd-5.8.2.ebuild
index 82e826cb032b..adb6c461f77a 100644
--- a/net-libs/xrootd/xrootd-5.8.2.ebuild
+++ b/net-libs/xrootd/xrootd-5.8.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
@@ -51,7 +51,7 @@ CDEPEND="acct-group/xrootd
 		net-misc/curl:=
 		net-libs/davix
 	)
-	kerberos? ( virtual/krb5 )
+	kerberos? ( app-crypt/mit-krb5 )
 	libxml2? ( dev-libs/libxml2:2= )
 	macaroons? ( dev-libs/libmacaroons )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-libs/xrootd/xrootd-5.9.7.ebuild b/net-libs/xrootd/xrootd-5.9.7.ebuild
index d9dd31c9b821..87e989d535fa 100644
--- a/net-libs/xrootd/xrootd-5.9.7.ebuild
+++ b/net-libs/xrootd/xrootd-5.9.7.ebuild
@@ -51,7 +51,7 @@ CDEPEND="acct-group/xrootd
 		net-misc/curl:=
 		net-libs/davix
 	)
-	kerberos? ( virtual/krb5 )
+	kerberos? ( app-crypt/mit-krb5 )
 	libxml2? ( dev-libs/libxml2:2= )
 	macaroons? ( dev-libs/libmacaroons )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-libs/xrootd/xrootd-6.1.1.ebuild b/net-libs/xrootd/xrootd-6.1.1.ebuild
index 8e8b450fe6c2..4c174d431e24 100644
--- a/net-libs/xrootd/xrootd-6.1.1.ebuild
+++ b/net-libs/xrootd/xrootd-6.1.1.ebuild
@@ -49,7 +49,7 @@ CDEPEND="acct-group/xrootd
 	virtual/libcrypt:=
 	ceph? ( sys-cluster/ceph )
 	fuse? ( sys-fs/fuse:0= )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( app-crypt/mit-krb5 )
 	libxml2? ( dev-libs/libxml2:2= )
 	macaroons? ( dev-libs/libmacaroons )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-libs/xrootd/xrootd-9999.ebuild b/net-libs/xrootd/xrootd-9999.ebuild
index 8e8b450fe6c2..4c174d431e24 100644
--- a/net-libs/xrootd/xrootd-9999.ebuild
+++ b/net-libs/xrootd/xrootd-9999.ebuild
@@ -49,7 +49,7 @@ CDEPEND="acct-group/xrootd
 	virtual/libcrypt:=
 	ceph? ( sys-cluster/ceph )
 	fuse? ( sys-fs/fuse:0= )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( app-crypt/mit-krb5 )
 	libxml2? ( dev-libs/libxml2:2= )
 	macaroons? ( dev-libs/libmacaroons )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-mail/b4/metadata.xml b/net-mail/b4/metadata.xml
index 67c9231f047f..5739d2e8d675 100644
--- a/net-mail/b4/metadata.xml
+++ b/net-mail/b4/metadata.xml
@@ -5,6 +5,10 @@
     <email>zx2c4@gentoo.org</email>
     <name>Jason A. Donenfeld</name>
   </maintainer>
+  <maintainer type="person">
+    <email>laumann@gentoo.org</email>
+    <name>Thomas Bracht Laumann Jespersen</name>
+  </maintainer>
   <stabilize-allarches />
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index 42eb9089d5f9..3fdfd0eb854c 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1 +1 @@
-DIST IPMIView_2.24.0_build.251224_bundleJRE_Linux_x64.tar.gz 148727015 BLAKE2B 5f8f8d7bc624d0e81b472ca0e25a45923d7fa3bef3384dd7b82156bc2454d987efca112414b08aca24f3847c79455a2b9a9bd916a0c2ac5b7bb144ce49cb7ef5 SHA512 6b4eabde902bedac7a370e3dc71fdc896466f71cb8622b6da04e61f6ef1fd9cd4dd4053401659f7710be9d0640c78119e3fcbe808cbc21a3d4ee54cea5ee99ad
+DIST IPMIView_2.25.0_build.260812_bundleJRE_Linux_x64.tar.gz 150061666 BLAKE2B fb28adba58611a22e5bfc591f5c70e9c741a274d3f1fb3b975cae2ba591d61e050b7702cbe491c3dbce9d14f8b97105c7fb77c4ed6bee80cc146c2a02cf3595c SHA512 6e35f13173fc11ac0e415aaf754c99ccb6559a6fe2ac1702b8ccec1b6c2b622b2ed161259b48af364e14bea818c3a838544a841d6593fd879a548c365459a778
diff --git a/net-misc/ipmiview/ipmiview-2.24.0.251224.ebuild b/net-misc/ipmiview/ipmiview-2.25.0.260812.ebuild
index 9bd690c24474..3d9b872796be 100644
--- a/net-misc/ipmiview/ipmiview-2.24.0.251224.ebuild
+++ b/net-misc/ipmiview/ipmiview-2.25.0.260812.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit desktop java-pkg-2 prefix
 
-DOWNLOAD_ID="1052"
+DOWNLOAD_ID="1176"
 MY_DATE="$(ver_cut 4)"
 MY_PN="IPMIView"
 MY_PV="$(ver_cut 1-3)"
diff --git a/net-misc/networkmanager/networkmanager-1.56.1.ebuild b/net-misc/networkmanager/networkmanager-1.56.1.ebuild
index c183bb3ada05..8585cb81388f 100644
--- a/net-misc/networkmanager/networkmanager-1.56.1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.56.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 LICENSE="GPL-2+ 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"
 
 IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls gtk-doc +introspection iptables iwd libedit +modemmanager nbft +nss nftables ofono ovs policykit +ppp psl resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/ntp/files/man-pages/genmans.sh b/net-misc/ntp/files/man-pages/genmans.sh
index bae21e265f90..bae21e265f90 100644..100755
--- a/net-misc/ntp/files/man-pages/genmans.sh
+++ b/net-misc/ntp/files/man-pages/genmans.sh
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index b045c3df6ed3..f4542b410cd3 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1 +1,2 @@
 DIST smb4k-4.0.6.tar.xz 4871876 BLAKE2B a772ff997e7e885ca333b2724e8e7d4e2954db2930e384228669078b34767a2d0f3506bc00f91e26ee8e32707aacccee9e063bcdfc1d34b0dcbaf5d89c38c5ea SHA512 502b71e9617c90c3f6e5d0a7967995f77581cf7663c4debb9810f98ad5cf7ef38f0bc6552c63f52b135aa6f3cf8d083889a9e3107b1943e1b318cd6923789081
+DIST smb4k-4.0.7.tar.xz 4879756 BLAKE2B b34b13f0310b307758d7dcfa102927ecaec1d53a1c1185338de18c1114a53e3d8e6606bc4eaa60e40329cdb171af0b8cea3ce8fd1c8e557a2331a885f5052b7c SHA512 f87f0878f4fe6ed0acf260a0fccc2dde6807b09b90a89386c469c3b2f84476eace2664dbbfeb36cf8e435045ec874a4497e0d093ae02b559e526746c2538b035
diff --git a/net-misc/smb4k/smb4k-4.0.7.ebuild b/net-misc/smb4k/smb4k-4.0.7.ebuild
new file mode 100644
index 000000000000..18bae25db49c
--- /dev/null
+++ b/net-misc/smb4k/smb4k-4.0.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.9.0
+QTMIN=6.8.1
+inherit ecm kde.org xdg
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://apps.kde.org/smb4k/
+https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+discovery plasma"
+
+DEPEND="
+	>=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	net-fs/samba[cups]
+	discovery? (
+		>=net-libs/kdsoap-2.2.0:=[qt6(+)]
+		>=net-libs/kdsoap-ws-discovery-client-0.4.0
+	)
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+	plasma? (
+		>=kde-frameworks/kirigami-${KFMIN}:6
+		kde-plasma/libplasma:6
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
+		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 1af10d4abfea..f7dc1e14d515 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -12,6 +12,7 @@
     <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg>
     </flag>
     <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
+    <flag name="psl">Enable Public Suffix List (PSL) support</flag>
     <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
   </use>
   <upstream>
diff --git a/net-misc/wget/wget-1.25.0-r1.ebuild b/net-misc/wget/wget-1.25.0-r3.ebuild
index 7731e5331469..260febbf9eb3 100644
--- a/net-misc/wget/wget-1.25.0-r1.ebuild
+++ b/net-misc/wget/wget-1.25.0-r3.ebuild
@@ -14,8 +14,8 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.lz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="cookie-check debug gnutls idn libproxy metalink nls ntlm pcre +ssl static test uuid zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="debug gnutls idn libproxy metalink nls ntlm pcre +psl +ssl static test uuid zlib"
 REQUIRED_USE="
 	ntlm? ( !gnutls ssl )
 	gnutls? ( ssl )
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 # * Metalink can use gpgme automagically (so let's always depend on it)
 # for signed metalink resources.
 LIB_DEPEND="
-	cookie-check? ( net-libs/libpsl[static-libs(-)] )
 	idn? ( >=net-dns/libidn2-0.14:=[static-libs(-)] )
 	libproxy? ( net-libs/libproxy )
 	metalink? (
@@ -35,6 +34,7 @@ LIB_DEPEND="
 		media-libs/libmetalink[static-libs(-)]
 	)
 	pcre? ( dev-libs/libpcre2[static-libs(-)] )
+	psl? ( net-libs/libpsl[static-libs(-)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:=[static-libs(-)] )
 		!gnutls? ( dev-libs/openssl:=[static-libs(-)] )
@@ -68,6 +68,10 @@ DOCS=( AUTHORS MAILING-LIST NEWS README )
 # gnulib FPs
 QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN alignof static_assert fpurge )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.25.0-openssl-4.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
@@ -112,7 +116,7 @@ src_configure() {
 		$(use_enable pcre pcre2)
 		$(use_enable ssl digest)
 		$(use_enable ssl opie)
-		$(use_with cookie-check libpsl)
+		$(use_with psl libpsl)
 		$(use_enable idn iri)
 		$(use_enable libproxy)
 		$(use_with metalink)
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index a978b8711685..92725dfddf0b 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,2 +1,2 @@
-DIST chemex-2026.6.0.tar.gz 155098 BLAKE2B 7930a4b59eea06d02059a09805c9812c3c04d1faecfb0718f866c0b79c53f7542988fa269908c7bf8ad81805265ac42012581e77442c49e832a9d7525abc58e5 SHA512 61d2a3ba9afd2a3e789a39057e49383147949bd538940d00bbe20367637ce8ddcaa15ab67b9c934a6e5ac59685106ed3238e5b7437a07167e1a95b2689d12307
 DIST chemex-2026.6.1.tar.gz 159570 BLAKE2B 7d2b34a4594714193d06570fd7c84fe7a6ae09bf0ace537cbdc521274445bd2433a4b6f5597c3264a47ade085d10ed2e4765d88b5708776b80b0c4e7580ebfaf SHA512 7ff714dd4b3d575e5e68cf153556dcb58a942116b4b2e160311352e1dc5987886ed6d25176738f4608ff15da27b7a1e778efe95cd6a353ab8e9e33a3f689cb68
+DIST chemex-2026.9.0.tar.gz 395951 BLAKE2B 3236ad1217d5ae369425f86af4e6c2f3d192baae939f8b2bef0de442936311c9d339a3990d061a08e3043d6a22a3e7d88a15d56d0c9f834f792a1954af7a3669 SHA512 6764e4f6043fa593bbd7fa19bc50dd85fd6353885aac302eeafc07df891f35ed100158736b3d569f60b02d5b87ea827c9a7908fba6078115f4594e8ed6bf373c
diff --git a/sci-chemistry/chemex/chemex-2026.6.0.ebuild b/sci-chemistry/chemex/chemex-2026.9.0.ebuild
index ad9ff99811c4..664768876618 100644
--- a/sci-chemistry/chemex/chemex-2026.6.0.ebuild
+++ b/sci-chemistry/chemex/chemex-2026.9.0.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 		>=dev-python/annotated-types-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/cachetools-5.5.1[${PYTHON_USEDEP}]
 		>=dev-python/emcee-3.1.6[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-1.3.2[${PYTHON_USEDEP}]
 		>=dev-python/matplotlib-3.10.0[${PYTHON_USEDEP}]
 		>=dev-python/numpy-2.2.3[${PYTHON_USEDEP}]
 		>=dev-python/pydantic-2.10.6[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/s2geometry/s2geometry-0.13.1-r3.ebuild b/sci-geosciences/s2geometry/s2geometry-0.13.1-r3.ebuild
index f63e3cbcbc09..770f7ffa671e 100644
--- a/sci-geosciences/s2geometry/s2geometry-0.13.1-r3.ebuild
+++ b/sci-geosciences/s2geometry/s2geometry-0.13.1-r3.ebuild
@@ -30,8 +30,8 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
-		-DGOOGLETEST_ROOT=/usr/include
 	)
+	use test && mycmakeargs+=( -DGOOGLETEST_ROOT=/usr/include )
 	cmake_src_configure
 }
 
diff --git a/sci-mathematics/unuran/Manifest b/sci-mathematics/unuran/Manifest
index 0451dcefc7dd..ef498c121db9 100644
--- a/sci-mathematics/unuran/Manifest
+++ b/sci-mathematics/unuran/Manifest
@@ -1,2 +1,3 @@
+DIST unuran-1.12.0.tar.gz 3754395 BLAKE2B 1b2e4ed529c2cb6e650e9566ea6a063cbb175f1c434d2926ef3939f814af7ac396772d4416583d1ba259ef6ced3b1b6bcf4144afe6c6422e201a1cc322c9b7ba SHA512 9cf7f71ae81682191657c83597d2ceffcbcb6c7c34987fefd29a08212e3f4ed2b24688e68d1d5abc263275a5e9e3252f453cfb84cbbafd987d8902b819bbf1c1
 DIST unuran-1.8.1.tar.gz 4409911 BLAKE2B 2b036032deaeae70aa6ef58124fc88e9c167ae7952d04cba4b50181fff4249eff88c20bbb667c5702899bc863745b6991ae842da86f6bc592b6635dc310ec544 SHA512 4d98861914afe39065ec31ee837c0e21e0fb4f4667f559dee38a7a5c4e06f0d09bd550b20d06321d1f5fcd4799d482a9eebc66ac35f8cd7fff834f536d24854c
 DIST unuran-1.9.0.tar.gz 3803126 BLAKE2B 20a88e9004d284983770364f35941f8ea66e1c68ef8c0ea210e1b12d9027947fbf723032f22f88b87c8f649ab52c904b460673cee8d78a52ff5196a6f4212d9c SHA512 8fe389f2fc569265e7bac2a5de3d12e4a6238076bff2a7e19842a57da314dfdca19ff5c398e24732883a19de794a65bab7d0663b4551c664562a3c93f2d87170
diff --git a/sci-mathematics/unuran/unuran-1.12.0.ebuild b/sci-mathematics/unuran/unuran-1.12.0.ebuild
new file mode 100644
index 000000000000..456868dc3ad1
--- /dev/null
+++ b/sci-mathematics/unuran/unuran-1.12.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Universal Non-Uniform Random number generator"
+HOMEPAGE="https://statmath.wu.ac.at/unuran/"
+SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gsl prng +rngstreams"
+
+DEPEND="
+	gsl? ( sci-libs/gsl:= )
+	prng? ( sci-mathematics/prng )
+	rngstreams? ( sci-mathematics/rngstreams )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local udefault=builtin
+	use rngstreams && udefault=rngstream
+
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-urng-default="${udefault}" \
+		$(use_with gsl urng-gsl) \
+		$(use_with prng urng-prng) \
+		$(use_with rngstreams urng-rngstream)
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/${PN}.pdf
+	einstalldocs
+
+	if use examples; then
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index cf0eb7f1cd03..479ee5d9bf44 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,2 @@
 DIST root_v6.38.04.source.tar.gz 386690371 BLAKE2B 87ed75a105de528789740fee10e502178a08ac4cfdf019dcb6512cf884fd8397724425ce11e8c06ed3113fbd321f55364453fb1a26747bc0e02ccf6e57e6db44 SHA512 71c59c8837e1ffabc89cc121d22b3dd85c7989cebe26a2511b0646e9e54fe49225a94a6a3f146f52618532a8972be0d004480b5a1f41f665ea695856f9ef9246
-DIST root_v6.40.02.source.tar.gz 343472571 BLAKE2B 4d88f74e2c729823edcbcaab924bcd69b8dbb2d786133def2ee3476558a34f28c7a3c7bc04677e9015a8157f96f2381892c146b5ae2f212439a4a7fa0b95ce2a SHA512 ba8c9c6eb19764257528680884a0628e4ac80e8d7d3442d021a6cc69b80432dab43e26c31572ac5c422448bda46fecb0095693eb6037f1ec502505caada30eaa
+DIST root_v6.40.04.source.tar.gz 343548919 BLAKE2B 995cee12c3da019ce3bdb0e0de9f5091df1aafa795c044ac343128cb8281494885f334cdc08797b5500cb3a1a5b01286b554c9fb9816c3acf28d9b7dcbc36ced SHA512 cfdbec356a3a952d10a5835e0a707e03fb87b5ae32953db7ec4d90d3ae73b6a576bd62044334b6db5dac4086b27891f144ae722e2398c960657e58785de6dcac
diff --git a/sci-physics/root/root-6.40.02.ebuild b/sci-physics/root/root-6.40.04.ebuild
index eb6b5714ed6f..eb6b5714ed6f 100644
--- a/sci-physics/root/root-6.40.02.ebuild
+++ b/sci-physics/root/root-6.40.04.ebuild
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 0993b4bdb6c6..0993b4bdb6c6 100644..100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
diff --git a/sys-apps/accountsservice/accountsservice-26.27.3.ebuild b/sys-apps/accountsservice/accountsservice-26.27.3.ebuild
index d46116d97d99..b9c4592843ab 100644
--- a/sys-apps/accountsservice/accountsservice-26.27.3.ebuild
+++ b/sys-apps/accountsservice/accountsservice-26.27.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/accountsservice/accountsservice/-/archiv
 
 LICENSE="GPL-3+"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="doc elogind gtk-doc +introspection selinux systemd test vala xcrypt"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/bubblewrap/bubblewrap-0.12.0.ebuild b/sys-apps/bubblewrap/bubblewrap-0.12.0.ebuild
index bf75d64843a5..fdb733bb945b 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.12.0.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.8.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.8.ebuild
index e6c10d4fb247..20cdafb3b89b 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.8.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e7c56a5b5eee..c042b547f09f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -12,6 +12,7 @@ DIST gcc-13-20260805.tar.xz 84623768 BLAKE2B c1a782650b46f84b4f24a53b941eb2a4c9e
 DIST gcc-13-20260812.tar.xz 84623116 BLAKE2B 770fa8f44382f372f832d7abb786bbf5e5ff5597dfe611f33828cbab8c58fdef17177dfe5276f0e4bfe567254500b166ea9b13754e2fe1a2fcd9ef35ed200570 SHA512 a5be79cbbf53b6516f3e4174f18bfa14415a77fa5fb826c1ba58e1f6995d8498fe18faec7afff484dbf28f3487b751bcf9ef245d1304e4e141df17cc90fdec05
 DIST gcc-13-20260819.tar.xz 84617312 BLAKE2B 43ce5c2bc12cf5e72e6bf2d1ed167b407c69f2bd1c357f4a19e7c76d3cdd1aa5f29f11819486533fef0a754d52c7d77d530b15cac188f3862cec32536572a844 SHA512 00553bc019bf30d94d79d79fe2611ad8b7049ab3d2fde03cc41020e2b22a0e243c35b19e070ada6d6b1d687019debe7d1547e339cf5eec4d2589d640743a7428
 DIST gcc-13-20260826.tar.xz 84625896 BLAKE2B 87b352448a27fb69bf1ec344059398d81f853088bfad0cbf0659c378b4a25a623870eb4f64084f65b9cedc7b3e378b3c87732a686a04428c4fe417db5db69642 SHA512 58c68d84cac16cfc068bf4f9e13cbacef1dfc70bd8b50a3d9f7397894f06cebe8e23681af2b8a8f1b26c81652163f0d3b4a39647cd9ae122b49dc83523ce593b
+DIST gcc-13-20260902.tar.xz 84623964 BLAKE2B 84bc20d96f9a7cfa8bd4769cca7ceadee7c5bb82349bc2f626810c5c8be63fb39d8b62a5dfa8db8fad97b8a4a0810f8616464ef305536a1dd908a43e38ebddc0 SHA512 3713f502e755dcea0340d24ae9c7da4055aefd85a8f6542d027b33e572c143b55b163f3613b71f4a4a37dca3bff3dda451ae487f9fc13eda6cdc768ac2b22dfd
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
 DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
@@ -23,6 +24,7 @@ DIST gcc-14-20260806.tar.xz 88523444 BLAKE2B d8edd13b6793f89f6f8e36c038cf4ba15b9
 DIST gcc-14-20260813.tar.xz 88525820 BLAKE2B bf960bc625ceecfd0374427f1f2ebad800495380df7aed7c76eed55049be9ff84e1398a17bac3d235e707193eda3bc60f6f4f2718f154757c20ad77edd8892ae SHA512 7b1009064362a493df9839d4b25bca73fa1a77aca3fabc0d696e77c325d4e709d740a89aad4be2da08db41dbd28cc205a0c17a37a4ef79e8cd522a12807789dd
 DIST gcc-14-20260820.tar.xz 88526340 BLAKE2B d02ebd7009f02c64769f828c947d5e41e94593456dacdbe172194dd2652b110e011a3d276bc5f3b072f130306b7ed7b809b9b24f87806373c4bb6bf61a150fff SHA512 1351dcdda61885024ae79d8f77f8e3a53ba87981daa543236165693c1edc014c21f68f5a74252e01deab085a4343e70ff16ff88fcccec5a46e14463424c61897
 DIST gcc-14-20260827.tar.xz 88530032 BLAKE2B b2abe50f37f5f2ab5ec893e4524d74214d98da9ce45cdecdb370ad345a7f216c5025ab9aad4f3f95dac6c117cf6909aef160b2f1bd3315754a40f821df356227 SHA512 cf7600ed78c1bffe970ed826a7d29da36235d05137bafa130d329c099b6b0faf23c38779ef837a3cec3cb8770674b7b5ddfae93af3d27e1d9077b60bd139beda
+DIST gcc-14-20260903.tar.xz 88538140 BLAKE2B b5fd80fd8addf04d296f12c26f4ce1feb7c223f0389534d02af0f303cded7f0380b12d64c7fb31f49b6a57fe21fa7721a604ad6448931624dddcdc69f9a87bb0 SHA512 5704a3edd2594a38f090a85675f51106a80472d375cd67f57fa3f644bfc5111ed43c45a64a3c158de68741b0c7ff90f4dc9017d27fe71378648f94232a3d4eeb
 DIST gcc-14.3.0-musl-patches-2.tar.xz 6888 BLAKE2B e2f9ce6d445b7ced8f78c18585887422ffdd32356368a456a7cfde5a1854515b32546c1d25a2ab8637ee62d04a2c0bda1afc8d53c44e5c80c12499918c3c18fc SHA512 0b59d228213024cd93d9ffbd4ae5947021db2dc71bd320cc0e4ccf523d39f72e61be25c1a49a343729fe7b9abf7181503de3e650b255d80ab6d969d0de317d19
 DIST gcc-14.3.0-patches-6.tar.xz 28148 BLAKE2B ba80a00289da26d3b5a813a9878aae6b34640e5cf8f37431ef846894087096dc84869e120ed17f23062bd2702a8059d73ead3ba28115e9c3bad55f46e7f474ee SHA512 7ee900f327bd92484ffba03ff80827b42ffba75d7527e26e09ea07e6d61622d812e1a00f77f3d669d7bde0366bab43085552d6140b28bc319edab9eb0e9a73f5
 DIST gcc-14.4.0.tar.xz 91586872 BLAKE2B 10a512f9f95fcc70a13f4eb2142927277d2e6c0a16bad76f01078dc0d7e5cb6831204f8beec22c83c1ff2d0ed1d9df8c8d0a4118ba657d1aefef2a6f15636a28 SHA512 725ed8bdd43ef1726ffe8b5e8615a13e247fac9575b7626ae013a2975d000ea213212dc414b2f2631ac4785c1c8beca85555222faf9904d3b2fa6a3807a83a15
@@ -31,6 +33,7 @@ DIST gcc-15-20260731.tar.xz 92483472 BLAKE2B f4ed7d848417e02c22386209998048f1b89
 DIST gcc-15-20260814.tar.xz 92494796 BLAKE2B 7e8e4ccd1f4d71387d72b7100cda115e8a067ff3e88f883d8b8df18546cb01b36b7d118fb89f3163769e4774e4bfe31754b410aef4ff3545fa64817b82c87e24 SHA512 2f8d5f189f9a4725197ec8906ec0f3c515023e6224c29369d098f1102d6ac0899d8fbaff346891f1299eef90ef13206eeff5fb06f40af284db18531f02cee9a6
 DIST gcc-15-20260821.tar.xz 92491084 BLAKE2B da19130fa2cab934c120406cba85e135cb1909f1be2c05a5b846b3997f1bf368858521cd8a4bfc0380013bca3196bbaac53c066aa69e26513a45b552e8639096 SHA512 e229f0245dac155c7fb93611d0b077c104c0c82993ea30cb36940ad973130a230f2206075e1da2e583a9df6cfc85315adbfffa341c35e357b1e0649947371892
 DIST gcc-15-20260828.tar.xz 92507836 BLAKE2B 8542fafedf1d684064f9ca3ad77b5086121c4687071060749bbe71011f82be4bd1f5e60f97c26c37fd902ad6e1b203a25a0d57bc9f47fbd424efb82fcefecf65 SHA512 61c612f2666ec9461a1572eddd0b9c4e6575954b4abd338d1c275873c7d34e40c83a5936b5cd99ebc5d8d9016335aa9d5344aef1a97af8935cec418353b9095b
+DIST gcc-15-20260904.tar.xz 92498536 BLAKE2B 4cf423cc30aebbd682504b252a45499e30ee3687adfcb0f4ae83fb3b638ebbde65591c14a3a873f163b76dd8811cb600ea936e751befabc4ff0e4d9bd4fa177c SHA512 3a0af0e7700b572d5dd034528c32ee06dc82ad2e80f93a2eb8324a77c7f25c575b848161b7cd8d04a9a3ebfcea356083d2dd5b1869bb7b44da1a00f6c172690b
 DIST gcc-15.2.0-musl-patches-1.tar.xz 7168 BLAKE2B 6b7cfb123c3a691693240db815e6852a1e6c3820baa499368c463e0a0c1490c701053cfea10bf1d33f89dd2ba7bbddf63c4e6e0976590e3aaf1fee78b9282079 SHA512 ab80ffd69b9ead1fe06a9433faaa97ae53947d214999e77ea363fa6435de080d031a1aa6869e1dc088e800317952f2dc249a9e872113db56fb76f0a432240871
 DIST gcc-15.2.0-patches-8.tar.xz 17584 BLAKE2B e35d85b993fc2ad86924158cac893a815f70332335ed02d970bcdf89c1ceafc2972576bcd85b4912e6ada91bdd80e8f10cbc6be798c804438368bae60abe2731 SHA512 6440a792320037b746ba405469773b96c1d4272c5248ae3808e6d8a2d576564c0f52889a6f88c3271233c8c2fe7ecb974d31ced2141f16f2c5ca68b9e47ace8c
 DIST gcc-15.3.0.tar.xz 101253696 BLAKE2B 9e37d6560addf936b8dae6f34a2621004e888b1436c9b95d6a09c2a792f909c7ec4aa5e8d0e63baa1be742fd8dc8162b366b5c48766fc83e44b3842891af44df SHA512 0de9e296153b52c021b1c7e63c9c62151d7a0ac03f23ce6e9f772c1b0eb783f6acdd81cc4567bfe4128a6f64968c2cfc8eff40b36229cba7425349f7d637c654
@@ -38,6 +41,7 @@ DIST gcc-16-20260808.tar.xz 99127060 BLAKE2B e2451ae29049179fe8cf60b39cd66c13817
 DIST gcc-16-20260815.tar.xz 99086124 BLAKE2B a6654163cdaacf17987844eb5887aafe3ed11bac88327cc785898b00c084243d0aff995879f0d10d3eedf5efdb33c495ce7ceb162d9348bab2acc72ac96fa78a SHA512 538607b769cb2166c61179e76178a5f9af1b6690bd446d99d77bfab3123e22f892e9d4f92890f2e620f1f0a226e464c3dd587f78e13f67c478a62ee41f15c890
 DIST gcc-16-20260822.tar.xz 99099752 BLAKE2B c9769a7748868de74a8e50e5a4d0ee359eac7b3ee4dfcf7a6e470353b5aad0447ec4edc9da9ba14791b6a9cfc2a4085af52cee6fa97f50c6e4a8f5b0a5b98287 SHA512 4b6d2f69d97155fd4f78fcf45051d2ec15001bdcad15af686890a27371e8f3cbe3072a9a45313caa4c10a12b2aa06d4db5cf3bcd1ba89dda9521d4348ab44522
 DIST gcc-16-20260829.tar.xz 99107172 BLAKE2B d642dfa2d388fdc02ed8e71aa42a8b72ccbf3d01d9786f544982bcb75b1020411e03f1775fd88db5acae20cf43fcfb7a7660ad28e30da4c27bdbcaa1e4be730b SHA512 af0f4005c69a95ab6ff6af513541683115edd2ee498a8a9f13a008634d5e6951a11b9f4abc6bb65acff14e479758d4954b6dbc8b18c64e46822252b4ddfc8c85
+DIST gcc-16-20260905.tar.xz 99118908 BLAKE2B 1a65b1fbc842e153389840274a5a3f844e3a5a9693957b1227e5361f74ce831df244570f1e5edf844fc512b62b978460ed7861b8c8856056b8c1f9763bae130c SHA512 f15b09406e3788ffc3b1c380748ed9c087bba32448c4cece7a56930417bbe1dc34a72464ecb570dff781c8bbaa4eebf880274e5b4a9139aa5137c0623e03be66
 DIST gcc-16.1.0-musl-patches-1.tar.xz 3036 BLAKE2B 348d0233c92e6b269011342a170989bb6375ff267b6ecfc00aafab2f793b925f1cccd654f438a4f88168a7999cab965aadfb6dfc9957a9b1a5bca62c326e0b84 SHA512 dc9c2d4a6e9088ad245039a962333ecba8476288844c686e7df9c867c8018451fccbd645a5690d554ee39809e6467285b3c619553edfed379c5f84c003bcb7e5
 DIST gcc-16.1.0-patches-3.tar.xz 25156 BLAKE2B 874afd3239c0794082568738c837786fff71ad48c24677c11110630fc6e0c0baf17720aec53dc7cd6580102a3a3b7daa2b78c82488f758af8afcb6cd5621ee25 SHA512 dbead66ac0899e2833e88cd7a95b12d2f2dd1379ec3cc085701efd7f8e446feff4d6c00f1481026bb9c699487a143f6a429a8f95ad7228f8bbef5faf2d1b5a5e
 DIST gcc-16.2.0-musl-patches-1.tar.xz 3036 BLAKE2B 8545e2499a8af4af9483e0372f253db13ee296c77e8514d409c9a43a2fd8919bdca4791c2747579fc57c62b08c0e4054314b7511ddc921074a60ab9f192e7983 SHA512 d029857ffeae60fa5577dddc0136f04ceadf77a282a3ebda9dda1da67a17301978028aa6d768f46f4b0fa9778f5e8f0052a731d087fb4b841a4f30244ee41fec
diff --git a/sys-devel/gcc/gcc-13.4.1_p20260902.ebuild b/sys-devel/gcc/gcc-13.4.1_p20260902.ebuild
new file mode 100644
index 000000000000..1b48162dfa0d
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.4.1_p20260902.ebuild
@@ -0,0 +1,68 @@
+# 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="13.3.0"
+MUSL_GCC_VER="13.3.0"
+PATCH_VER="9"
+MUSL_VER="3"
+PYTHON_COMPAT=( python3_{13..14} )
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -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=releases/gcc-$(ver_cut 1)
+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
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-14.4.1_p20260903.ebuild b/sys-devel/gcc/gcc-14.4.1_p20260903.ebuild
new file mode 100644
index 000000000000..b4578274f0d3
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.4.1_p20260903.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="14.3.0"
+PATCH_VER="6"
+MUSL_VER="2"
+MUSL_GCC_VER="14.3.0"
+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=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-15.3.1_p20260904.ebuild b/sys-devel/gcc/gcc-15.3.1_p20260904.ebuild
new file mode 100644
index 000000000000..13c1da8a4cb1
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.3.1_p20260904.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="15.2.0"
+PATCH_VER="8"
+MUSL_VER="1"
+MUSL_GCC_VER="15.2.0"
+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-devel/gcc/gcc-16.2.1_p20260905.ebuild b/sys-devel/gcc/gcc-16.2.1_p20260905.ebuild
new file mode 100644
index 000000000000..4b9f5cdea6d0
--- /dev/null
+++ b/sys-devel/gcc/gcc-16.2.1_p20260905.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="16.2.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="16.2.0"
+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-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index c7bdfe83b637..75ec71471f7b 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/sys-kernel/git-sources/git-sources-7.3_rc2.ebuild b/sys-kernel/git-sources/git-sources-7.3_rc2.ebuild
new file mode 100644
index 000000000000..9ddf571e8d27
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-7.3_rc2.ebuild
@@ -0,0 +1,39 @@
+# 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-libs/libselinux/libselinux-3.10-r2.ebuild b/sys-libs/libselinux/libselinux-3.10-r3.ebuild
index cc888a9f16d3..fc655292392f 100644
--- a/sys-libs/libselinux/libselinux-3.10-r2.ebuild
+++ b/sys-libs/libselinux/libselinux-3.10-r3.ebuild
@@ -33,22 +33,26 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
 	)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-3.10.ebuild b/sys-libs/libselinux/libselinux-3.10.ebuild
index 11c1dc3cbaeb..840dbc4b7af2 100644
--- a/sys-libs/libselinux/libselinux-3.10.ebuild
+++ b/sys-libs/libselinux/libselinux-3.10.ebuild
@@ -32,21 +32,25 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		dev-python/pip[${PYTHON_USEDEP}]
-)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	)
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-3.11.ebuild b/sys-libs/libselinux/libselinux-3.11-r1.ebuild
index 94f449051daf..5d82462d9c55 100644
--- a/sys-libs/libselinux/libselinux-3.11.ebuild
+++ b/sys-libs/libselinux/libselinux-3.11-r1.ebuild
@@ -33,22 +33,26 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
 	)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-3.8.1-r2.ebuild b/sys-libs/libselinux/libselinux-3.8.1-r2.ebuild
index 6b95b2e7d06f..2e270f8fd818 100644
--- a/sys-libs/libselinux/libselinux-3.8.1-r2.ebuild
+++ b/sys-libs/libselinux/libselinux-3.8.1-r2.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
@@ -32,21 +32,25 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		dev-python/pip[${PYTHON_USEDEP}]
-)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	)
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-3.8.1-r3.ebuild b/sys-libs/libselinux/libselinux-3.8.1-r3.ebuild
index 5be83c6963d3..2a1ec34948f0 100644
--- a/sys-libs/libselinux/libselinux-3.8.1-r3.ebuild
+++ b/sys-libs/libselinux/libselinux-3.8.1-r3.ebuild
@@ -33,23 +33,27 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		dev-python/pip[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
 	)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-3.9.ebuild b/sys-libs/libselinux/libselinux-3.9.ebuild
index 2cfda2f11e05..bb86ebfac49c 100644
--- a/sys-libs/libselinux/libselinux-3.9.ebuild
+++ b/sys-libs/libselinux/libselinux-3.9.ebuild
@@ -32,21 +32,25 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		dev-python/pip[${PYTHON_USEDEP}]
-)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	)
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 94f449051daf..5d82462d9c55 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -33,22 +33,26 @@ SLOT="0"
 IUSE="python ruby static-libs ruby_targets_ruby32 ruby_targets_ruby33"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP},static-libs(+)]
+	virtual/libpcre2-internals:=[static-libs?,${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 		ruby_targets_ruby33? ( dev-lang/ruby:3.3 )
 	)
-	elibc_musl? ( sys-libs/fts-standalone )"
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	python? (
 		>=dev-lang/swig-2.0.9
 		${PYTHON_DEPS}
 		${DISTUTILS_DEPS}
 	)
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	ruby? ( >=dev-lang/swig-2.0.9 )
+"
 
 src_prepare() {
 	eapply_user
diff --git a/virtual/libpcre2-internals/libpcre2-internals-10.47.ebuild b/virtual/libpcre2-internals/libpcre2-internals-10.47.ebuild
new file mode 100644
index 000000000000..7560c88d7c37
--- /dev/null
+++ b/virtual/libpcre2-internals/libpcre2-internals-10.47.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for dev-libs/libpcre2 internals"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+RDEPEND="~dev-libs/libpcre2-${PV}[${MULTILIB_USEDEP},static-libs?]"
diff --git a/virtual/libpcre2-internals/libpcre2-internals-10.48.ebuild b/virtual/libpcre2-internals/libpcre2-internals-10.48.ebuild
new file mode 100644
index 000000000000..284f5561f1fc
--- /dev/null
+++ b/virtual/libpcre2-internals/libpcre2-internals-10.48.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for dev-libs/libpcre2 internals"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+RDEPEND="~dev-libs/libpcre2-${PV}[${MULTILIB_USEDEP},static-libs?]"
diff --git a/virtual/libpcre2-internals/metadata.xml b/virtual/libpcre2-internals/metadata.xml
new file mode 100644
index 000000000000..95115c2c0c51
--- /dev/null
+++ b/virtual/libpcre2-internals/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>selinux@gentoo.org</email>
+    <name>SELinux Team</name>
+  </maintainer>
+  <longdescription>
+	Virtual for use by packages like the SELinux userland suite which
+	rely on internals of libpcre2's representation being saved to disk.
+	</longdescription>
+  <origin>baldeagleos-repo</origin>
+</pkgmetadata>
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 565d66ce3a8f..de0ce858cbf6 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1 @@
-DIST dokuwiki-2025-05-14b.tgz 4243705 BLAKE2B 952a4ddb9b4334bc607a2188c277dd40215cdf19989b11b006121fedc11257b3fc6750620ff4c9c123982ac9051f7609a4a353b8b039a839f0be537f456b1a1f SHA512 6d8c75703ec29fd8bd7ec8cfc7d719095bb00c1144cb954147b934cf3cefc1d2f23a6244accd7277c276a63300a589d5807469ad9891186bc788598e560ee94e
-DIST dokuwiki-2026-07-14b.tgz 4168595 BLAKE2B 8aa94b20234e890bd095796cc948958fe05aecbc3c0908e82e6c332da12c6576a387bc48b1fa8c181a49e3b8c2c6d8ac04725be95b1ce281f5a89950dbbbe07e SHA512 1a25106c207e9127a7a4134cf760c4092dc8c7e45ba36dbd252df5d1b6e6491118a2078776aef19b72c0d6b6f03d3e3b808ef77e5f1b856d772c485e29e581df
+DIST dokuwiki-2026-07-14c.tgz 4168561 BLAKE2B 2af7f22f1483af255825d1c2f9ba5811c39d86ce31e04c989492dc5aa793a301273b5267df24572fad5689da9ac01b164abbe2c416fdd6a4a18eba75aba4a6cb SHA512 1c7335c4292aed27f0ba18905038e22fb25d3f7679a3d5fe766cb02eadc3bf25597ef55927b41ba78c9056d9ca1aa8921b588e5b35df8e1a7ad832a3aec51501
diff --git a/www-apps/dokuwiki/dokuwiki-20250514b.ebuild b/www-apps/dokuwiki/dokuwiki-20250514b.ebuild
deleted file mode 100644
index d57864b781ae..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20250514b.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-if [[ ${PV} == *rc* ]]; then
-	MY_PV="${MY_BASE_PV}${PV:8:4}"
-	MY_P="${PN}-rc-${MY_BASE_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-rc.tgz -> ${PN}-${PV}.tgz"
-else
-	MY_PV="${MY_BASE_PV}${PV:8:4}"
-	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
-HOMEPAGE="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE="gd"
-
-RDEPEND="
-	>=dev-lang/php-8.0[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-src_prepare() {
-	# create initial changes file
-	touch data/changes.log
-
-	default
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README
-	rm -f README COPYING
-
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Copy custom .htaccess that works with both apache 2.2 and 2.4
-	for dir in "conf" "data" "inc" "inc/lang"; do
-		insinto "${MY_HTDOCSDIR}/${dir}"
-		newins "${FILESDIR}/htaccess" ".htaccess"
-	done
-
-	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
-	insinto "${MY_HTDOCSDIR}/"
-	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
-
-	for x in $(find data/ -not -name '.htaccess'); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-	webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-	for x in $(find conf/ -not -name 'msg'); do
-		webapp_configfile "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20260714b.ebuild b/www-apps/dokuwiki/dokuwiki-20260714c.ebuild
index a148c8e45861..a148c8e45861 100644
--- a/www-apps/dokuwiki/dokuwiki-20260714b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20260714c.ebuild
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index b3a5dccf6cf1..c6fe01582729 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1 @@
-DIST epiphany-48.5.tar.xz 4113932 BLAKE2B 648450e68b35d1bc7d6cb3680a6735d7c2da20e47c2da294bd6424fa574cad042ea1935cf1cd8634bd31e3651c53161a01359af36591c4f0523b9000487e695b SHA512 b70c387d1617cdcc81ff63c1c8ff08cf657220e6a5aad0ec07cbf90508e9270af9a2fead0f6a3b71905a70d3293c60230478d21b3b1d1fc2bdcbf2736289deca
-DIST epiphany-49.3.tar.xz 4233848 BLAKE2B 88ece324edd33128524928b6de6f80dcae726a87c3fe9745816bd6dbb0d9a4b1f6b34ed07e77f5204feb304411a0639f0635d39e41f465d2d1403a5ddcdc06be SHA512 3519af76a9d6a260fd7f33f969ce80284e9ecc7df8365e3a540aec17f1a005d2ddb0c0a9784767bef44d80ec32af35a24c3f0210959f91d54aab3127ff7f910b
 DIST epiphany-49.8.1.tar.xz 4241048 BLAKE2B b069a3d6bc02688914b9f8a7118e7387008562d75014bb87a418fd6d62d30eadd69c1cf33b355ba6d73cc6440cdd45c3844e0b377ea17d2cd759014852cf45ca SHA512 b8b14185549d9c745d8019f987184000b32057a1fa612b266a36e01ad06b7e19fa8779d50f119ec8628d0708e479d456b5c1d86655e9cca6b11ac2bdbfdc0214
diff --git a/www-client/epiphany/epiphany-48.5.ebuild b/www-client/epiphany/epiphany-48.5.ebuild
deleted file mode 100644
index 53f61d9b5bd2..000000000000
--- a/www-client/epiphany/epiphany-48.5.ebuild
+++ /dev/null
@@ -1,90 +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 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.74.0:2
-	gnome-base/gsettings-desktop-schemas
-	media-libs/gstreamer:1.0
-	>=gui-libs/gtk-4.13.3:4
-	>=app-text/iso-codes-0.35
-	>=dev-libs/json-glib-1.6
-	app-arch/libarchive:=
-	>=gui-libs/libadwaita-1.6: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/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
-	)
-	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/epiphany/epiphany-49.3.ebuild b/www-client/epiphany/epiphany-49.3.ebuild
deleted file mode 100644
index ab027f7151e9..000000000000
--- a/www-client/epiphany/epiphany-49.3.ebuild
+++ /dev/null
@@ -1,93 +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 xdg virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://apps.gnome.org/Epiphany/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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.74.0:2
-	gnome-base/gsettings-desktop-schemas
-	media-libs/gstreamer:1.0
-	>=gui-libs/gtk-4.13.3: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/firefox/firefox-140.15.0.ebuild b/www-client/firefox/firefox-140.15.0.ebuild
index ea897bae0190..a05cf529448b 100644
--- a/www-client/firefox/firefox-140.15.0.ebuild
+++ b/www-client/firefox/firefox-140.15.0.ebuild
@@ -80,7 +80,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 
 S="${WORKDIR}/${PN}-${PV%_*}"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 IUSE="+clang dbus debug eme-free hardened hwaccel jack libproxy pgo pulseaudio selinux sndio"
 IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-595.99.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-595.99.02.ebuild
index 4809ddea51c3..f27c834f848f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-595.99.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-595.99.02.ebuild
@@ -27,7 +27,7 @@ LICENSE="
 	curl openssl public-domain
 "
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="+X abi_x86_32 abi_x86_64 persistenced powerd +static-libs +tools wayland"
 
 COMMON_DEPEND="
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 67bb117de32c..91c2fed51db2 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,2 +1,3 @@
 DIST gdk-pixbuf-2.42.12.tar.xz 6525072 BLAKE2B 718a96c9efb836a275692ccbc403df0eb285918c5867d344406f660898c7ce8aad8cce7187faf7f6e9cdcfd1b051d5384f57644d946b888baddbaafb8f99309c SHA512 ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8
 DIST gdk-pixbuf-2.44.7.tar.xz 6037644 BLAKE2B d0418ac91733fae5a01d8a1760bab0443b89ce685d023a7d7b432019565fc47fe4b0e012d3976ce174347227c670ddd10b6978ec2b4ed023ff06b267f9bdb429 SHA512 6f6a9aeeafe244267be7afe914ac5c239c2b44daa677e6cfb83bfbdb81421b209db3fc8a5d7a78e228e8939f00bf464e1bdb9e691b6e40228180e8a8d1d4ecc7
+DIST gdk-pixbuf-2.44.8.tar.xz 6037756 BLAKE2B a95bb18e3982036f9d0f840ea774a45980ec7681ffb71ebcb496a4023bdc6da208ee2f6ccc68eab9f107e70530dfcb33ca344329a65e32851aedf08cf9477df1 SHA512 5fa8066abbfc29d7d9f07d95af2cfa2668e90381ecf1055ea449d35661b997d55e84e64ae1dedc14cf13d66912d05b1398075c560ce1aeeea7ae60a7d73c873a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.7.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.7.ebuild
index 08248e4bdc4b..a32e338b5776 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.7.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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="gtk-doc +introspection gif jpeg test tiff"
 REQUIRED_USE="gtk-doc? ( introspection )"
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.8.ebuild
new file mode 100644
index 000000000000..08248e4bdc4b
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.44.8.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+IUSE="gtk-doc +introspection gif jpeg test tiff"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-build/meson-1.5
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-python/docutils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=enabled
+		$(meson_feature gif)
+		-Dglycin=disabled
+		-Dothers=enabled
+		$(meson_feature tiff)
+		$(meson_feature jpeg)
+		-Dbuiltin_loaders=png,jpeg
+		-Drelocatable=false
+		#native_windows_loaders
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+		$(meson_native_use_bool gtk-doc documentation)
+		$(meson_native_use_feature introspection)
+		$(meson_native_true man)
+		-Dthumbnailer=enabled
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/vte/vte-0.82.4.ebuild b/x11-libs/vte/vte-0.82.4.ebuild
index 37c2412c04fb..13f32b9e5705 100644
--- a/x11-libs/vte/vte-0.82.4.ebuild
+++ b/x11-libs/vte/vte-0.82.4.ebuild
@@ -13,7 +13,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 )
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 186863af4a1c..4b29b796a25b 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,2 @@
-DIST VirtualGL-3.1.3.tar.gz 2112779 BLAKE2B 54c171b2ba6b8dd6676104ed34dd0044eae30319e3a7e9886948f9fd624460ce04fe206b1a5448f7401d3726e99ea6187a4c437bd6d2673852e75114b343aa55 SHA512 43e57626efaa86bd5568c61620db5f915db92d6bda2c16f43c6f5d99e9d093bcface8fd0c043af02c58f5d06e9b5f56bbc3cc9fe9b5ec7201902325d49592a92
 DIST VirtualGL-3.1.4.tar.gz 2113747 BLAKE2B d651fd657befff706b846ff0e33801b659b50944fb9abc1b9cb8333fe1b897790e513a9156bea903d9337d093f78d6a74964be5711bdd4d1d43d76923dd96a7c SHA512 266af1ddb923e07f52bba166cd6dd6066b371928946a0cd7cf5d200dde2b4bad6d3c7f1477dd6c575f830b42705468d444e413eedb4305ec34dfefab138d949f
+DIST VirtualGL-3.1.5.tar.gz 2117264 BLAKE2B 2f7288282a3da115ccf132fc995aa0031e93b36b4f8990f3c2985554590fe3fce7be069a8de642dc673496fd365c18a7a648c977bc04ae866f11dab7f8a43b14 SHA512 c9b138b1c7f979548f07c66025cbde7592d21ea23da2415ed6a715708d44fc290c052fe484cd521b3a277e7c6d0fcadecff0cea3ec7716b6f65cff6c3c1ba5d0
diff --git a/x11-misc/virtualgl/virtualgl-3.1.3.ebuild b/x11-misc/virtualgl/virtualgl-3.1.5.ebuild
index ba2a11f7dd48..b2ebbaf59238 100644
--- a/x11-misc/virtualgl/virtualgl-3.1.3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.1.5.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 9c4c1a43bb26..2fe8567ab768 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-backgrounds-45.0.tar.xz 32091076 BLAKE2B f8ac82069fb6beb71c7776356c7d87e6b57c9de1c8dd1becdff6a60f22b73284b0231c10c6af5a64addb4a890704808c00757b5f71d6f3a9deeaf59d97441d88 SHA512 6f25f8b22e5ae9ff3c522367af549de7260d34bef38d2b272df538217823cf880132d8be025344e97fd7f108acae4eed4dcac4e93b5f34b843e142687702b0ee
-DIST gnome-backgrounds-48.2.1.tar.xz 37358116 BLAKE2B eed45060ccd29398731af9ab875cf882c3eaef188dfa97622b7c89e375b7b9227f77e187c579de4fe8950f1bbb923ad2514af7654b8f6ec2cb55468225741bca SHA512 c06afc19e01950dd50cffd0d94a73cb0b49fe7f5e44af77e72110bd0f1b1c4b3deaa1e410fbfb51808845cbaa1b57c1ab50a7d8a4a200c28c36521ea5608d5b3
 DIST gnome-backgrounds-49.0.tar.xz 24440652 BLAKE2B 6d5c17d264fcd3dd4a5073704f6640a0eb7f9c3d51aeff66d7404436c1930db97463f238679a57e9ca8ab87c56a532a61dd0e3dc8c0fdd6df3b1d7d6095683a9 SHA512 2bf7c8dcdd21a38589c27ab3f5e747a0c3715a50526c33d087a31ae30dd7ffc1deabc0b6fae803a417304f699ebec549c45c4296b2464bd9be419cca3d38b5cd
+DIST gnome-backgrounds-50.0.tar.xz 39386552 BLAKE2B dcfae32978a6e3915c405bb773de22db34bef6155a494f864e9c7e26d4f2952a925cd6e4b03093ebc1db1fda594f8c08acc5e1b1ff385883c82070202e99e846 SHA512 6493472846f4806eef0003d74bf0742b0329e61647d8512a01e92ace8805c90746a800dc64d5b9b9415157fae274711195c2b98b26c60b5179524f36ce8d5658
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-48.2.1.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-50.0.ebuild
index 0a9bfe01904e..71cb480cee9b 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-48.2.1.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-50.0.ebuild
@@ -1,7 +1,8 @@
-# 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 meson
 
 DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
@@ -9,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 
 LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0 CC-BY-4.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 
 RDEPEND="
 	media-libs/libjxl[gdk-pixbuf]
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 0ec4d6a87ac1..dda2ab5b3653 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1 +1,2 @@
 DIST e16-1.0.31.tar.xz 1420172 BLAKE2B 0ae698cae7e3663ae721cc9b538565e882aaacb17ed3af76a592ac3cb7f4a7813b5b975f5e3ea17918957644ec42f20d6cc0c7ec34f4722892a68ccefe46821a SHA512 06497fafb98c3d891274e3969dcbed31a29eae619ca63ffdf766cc16eeefe4c373f54a6f64a369716fe5f10ca2fabfe5378526b59e6385ffd8e0aedb9fe50bf5
+DIST e16-1.0.32.tar.xz 1421736 BLAKE2B 31444bb40eafa31831add6e39722adf61bc8564e5cc66c1ba35e49c53ae4b92bd1de9443263593ba6dc21e920304c2de69bb8ecd03bfe75d1a82ed8b5e24cdfc SHA512 4cd5e2895095f85d9549e562530fdd8d23956cce6e5cab139a6800e797311ceb058801806390a63bda27f36758e86f6256ff85b7c527b4309fe45f0d936b89b1
diff --git a/x11-wm/e16/e16-1.0.32.ebuild b/x11-wm/e16/e16-1.0.32.ebuild
new file mode 100644
index 000000000000..005618f4a791
--- /dev/null
+++ b/x11-wm/e16/e16-1.0.32.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Enlightenment Window Manager (E16)"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audiofile +dbus debug +dialogs doc examples gnome
+libhack editline modules nls no-container opengl +pango player
+pulseaudio readline +sndfile sound +themes xcomposite +xft
+xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+
+REQUIRED_USE="
+	?? ( editline readline )
+	opengl? ( xcomposite xrender )
+	pango? ( xft )
+	sound? (
+		^^ ( alsa player pulseaudio )
+		alsa?       ( ^^ ( sndfile audiofile ) )
+		pulseaudio? ( ^^ ( sndfile audiofile ) )
+	)
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	media-libs/imlib2[X,text]
+	virtual/libiconv
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xbitmaps
+	dbus? ( sys-apps/dbus )
+	editline? ( dev-libs/editline:= )
+	opengl? (
+		media-libs/glu
+		media-libs/libglvnd[X]
+	)
+	pango? (
+		dev-libs/glib:2
+		x11-libs/pango[X]
+	)
+	readline? ( sys-libs/readline:= )
+	sound? (
+		alsa? ( media-libs/alsa-lib )
+		player? ( media-sound/alsa-utils )
+		pulseaudio? ( || (
+			media-libs/libpulse
+			media-sound/apulse[sdk]
+		) )
+		audiofile? ( media-libs/audiofile:= )
+		sndfile? ( media-libs/libsndfile )
+	)
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+	)
+	xft? ( x11-libs/libXft )
+	xi2? ( x11-libs/libXi )
+	xinerama? ( x11-libs/libXinerama )
+	xpresent? ( x11-libs/libXpresent )
+	xrandr? ( x11-libs/libXrandr )
+	xrender? ( x11-libs/libXrender )
+	xsm? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	zoom? ( !xrandr? ( x11-libs/libXxf86vm ) )
+"
+RDEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
+	themes? ( x11-themes/e16-themes )
+	!x11-wm/enlightenment:0
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	pango? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		media-libs/harfbuzz:=
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.31-fix-docdir.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable dbus)
+		$(use_enable debug libtrip)
+		$(use_enable dialogs)
+		$(use_enable doc docs)
+		$(use_enable libhack)
+		$(use_enable modules)
+		$(use_enable nls)
+		$(use_enable no-container containerless)
+		$(use_enable opengl glx)
+		$(use_enable pango)
+		$(use_enable xcomposite composite)
+		$(use_enable xft)
+		$(use_enable xi2)
+		$(use_enable xinerama)
+		$(use_enable xpresent)
+		$(use_enable xrandr)
+		$(use_enable xrender)
+		$(use_enable xsm sm)
+		$(use_enable xsync)
+		$(use_enable zoom)
+		$(use_with gnome gnome gnome3)
+		$(usev editline --with-lineedit=yes)
+		$(usev readline --with-lineedit=readline)
+		--enable-mans
+		--disable-esdtest
+		--disable-gcc-cpp
+		--disable-werror
+		--disable-xscrnsaver
+	)
+	if use sound; then
+		use alsa       && myconf+=( --enable-sound=alsa )
+		use pulseaudio && myconf+=( --enable-sound=pulseaudio )
+		use player     && myconf+=( --enable-sound=player )
+
+		if use alsa || use pulseaudio; then
+			use sndfile   && myconf+=( --with-sndldr=sndfile )
+			use audiofile && myconf+=( --with-sndldr=audiofile )
+		else
+			myconf+=( --without-sndldr )
+		fi
+	else
+		myconf+=( --disable-sound --without-sndldr )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/e16.html
+	dodoc COMPLIANCE docs/e16.html
+	use examples && dodoc -r sample-scripts
+}
+
+pkg_postinst() {
+	einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use"
+	einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\""
+	einfo "in the Theme setting should be disabled for this to work."
+}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.20.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.20.5.ebuild
index e9cd057cafc6..dd94f0661ab1 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.20.5.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.20.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="X colord input_devices_libinput libcanberra libnotify upower wayland +xklavier"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
author	root <root@alpha.trunkmasters.com>	2026-09-07 03:05:50 -0500
committer	root <root@alpha.trunkmasters.com>	2026-09-07 03:05:50 -0500
commit	8453817910bc2afbb7ab1fbf61c3f06fb7320f35 (patch)
tree	3d107194f4fc4d247ed6c21875e9dff4562e22e1
parent	e3ac4a99dbb849deb8dd15df4be98e6e14d55ab5 (diff)
download	srcux-8453817910bc2afbb7ab1fbf61c3f06fb7320f35.tar.gz srcux-8453817910bc2afbb7ab1fbf61c3f06fb7320f35.tar.xz srcux-8453817910bc2afbb7ab1fbf61c3f06fb7320f35.zip