Adding metadata

577 files changed, 16009 insertions, 7603 deletions

diff --git a/app-admin/puppet/puppet-8.10.0-r2.ebuild b/app-admin/puppet/puppet-8.10.0-r2.ebuild
index 1cff290e2bf7..016ba393a809 100644
--- a/app-admin/puppet/puppet-8.10.0-r2.ebuild
+++ b/app-admin/puppet/puppet-8.10.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index e199bb3e7d6e..9730f14f5475 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -2,3 +2,4 @@ DIST spectre-meltdown-checker-0.45.tar.gz 64268 BLAKE2B 14d49f40458167ab9af04cc3
 DIST spectre-meltdown-checker-0.46.tar.gz 67595 BLAKE2B 355469c2176fffa8fb40695b47174959c9112e66cd870545ed424ef7b6ef4c10a5aa94bfbc6912510c979e16b0f8a18c0b822200eb69e9ded8300305d779fa79 SHA512 02464340b88673cdcd66f8953246e33beb68c2de49e118afc24af2e1153a7313ef561a236b27e7f7d6ada8c7f23c4780d435c6a396d838952093eb3c401aab22
 DIST spectre-meltdown-checker-26.33.0420460.tar.gz 170851 BLAKE2B b608125283bd755b02834f00cb8d26d0394bfc10794377216f342262f417347f6d9db008d55c9bca89ddf22566d936caeedd21fa365f75d5cd433a2a6502bd59 SHA512 03f9d7fde295a9e8df7b1ab59313def8f8bed67c9c5cc0dbf745f4b64b2f81ea038dd91b6256c5fb6e2657122487ff97e97754ec32a635e46c4c587a306606fd
 DIST spectre-meltdown-checker-26.36.0602723.tar.gz 179782 BLAKE2B 1c5aee6cdc2cc1af489c1d400ffaec6ff1dcf670296487e3fa798865bb755386ad811c691a858202f8427752a6c1423fd18644de359620fd113050e141c2289f SHA512 651a60c3d0efe2ddc41a55e32eb3dfd8a03c233a840dace30e437d1c64b367f15b7faa2e5b6ad20daebbed1aa8b3169dd39be15747a2b07b9a2b82b1a73a2671
+DIST spectre-meltdown-checker-26.36.0913490.tar.gz 188784 BLAKE2B 11e0aa4c2250e0b43047e6d683abac1333854d760147606961445a081d8dcc4a61f0cab2266d02d7cc50d2ddb216c312ee92d88bacab344586afefa5a38738e4 SHA512 9df55729930fa15bdc9232e378c5c93de7f4b82aa60bcfdbb35c170329be8ef9494d7e925908f0945f8b4720d9e9fc171f623a12c7bacc1973ea18cf087205fa
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-26.36.0913490.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-26.36.0913490.ebuild
new file mode 100644
index 000000000000..bcf97c34fc75
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-26.36.0913490.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/winbox/Manifest b/app-admin/winbox/Manifest
index 3d7c482c57ef..09e3e33cecd0 100644
--- a/app-admin/winbox/Manifest
+++ b/app-admin/winbox/Manifest
@@ -1,2 +1 @@
-DIST winbox-4.3.zip 20675672 BLAKE2B dcb277b551098a58ebfbdea4df93d9853d62a845ddedc321ddc3eb8e94c81fc3854000962da6f0fb80e68c0f012822279501d38e077534f30a7aa32337aad3ac SHA512 332d6a0e6f34e23d3946b85f3e06ffdaba8d4fc209aadc3449c2f13beea676da9c6b88c76384f0a16668e2c9e5b6a63502feac3a12d557683518e7b7e8db853d
-DIST winbox-4.4_rc1.zip 20769915 BLAKE2B 68e7bc8e59b23d4b06d9b164a913b2654a766950aff3059a56ad2821563bb4b6ae63dccbdd88bbc2cd8b4688074d0094a64e6667392baa5bd725931b24fe78b1 SHA512 aade4e5e43f4eeac4b49d591c2fa4c5e889df1552dd768bab5cde5a6363dec71dbfc01872daa391894f10b7719b088a5c3f46edf22cad77bd9c23591dab2f0ae
+DIST winbox-4.4.zip 20769844 BLAKE2B 6b552866b09d4f5d43cbd395bfbcc89eb3feab7030ff6531f26828547bf812211739d5f1532e7c779474618407a3dc1e786cd7e2e8269b037d72c38d54d2d31b SHA512 8674974f52b419586ff906a1cea3f16b7a81123c1a16c783843a2971bc8385ee043bb942256514e9cb86fc964d3d8b7db2273f8d45e91728c08ba81102a1e391
diff --git a/app-admin/winbox/winbox-4.3.ebuild b/app-admin/winbox/winbox-4.4.ebuild
index b4555996edf5..b4555996edf5 100644
--- a/app-admin/winbox/winbox-4.3.ebuild
+++ b/app-admin/winbox/winbox-4.4.ebuild
diff --git a/app-admin/winbox/winbox-4.4_rc1.ebuild b/app-admin/winbox/winbox-4.4_rc1.ebuild
deleted file mode 100644
index 33d7023d731d..000000000000
--- a/app-admin/winbox/winbox-4.4_rc1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="Management Software for MikroTik RouterOS"
-HOMEPAGE="https://mikrotik.com/"
-SRC_URI="https://download.mikrotik.com/routeros/winbox/${PV/_/}/WinBox_Linux.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="MikroTik"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libglvnd
-	virtual/zlib:=
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-"
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/winbox/WinBox"
-
-src_install() {
-	exeinto /opt/winbox
-	doexe WinBox
-
-	insinto /opt/winbox
-	doins -r assets
-
-	dodir /opt/bin
-	dosym ../winbox/WinBox /opt/bin/winbox
-
-	doicon assets/img/winbox.png
-	make_desktop_entry winbox WinBox winbox Network
-}
diff --git a/app-arch/createrepo_c/createrepo_c-1.2.3.ebuild b/app-arch/createrepo_c/createrepo_c-1.2.3.ebuild
index df8c9619eed6..ce9d8c36fc45 100644
--- a/app-arch/createrepo_c/createrepo_c-1.2.3.ebuild
+++ b/app-arch/createrepo_c/createrepo_c-1.2.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git"
 else
 	SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-containers/runc/runc-1.3.6.ebuild b/app-containers/runc/runc-1.3.6.ebuild
index 6dac62c9fd4c..b8a7c7f659ae 100644
--- a/app-containers/runc/runc-1.3.6.ebuild
+++ b/app-containers/runc/runc-1.3.6.ebuild
@@ -97,7 +97,6 @@ pkg_setup() {
 		~NET_CLS_CGROUP
 		~CFS_BANDWIDTH
 		~FAIR_GROUP_SCHED
-		~RT_GROUP_SCHED
 		~IP_NF_TARGET_REDIRECT
 		~IP_VS
 		~IP_VS_NFCT
diff --git a/app-containers/runc/runc-1.4.2.ebuild b/app-containers/runc/runc-1.4.2.ebuild
index 91247b87fcd1..223a8f89355a 100644
--- a/app-containers/runc/runc-1.4.2.ebuild
+++ b/app-containers/runc/runc-1.4.2.ebuild
@@ -99,7 +99,6 @@ pkg_setup() {
 		~NET_CLS_CGROUP
 		~CFS_BANDWIDTH
 		~FAIR_GROUP_SCHED
-		~RT_GROUP_SCHED
 		~IP_NF_TARGET_REDIRECT
 		~IP_VS
 		~IP_VS_NFCT
diff --git a/app-containers/runc/runc-1.4.3.ebuild b/app-containers/runc/runc-1.4.3.ebuild
index 54612d653df3..4fafe3f1a680 100644
--- a/app-containers/runc/runc-1.4.3.ebuild
+++ b/app-containers/runc/runc-1.4.3.ebuild
@@ -100,7 +100,6 @@ pkg_setup() {
 		~CGROUP_NET_PRIO
 		~CFS_BANDWIDTH
 		~FAIR_GROUP_SCHED
-		~RT_GROUP_SCHED
 		~IP_NF_TARGET_REDIRECT
 		~IP_VS
 		~IP_VS_NFCT
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index c3397e43e779..11901a5f7806 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1 +1,2 @@
 DIST libsecret-0.21.7.tar.xz 207692 BLAKE2B cf7571f69903178c6c2f45b8d24e576fdbf15b68024905934b0b8fcc2c16f826d569a9973d9d1592fabc40b668d0778076f882a93eba1dc5148289133c7b7e81 SHA512 f5ee1244338ba324ae403096ddd7357899f55fa9f961d2473515ac924164fe9b33f87e39eea2a30b99fc32f2300c0e626d20c98509dbbcadb2c99628a1caa0e4
+DIST libsecret-0.21.8.2.tar.xz 213280 BLAKE2B 3a010612bef5af7947a07c52ffe1e61aed4fd4db22528b19a0d970f6f24a3be5b82a84c7b237113de9eed8a0830483437006bfec2a5a6a75d22b068324d1d06a SHA512 0a2ae5d86dc635df0a126f1483d917c8fd41cc0c534869ae0612291394b76fb1b2ab6ba27d2f020e123de979338a970d6653fa574d000826b4792be4c1075150
diff --git a/app-crypt/libsecret/libsecret-0.21.8.2-r1.ebuild b/app-crypt/libsecret/libsecret-0.21.8.2-r1.ebuild
new file mode 100644
index 000000000000..5195c9c04326
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.21.8.2-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libsecret"
+
+LICENSE="LGPL-2.1+ test? ( || ( GPL-2+ Apache-2.0 ) )"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+crypt +gcrypt gnutls gtk-doc +introspection pam test test-rust tpm +vala"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+	crypt? ( || ( gcrypt gnutls ) )
+"
+
+DEPEND="
+	!<app-shells/bash-completion-2.16.0-r1
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.8.2:0=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	pam? ( sys-libs/pam_wrapper )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0:=
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.21.7-optional-vala-tests.patch
+	# Collides with gnome-base/gnome-keyring and no other distros
+	# seem to install it because of that, so just leave it uninstalled
+	# for now: https://gitlab.gnome.org/GNOME/libsecret/-/work_items/90
+	#"${FILESDIR}"/${PN}-0.21.7-fix-installing-pam-module.patch
+)
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		-Dbash_completion=enabled
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool pam)
+		$(meson_feature test test_setup)
+	)
+
+	if use crypt ; then
+		use gcrypt && emesonargs+=( -Dcrypto=libgcrypt )
+		use gnutls && emesonargs+=( -Dcrypto=gnutls )
+	else
+		emesonargs+=( -Dcrypto=disabled )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}" --print-errorlogs
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}" --print-errorlogs
+	fi
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 9b345b202ec5..10b749e5b9a2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,12 +1,17 @@
 DIST emacs-18.59-patches-17.tar.xz 34812 BLAKE2B c517c177ec14a238d5c816951dc88ce42e7b0235f856e9a5b7454555c80493c2f76b21a458b5694f833d5dbb292cb49b4d8120b36385e020d541c01b79f2ecca SHA512 a8fff9de5046037e219f98f17c792fa67e545b239e577644c02337183b6929d16a3fb7d7a415ebeb9be684b3643cb332fe833e22b5a5ccfc2a278b8b8406615f
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-27.2-patches-13.tar.xz 21480 BLAKE2B 02bc580fbb50fe7c8f6e50d9f98e454349e95b09fa686836b0c1969acd412f2726eca3dbeee72731c56d0ec786f640c370abf7bb711eb4663a52fd443a0d6e06 SHA512 0325e4d5229ee405863f6ac0cabe2f121266e3e2ace9d95b4891dc43450c198e3a895a8c78070d835aeb8fc527d0f269137719fe44133e991776fc110fd8d723
+DIST emacs-27.2-patches-14.tar.xz 21760 BLAKE2B ed77ec3b9226762eb50ea6a253ac446b82321cd0d1ea8cfce8dc94bad60404d98fc40881f9244ddf9f8ec6efe587dfb31c80c7e0bd7ef434449a7e778e0bf70b SHA512 ab08cec2fd4dbb8b5091119d573e7c0430d0ce15850466ef384f595f79c768fd53cbbd5bd326009d01286a83af7469ff3efe7f6c970f417b9da8d6be5b710900
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.2-patches-13.tar.xz 17568 BLAKE2B a2843188e2f9a5da5d4cf40ea771016b36bfa888974897a6f03abb3f5d4f3a477474ad3b35ce7ae9af610f8bba59b5f21f39c12d429612665bc2c8f333d23ef2 SHA512 3618979ce1bb0a4d4ad27a50000b4dba3bf90ff9df38ff77157dee0490cf25c359bcdf94f89ba6c6e09572cbe566c2fdcec4e39f958863a4f45d802482c094a5
+DIST emacs-28.2-patches-14.tar.xz 17840 BLAKE2B 7d483a4b64e1deb40366bdb4eaecb263b1a0958ac9f45f7f6632c9d3cdf7bfb45e152d72379037161674133a07ccb9145ba4ed87dbf3312332d01cdc72523289 SHA512 f8c7ab898ebb9f20ffd1dd2e80a0b88aba66e4a4d57e2990337dd38e7d97f00bc4594225124240ce53d4031e6cadbb8f6177bbae990d5ccfc21c051474340261
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-29.4-patches-7.tar.xz 11112 BLAKE2B 37e76abc7046044b04aee6713366b837fdd9c9b2872ee247ddc859f1463c4a7149aea011aaef192dedc1f950d46ce7af24947ed69d9aa2d748af1906ea53100b SHA512 622bdcb1c59aca0ff7b694c80175ffdfeda4ad94553857b2cabeaaa27110b9b74e9d635cf1de7575a55dcb4c2c56575edeeb516aee909cd82c22f8963f76f90e
+DIST emacs-29.4-patches-8.tar.xz 11396 BLAKE2B 45b1f432e2d7505b350e536e2694ae4b51f8185ec22346eafe03ace02f9393efc7ec655c9835e81197fbd79465d9f7aa98c814b349790f1e86947b8498f0e20a SHA512 99d89b6432f7810669dbe373d905a79efb333b70e5804dbaa169bfed269ce2b84b8a3e36496609f3d9dc65642a37d2c4e1697afdb3a6dbecffb123f09e467c56
 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
 DIST emacs-30.2-patches-5.tar.xz 8564 BLAKE2B d47d2ac461c352058950c1cb98602c550797f7e9864f05d20f728aa62dd36bf6b6089f34a9bda6c490df149ad526f11e7d0edf586c16e20754df1412edb560fc SHA512 bccc94d31da384b86887a4d153be0946720ef7c66369b591ca567159d0ed83fc0613d7ecb27c7de9a31a98b5886be4fc3498c36a12d878dff36e03cfd55aa7f1
+DIST emacs-30.2-patches-6.tar.xz 8928 BLAKE2B fa00120d7b2d8c712513c87655f1d6388dc39ed98d0e0602f5f489f8959fc6079a08e99888e56b61862bb8ce97c31386fa4cc23df5daff64569604724c6c70b5 SHA512 c16eb103de51175966299055375157e47dbe86ec4741284163f6ad92e6dcfdf53cfd85d1758b443b11e23b285325b4b6adc62bcbd18af14b1a06d5ef89bdbc8e
 DIST emacs-30.2.tar.xz 55320324 BLAKE2B 9163ba6bfab1010a156c669ac085ad363545d73e3ffac21c710b14b618df61a4c6a80a50fd3fa81d852c2ccace5080e614b679606fa584e28509f99ad6196784 SHA512 313432d11e95c74f8cd35c5b1da442e6223f5d40f9173c55883c0339ecbfb97a0bedf79177ef8902afd3e33c078a233777bed01f5caffa1e7524f17d58bfc9a2
+DIST emacs-31.1-patches-1.tar.xz 1184 BLAKE2B 24ff497cf3dd7e0d3150db4e3bc845e8c923388c1ba0c9b888a1d69f28a58c6a33137aaf7cc558f74c918436d68b1f16aae185625d13ced52decff8dcaf2c4d8 SHA512 5607d9a894a461b271c06b61c12247368902222d9258a2513959a44a309d05334549575ac7d16647556093ff31e2916f1f60f65727c077ffd377dc51a47692ff
 DIST emacs-31.1.tar.xz 57977476 BLAKE2B c9f8cf37553c0e2913eb12d7e069735c23baca3b725332f17b4b4784d1e4987c9ae098dae669e65e49fa01d8b9a63e518b210640892216e0a9ae02e51f3d0581 SHA512 25cb810d09eaaa58306f4c10f406466c424517657dd1c9db056dadb624f0bc33db58f3bcdf527d81e5059e492b81c237f164eb3997bf4357bd84c696537f6836
 DIST emacs-32.0.50_pre20260831.tar.xz 36653692 BLAKE2B 76b8696ee19f5bcc231cbe95168a6d4ca16a1da6556ea92f1b811f4bc374704326998c0edff6dfde1be7921fc11dcdfd634148f1c17329af291f675bad5c4297 SHA512 ffaecaac32629045d85076d5ec59607cba4c3671d161814fdb4e641e498a16170d1370f3fa2ad88079901946ad132d74863b13f1f92b0649610ab7fe9244bc3c
diff --git a/app-editors/emacs/emacs-27.2-r25.ebuild b/app-editors/emacs/emacs-27.2-r25.ebuild
new file mode 100644
index 000000000000..511b1364273b
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r25.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://distfiles.gentoo.org/pub/proj/emacs/${P}-patches-14.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+fi
+
+DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ Boost-1.0 BSD HPND MIT MPL-2.0 PCRE PSF-2 unicode W3C"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson:= )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0:= )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	valgrind? ( dev-debug/valgrind )
+	zlib? ( virtual/zlib:= )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
+			!cairo? ( x11-libs/libXft )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:3[X] )
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0=
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925449
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
+	# We want floating-point arithmetic to be correct #933380
+	replace-flags -Ofast -O2
+	append-flags -fno-fast-math -ffp-contract=off
+
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
+	local myconf=(
+		--program-suffix="-${EMACS_SUFFIX}"
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
+		--localstatedir="${EPREFIX}"/var
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
+		--without-compress-install
+		--without-pop
+		--with-file-notification=$(usev inotify || usev gfile || echo no)
+		--with-pdumper
+		$(use_enable acl)
+		$(use_with dbus)
+		$(use_with dynamic-loading modules)
+		$(use_with games gameuser ":gamestat")
+		$(use_with gmp libgmp)
+		$(use_with gpm)
+		$(use_with json)
+		$(use_with lcms lcms2)
+		$(use_with libxml2 xml2)
+		$(use_with mailutils)
+		$(use_with selinux)
+		$(use_with ssl gnutls)
+		$(use_with systemd libsystemd)
+		$(use_with threads)
+		$(use_with wide-int)
+		$(use_with zlib)
+	)
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=( --with-sound=alsa )
+	else
+		myconf+=( --with-sound=$(usex sound oss no) )
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=(
+			--without-x --without-ns
+		)
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=(
+			--with-ns --disable-ns-self-contained
+			--without-x
+		)
+	else
+		myconf+=(
+			--with-x --without-ns
+			--without-gconf
+			$(use_with gsettings)
+			$(use_with toolkit-scroll-bars)
+			$(use_with gif)
+			$(use_with jpeg)
+			$(use_with png)
+			$(use_with svg rsvg)
+			$(use_with tiff)
+			$(use_with xpm)
+			$(use_with imagemagick)
+		)
+
+		if use xft; then
+			myconf+=(
+				--with-xft
+				$(use_with cairo)
+				$(use_with harfbuzz)
+				$(use_with m17n-lib libotf)
+				$(use_with m17n-lib m17n-flt)
+			)
+		else
+			myconf+=(
+				--without-xft
+				--without-cairo
+				--without-libotf --without-m17n-flt
+			)
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				There is a long-standing bug in GTK+ that prevents Emacs
+				from recovering from X disconnects:
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				This is not a problem if you use only one display, but if
+				you use more than one and close one of them, Emacs may crash.
+				If you intend to use more than one display or to run Emacs
+				as a daemon, then it is strongly recommended that you compile
+				it with the Athena/Lucid or the Motif toolkit instead,
+				i.e. with USE="athena Xaw3d -gtk -motif" or USE="motif -gtk".
+			EOF
+			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=( --with-x-toolkit=motif )
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=( --with-x-toolkit=no )
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=( --with-dumping=none )
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=( --with-dumping=unexec )
+	else
+		myconf+=( --with-dumping=pdumper )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# dissuade Portage from removing our dir file #257260
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		pipestatus || die "gzip .el pipeline failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	;;; ${EMACS_SUFFIX} site-lisp configuration  -*-lexical-binding:t-*-
+	X
+	(when (string-equal emacs-version "${FULL_VERSION}")
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect --root="${ROOT}" emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.2-r23.ebuild b/app-editors/emacs/emacs-28.2-r23.ebuild
new file mode 100644
index 000000000000..489c58fcb7cc
--- /dev/null
+++ b/app-editors/emacs/emacs-28.2-r23.ebuild
@@ -0,0 +1,562 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-28"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://distfiles.gentoo.org/pub/proj/emacs/${P}-patches-14.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+fi
+
+DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ Boost-1.0 BSD CC-BY-SA-3.0 CC-BY-SA-4.0 HPND MIT MPL-2.0 PCRE PSF-2 unicode W3C"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
+
+RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? (
+		sys-devel/gcc:=[jit(-)]
+		virtual/zlib:=
+	)
+	json? ( dev-libs/jansson:= )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0:= )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	valgrind? ( dev-debug/valgrind )
+	zlib? ( virtual/zlib:= )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
+			!cairo? ( x11-libs/libXft )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:3[X] )
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0=
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925449
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# The build system requires gcc for native compilation #874657
+		if ! tc-is-gcc; then
+			ewarn "Emacs must be built with gcc[jit] if USE=jit is enabled."
+			ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+			export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar NM=${CHOST}-gcc-nm \
+				RANLIB=${CHOST}-gcc-ranlib
+			tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+		fi
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		if has ccache ${FEATURES} || has distcc ${FEATURES}; then
+			export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+		fi
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	# Tests that use bubblewrap don't work in the sandbox:
+	# "bwrap: setting up uid map: Permission denied"
+	# So, disrupt the search for the bwrap executable.
+	sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
+		test/lisp/emacs-lisp/bytecomp-tests.el || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
+	# We want floating-point arithmetic to be correct #933380
+	replace-flags -Ofast -O2
+	append-flags -fno-fast-math -ffp-contract=off
+
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	local myconf=(
+		--program-suffix="-${EMACS_SUFFIX}"
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
+		--localstatedir="${EPREFIX}"/var
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
+		--without-compress-install
+		--without-pop
+		--with-file-notification=$(usev inotify || usev gfile || echo no)
+		--with-pdumper
+		$(use_enable acl)
+		$(use_with dbus)
+		$(use_with dynamic-loading modules)
+		$(use_with games gameuser ":gamestat")
+		$(use_with gmp libgmp)
+		$(use_with gpm)
+		$(use_with jit native-compilation)
+		$(use_with json)
+		$(use_with lcms lcms2)
+		$(use_with libxml2 xml2)
+		$(use_with mailutils)
+		$(use_with selinux)
+		$(use_with ssl gnutls)
+		$(use_with systemd libsystemd)
+		$(use_with threads)
+		$(use_with wide-int)
+	)
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=( --with-sound=alsa )
+	else
+		myconf+=( --with-sound=$(usex sound oss no) )
+	fi
+
+	if use jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=( --with-zlib )
+	else
+		myconf+=( $(use_with zlib) )
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=(
+			--without-x --without-ns
+		)
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=(
+			--with-ns --disable-ns-self-contained
+			--without-x
+		)
+	else
+		myconf+=(
+			--with-x --without-ns
+			--without-gconf
+			$(use_with gsettings)
+			$(use_with toolkit-scroll-bars)
+			$(use_with gif)
+			$(use_with jpeg)
+			$(use_with png)
+			$(use_with svg rsvg)
+			$(use_with tiff)
+			$(use_with xpm)
+			$(use_with imagemagick)
+		)
+
+		if use xft; then
+			myconf+=(
+				--with-xft
+				$(use_with cairo)
+				$(use_with harfbuzz)
+				$(use_with m17n-lib libotf)
+				$(use_with m17n-lib m17n-flt)
+			)
+		else
+			myconf+=(
+				--without-xft
+				--without-cairo
+				--without-libotf --without-m17n-flt
+			)
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				There is a long-standing bug in GTK+ that prevents Emacs
+				from recovering from X disconnects:
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				This is not a problem if you use only one display, but if
+				you use more than one and close one of them, Emacs may crash.
+				If you intend to use more than one display or to run Emacs
+				as a daemon, then it is strongly recommended that you compile
+				it with the Athena/Lucid or the Motif toolkit instead,
+				i.e. with USE="athena Xaw3d -gtk -motif" or USE="motif -gtk".
+			EOF
+			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=( --with-x-toolkit=motif )
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=( --with-x-toolkit=no )
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=( --with-dumping=none )
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=( --with-dumping=unexec )
+	else
+		myconf+=( --with-dumping=pdumper )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_test() {
+	# List .el test files with a comment above listing the exact
+	# subtests which caused failure. Elements should begin with a %.
+	# e.g. %lisp/gnus/mml-sec-tests.el.
+	local exclude_tests=(
+		# Reason: not yet known
+		# mml-secure-en-decrypt-{1,2,3,4}
+		# mml-secure-find-usable-keys-{1,2}
+		# mml-secure-key-checks
+		# mml-secure-select-preferred-keys-4
+		# mml-secure-sign-verify-1
+		%lisp/gnus/mml-sec-tests.el
+
+		# Reason: race condition
+		# Looks like it should be fixed in 29.x at least:
+		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
+		# files-tests-file-name-non-special-file-in-directory-p
+		%lisp/files-tests.el
+
+		# Reason: permission denied on /nonexistent
+		# (vc-*-bzr only fails if breezy is installed, as they
+		# try to access cache dirs under /nonexistent)
+		#
+		# rmail-undigest-test-multipart-mixed-digest
+		# rmail-undigest-test-rfc1153-less-strict-digest
+		# rmail-undigest-test-rfc1153-sloppy-digest
+		# rmail-undigest-test-rfc934-digest
+		# vc-test-bzr02-state
+		# vc-test-bzr05-rename-file
+		# vc-test-bzr06-version-diff
+		# vc-bzr-test-bug9781
+		%lisp/mail/undigest-tests.el
+		%lisp/vc/vc-tests.el
+		%lisp/vc/vc-bzr-tests.el
+
+		# Reason: some copyright years differ
+		%lisp/emacs-lisp/copyright-tests.el
+
+		# Reason: quoting issues (fixed in Emacs 29)
+		%lib-src/emacsclient-tests.el
+
+		# Reason: tries to access network
+		# internet-is-working
+		%src/process-tests.el
+
+		# Reason: fails with app-crypt/freepg
+		%lisp/epg-tests.el
+
+		# Reason: tests not backported
+		# tramp-test01-file-name-syntax
+		# tramp-test02-file-name-dissect
+		# tramp-test03-file-name-defaults
+		# tramp-test03-file-name-method-rules
+		# url-tramp-test-convert-tramp-to-url
+		%lisp/net/tramp-tests.el
+		%lisp/url/url-tramp-tests.el
+
+		# Reason: tests not backported #982533
+		%lisp/progmodes/flymake-tests.el
+	)
+	use elibc_musl && exclude_tests+=(
+			# Reason: newlocale(3) lenient locale validation #906012
+			# fns-tests-collate-strings
+			%src/fns-tests.el
+		)
+	use threads || exclude_tests+=(
+			%src/emacs-module-tests.el
+			%src/keyboard-tests.el
+			%src/thread-tests.el
+		)
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# dissuade Portage from removing our dir file #257260
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		pipestatus || die "gzip .el pipeline failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	;;; ${EMACS_SUFFIX} site-lisp configuration  -*-lexical-binding:t-*-
+	X
+	(when (string-equal emacs-version "${FULL_VERSION}")
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect --root="${ROOT}" emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-29.4-r11.ebuild b/app-editors/emacs/emacs-29.4-r11.ebuild
new file mode 100644
index 000000000000..859648ffba1c
--- /dev/null
+++ b/app-editors/emacs/emacs-29.4-r11.ebuild
@@ -0,0 +1,649 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-29"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://distfiles.gentoo.org/pub/proj/emacs/${P}-patches-8.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+fi
+
+DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ Boost-1.0 BSD CC-BY-SA-3.0 CC-BY-SA-4.0 HPND MIT MPL-2.0 PCRE PSF-2 unicode W3C"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib"
+
+X_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-misc/xbitmaps
+	xpm? ( x11-libs/libXpm )
+	xft? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXrender
+		cairo? ( >=x11-libs/cairo-1.12.18[X] )
+		!cairo? ( x11-libs/libXft )
+		harfbuzz? ( media-libs/harfbuzz:0= )
+		m17n-lib? (
+			>=dev-libs/libotf-0.9.4
+			>=dev-libs/m17n-lib-1.5.1
+		)
+	)
+	gtk? ( x11-libs/gtk+:3[X] )
+	!gtk? (
+		motif? (
+			>=x11-libs/motif-2.3:0=
+			x11-libs/libXpm
+			x11-libs/libXmu
+			x11-libs/libXt
+		)
+		!motif? (
+			Xaw3d? (
+				x11-libs/libXaw3d
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
+		)
+	)"
+
+RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? (
+		sys-devel/gcc:=[jit(-)]
+		virtual/zlib:=
+	)
+	json? ( dev-libs/jansson:= )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0:= )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	tree-sitter? ( dev-libs/tree-sitter:= )
+	valgrind? ( dev-debug/valgrind )
+	zlib? ( virtual/zlib:= )
+	gui? (
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		webp? ( media-libs/libwebp:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+		!aqua? (
+			gsettings? (
+				>=app-emacs/emacs-common-1.11[gsettings]
+				>=dev-libs/glib-2.28.6
+			)
+			gtk? ( !X? (
+				media-libs/fontconfig
+				media-libs/freetype
+				>=x11-libs/cairo-1.12.18
+				x11-libs/gtk+:3
+				harfbuzz? ( media-libs/harfbuzz:0= )
+				m17n-lib? (
+					>=dev-libs/libotf-0.9.4
+					>=dev-libs/m17n-lib-1.5.1
+				)
+			) )
+			!gtk? ( ${X_DEPEND} )
+			X? ( ${X_DEPEND} )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? (
+		!gtk? ( x11-base/xorg-proto )
+		X? ( x11-base/xorg-proto )
+	) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925091
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	if use jit; then
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# The build system requires gcc for native compilation #874657
+		if ! tc-is-gcc; then
+			ewarn "Emacs must be built with gcc[jit] if USE=jit is enabled."
+			ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+			export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar NM=${CHOST}-gcc-nm \
+				RANLIB=${CHOST}-gcc-ranlib
+			tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+		fi
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		if has ccache ${FEATURES} || has distcc ${FEATURES}; then
+			export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+		fi
+	fi
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+	# Tests that use bubblewrap don't work in the sandbox:
+	# "bwrap: setting up uid map: Permission denied"
+	# So, disrupt the search for the bwrap executable.
+	sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
+		test/lisp/emacs-lisp/bytecomp-tests.el || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
+	# We want floating-point arithmetic to be correct #933380
+	replace-flags -Ofast -O2
+	append-flags -fno-fast-math -ffp-contract=off
+
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	local myconf=(
+		--program-suffix="-${EMACS_SUFFIX}"
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
+		--localstatedir="${EPREFIX}"/var
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
+		--without-compress-install
+		--without-pop
+		--with-file-notification=$(usev inotify || usev gfile || echo no)
+		--with-pdumper
+		$(use_enable acl)
+		$(use_with dbus)
+		$(use_with dynamic-loading modules)
+		$(use_with games gameuser ":gamestat")
+		$(use_with gmp libgmp)
+		$(use_with gpm)
+		$(use_with jit native-compilation aot)
+		$(use_with json)
+		$(use_with lcms lcms2)
+		$(use_with libxml2 xml2)
+		$(use_with mailutils)
+		$(use_with selinux)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl gnutls)
+		$(use_with systemd libsystemd)
+		$(use_with threads)
+		$(use_with tree-sitter)
+		$(use_with wide-int)
+	)
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=( --with-sound=alsa )
+	else
+		myconf+=( --with-sound=$(usex sound oss no) )
+	fi
+
+	if use jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=( --with-zlib )
+	else
+		myconf+=( $(use_with zlib) )
+	fi
+
+	# Emacs supports these window systems:
+	# X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
+	# General GUI support is enabled by the "gui" USE flag, then
+	# the window system is selected as follows:
+	#   "aqua" -> Nextstep
+	#   "gtk -X" -> pure GTK
+	#   otherwise -> X11
+	# For X11 there is the further choice of toolkits GTK, Motif,
+	# Athena (Lucid), or no toolkit. They are enabled (in order of
+	# preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=(
+			--without-x --without-pgtk --without-ns
+		)
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=(
+			--with-ns --disable-ns-self-contained
+			--without-x --without-pgtk
+		)
+	elif use gtk && ! use X; then
+		einfo "Configuring to build with pure GTK (without X11) support"
+		myconf+=(
+			--with-pgtk --without-x --without-ns
+			--with-toolkit-scroll-bars #836392
+			--without-gconf
+			--without-xwidgets
+			$(use_with gsettings)
+			$(use_with harfbuzz)
+			$(use_with m17n-lib libotf)
+			$(use_with m17n-lib m17n-flt)
+		)
+	else
+		# X11
+		myconf+=(
+			--with-x --without-pgtk --without-ns
+			--without-gconf
+			$(use_with gsettings)
+			$(use_with toolkit-scroll-bars)
+			$(use_with xpm)
+		)
+
+		if use xft; then
+			myconf+=(
+				--with-xft
+				$(use_with cairo)
+				$(use_with harfbuzz)
+				$(use_with m17n-lib libotf)
+				$(use_with m17n-lib m17n-flt)
+			)
+		else
+			myconf+=(
+				--without-xft
+				--without-cairo
+				--without-libotf --without-m17n-flt
+			)
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				There is a long-standing bug in GTK+ that prevents Emacs
+				from recovering from X disconnects:
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				This is not a problem if you use only one display, but if
+				you use more than one and close one of them, Emacs may crash.
+				If you intend to use more than one display or to run Emacs
+				as a daemon, then it is strongly recommended that you compile
+				it with the Athena/Lucid or the Motif toolkit instead,
+				i.e. with USE="athena Xaw3d -gtk -motif" or USE="motif -gtk".
+			EOF
+			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=( --with-x-toolkit=motif )
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=( --with-x-toolkit=no )
+		fi
+	fi
+
+	if use gui; then
+		# Common flags recognised for all GUIs
+		myconf+=(
+			$(use_with gif)
+			$(use_with jpeg)
+			$(use_with png)
+			$(use_with svg rsvg)
+			$(use_with tiff)
+			$(use_with webp)
+			$(use_with imagemagick)
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=( --with-dumping=none )
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=( --with-dumping=unexec )
+	else
+		myconf+=( --with-dumping=pdumper )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
+		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
+	else
+		EMACS_EMAKE_ARGS=()
+		emake
+	fi
+}
+
+src_test() {
+	# List .el test files with a comment above listing the exact
+	# subtests which caused failure. Elements should begin with a %.
+	# e.g. %lisp/gnus/mml-sec-tests.el.
+	local exclude_tests=(
+		# Reason: not yet known
+		# mml-secure-sign-verify-1 #967849
+		%lisp/gnus/mml-sec-tests.el
+
+		# Reason: permission denied on /nonexistent
+		# (vc-*-bzr only fails if breezy is installed, as they
+		# try to access cache dirs under /nonexistent)
+		#
+		# rmail-undigest-test-multipart-mixed-digest
+		# rmail-undigest-test-rfc1153-less-strict-digest
+		# rmail-undigest-test-rfc1153-sloppy-digest
+		# rmail-undigest-test-rfc934-digest
+		# vc-test-bzr02-state
+		# vc-test-bzr05-rename-file
+		# vc-test-bzr06-version-diff
+		# vc-bzr-test-bug9781
+		%lisp/mail/undigest-tests.el
+		%lisp/vc/vc-tests.el
+		%lisp/vc/vc-bzr-tests.el
+
+		# Reason: tries to access network
+		# internet-is-working
+		%src/process-tests.el
+
+		# Reason: test not skipped if tree-sitter-cpp is missing #979386
+		# c-ts-mode-test-filling
+		%lisp/progmodes/c-ts-mode-tests.el
+
+		# Reason: test is not skipped if tree-sitter-tsx is not installed
+		# Bug #922525
+		%lisp/progmodes/typescript-ts-mode-tests.el
+
+		# eglot-test-lsp-abiding-column #977411
+		%lisp/progmodes/eglot-tests.el
+
+		# Reason: fails with app-crypt/freepg
+		%lisp/epg-tests.el
+
+		# Reason: https://bugs.gnu.org/72120
+		# dired-test-bug27243-02
+		%lisp/dired-tests.el
+
+		# Reason: does not pass -Q to emacs (https://bugs.gnu.org/81676)
+		# emacsclient-test-alternate-editor-allows-arguments
+		# emacsclient-test-alternate-editor-allows-quotes
+		%lib-src/emacsclient-tests.el
+
+		# Reason: tests not backported #982533
+		%lisp/progmodes/flymake-tests.el
+	)
+	use elibc_musl && exclude_tests+=(
+			# Reason: newlocale(3) lenient locale validation #906012
+			# fns-tests-collate-strings
+			%src/fns-tests.el
+		)
+	use threads || exclude_tests+=(
+			%lisp/server-tests.el
+			%lisp/progmodes/eglot-tests.el
+			%src/emacs-module-tests.el
+			%src/keyboard-tests.el
+		)
+	use xpm || exclude_tests+=( %src/image-tests.el )
+
+	# Redirect GnuPG's sockets, in order not to exceed the 108 char limit
+	# for socket paths on Linux.
+	mkdir -p "${T}"/gpg || die
+	local f
+	for f in browser extra ssh; do
+		printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+			> "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die
+	done
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+src_install() {
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# dissuade Portage from removing our dir file #257260
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		pipestatus || die "gzip .el pipeline failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	;;; ${EMACS_SUFFIX} site-lisp configuration  -*-lexical-binding:t-*-
+	X
+	(when (string-equal emacs-version "${FULL_VERSION}")
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	if ! use mailutils; then
+		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
+		own e-mail features are going to be used as an e-mail client
+		(e.g. Rmail), you are strongly encouraged to enable it. If not,
+		Emacs will use its own implementation of movemail; which has
+		fewer features and is less secure. For more information see the
+		Info node '(emacs)Movemail' in the Emacs manual."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect --root="${ROOT}" emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-30.2-r7.ebuild b/app-editors/emacs/emacs-30.2-r7.ebuild
new file mode 100644
index 000000000000..9f252d5b136f
--- /dev/null
+++ b/app-editors/emacs/emacs-30.2-r7.ebuild
@@ -0,0 +1,647 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-30"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://distfiles.gentoo.org/pub/proj/emacs/${P}-patches-6.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+fi
+
+DESCRIPTION="The advanced, extensible, customizable, self-documenting editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ Boost-1.0 BSD CC-BY-SA-3.0 CC-BY-SA-4.0 HPND MIT MPL-2.0 PCRE PSF-2 unicode W3C"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib"
+
+X_DEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-misc/xbitmaps
+	xpm? ( x11-libs/libXpm )
+	xft? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXrender
+		cairo? ( >=x11-libs/cairo-1.12.18[X] )
+		!cairo? ( x11-libs/libXft )
+		harfbuzz? ( media-libs/harfbuzz:0= )
+		m17n-lib? (
+			>=dev-libs/libotf-0.9.4
+			>=dev-libs/m17n-lib-1.5.1
+		)
+	)
+	gtk? ( x11-libs/gtk+:3[X] )
+	!gtk? (
+		motif? (
+			>=x11-libs/motif-2.3:0=
+			x11-libs/libXpm
+			x11-libs/libXmu
+			x11-libs/libXt
+		)
+		!motif? (
+			Xaw3d? (
+				x11-libs/libXaw3d
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!Xaw3d? ( athena? (
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libXt
+			) )
+		)
+	)"
+
+RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? (
+		sys-devel/gcc:=[jit(-)]
+		virtual/zlib:=
+	)
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0:= )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	tree-sitter? ( dev-libs/tree-sitter:= )
+	valgrind? ( dev-debug/valgrind )
+	xattr? ( sys-apps/attr )
+	zlib? ( virtual/zlib:= )
+	gui? (
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		webp? ( media-libs/libwebp:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
+		!aqua? (
+			gsettings? (
+				>=app-emacs/emacs-common-1.11[gsettings]
+				>=dev-libs/glib-2.28.6
+			)
+			gtk? ( !X? (
+				media-libs/fontconfig
+				media-libs/freetype
+				>=x11-libs/cairo-1.12.18
+				x11-libs/gtk+:3
+				harfbuzz? ( media-libs/harfbuzz:0= )
+				m17n-lib? (
+					>=dev-libs/libotf-0.9.4
+					>=dev-libs/m17n-lib-1.5.1
+				)
+			) )
+			!gtk? ( ${X_DEPEND} )
+			X? ( ${X_DEPEND} )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? (
+		!gtk? ( x11-base/xorg-proto )
+		X? ( x11-base/xorg-proto )
+	) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+# Suppress false positive QA warnings #898304 #925091
+QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	if use jit; then
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# The build system requires gcc for native compilation #874657
+		if ! tc-is-gcc; then
+			ewarn "Emacs must be built with gcc[jit] if USE=jit is enabled."
+			ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+			export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar NM=${CHOST}-gcc-nm \
+				RANLIB=${CHOST}-gcc-ranlib
+			tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+		fi
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		if has ccache ${FEATURES} || has distcc ${FEATURES}; then
+			export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+		fi
+	fi
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	# libseccomp is detected by configure but doesn't appear to have any
+	# effect on the installed image. Suppress it by supplying pkg-config
+	# with a wrong library name.
+	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+	# Tests that use bubblewrap don't work in the sandbox:
+	# "bwrap: setting up uid map: Permission denied"
+	# So, disrupt the search for the bwrap executable.
+	sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
+		test/lisp/emacs-lisp/bytecomp-tests.el || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
+	# We want floating-point arithmetic to be correct #933380
+	replace-flags -Ofast -O2
+	append-flags -fno-fast-math -ffp-contract=off
+
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	local myconf=(
+		--program-suffix="-${EMACS_SUFFIX}"
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
+		--localstatedir="${EPREFIX}"/var
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
+		--without-compress-install
+		--without-pop
+		--with-file-notification=$(usev inotify || usev gfile || echo no)
+		--with-pdumper
+		$(use_enable acl)
+		$(use_enable xattr)
+		$(use_with dbus)
+		$(use_with dynamic-loading modules)
+		$(use_with games gameuser ":gamestat")
+		$(use_with gmp libgmp)
+		$(use_with gpm)
+		$(use_with jit native-compilation aot)
+		$(use_with lcms lcms2)
+		$(use_with libxml2 xml2)
+		$(use_with mailutils)
+		$(use_with selinux)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl gnutls)
+		$(use_with systemd libsystemd)
+		$(use_with threads)
+		$(use_with tree-sitter)
+		$(use_with wide-int)
+	)
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=( --with-sound=alsa )
+	else
+		myconf+=( --with-sound=$(usex sound oss no) )
+	fi
+
+	if use jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=( --with-zlib )
+	else
+		myconf+=( $(use_with zlib) )
+	fi
+
+	# Emacs supports these window systems:
+	# X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
+	# General GUI support is enabled by the "gui" USE flag, then
+	# the window system is selected as follows:
+	#   "aqua" -> Nextstep
+	#   "gtk -X" -> pure GTK
+	#   otherwise -> X11
+	# For X11 there is the further choice of toolkits GTK, Motif,
+	# Athena (Lucid), or no toolkit. They are enabled (in order of
+	# preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=(
+			--without-x --without-pgtk --without-ns
+		)
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=(
+			--with-ns --disable-ns-self-contained
+			--without-x --without-pgtk
+		)
+	elif use gtk && ! use X; then
+		einfo "Configuring to build with pure GTK (without X11) support"
+		myconf+=(
+			--with-pgtk --without-x --without-ns
+			--with-toolkit-scroll-bars #836392
+			--without-gconf
+			--without-xwidgets
+			$(use_with gsettings)
+			$(use_with harfbuzz)
+			$(use_with m17n-lib libotf)
+			$(use_with m17n-lib m17n-flt)
+		)
+	else
+		# X11
+		myconf+=(
+			--with-x --without-pgtk --without-ns
+			--without-gconf
+			$(use_with gsettings)
+			$(use_with toolkit-scroll-bars)
+			$(use_with xpm)
+		)
+
+		if use xft; then
+			myconf+=(
+				--with-xft
+				$(use_with cairo)
+				$(use_with harfbuzz)
+				$(use_with m17n-lib libotf)
+				$(use_with m17n-lib m17n-flt)
+			)
+		else
+			myconf+=(
+				--without-xft
+				--without-cairo
+				--without-libotf --without-m17n-flt
+			)
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				There is a long-standing bug in GTK+ that prevents Emacs
+				from recovering from X disconnects:
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				This is not a problem if you use only one display, but if
+				you use more than one and close one of them, Emacs may crash.
+				If you intend to use more than one display or to run Emacs
+				as a daemon, then it is strongly recommended that you compile
+				it with the Athena/Lucid or the Motif toolkit instead,
+				i.e. with USE="athena Xaw3d -gtk -motif" or USE="motif -gtk".
+			EOF
+			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=( --with-x-toolkit=motif )
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=( --with-x-toolkit=no )
+		fi
+	fi
+
+	if use gui; then
+		# Common flags recognised for all GUIs
+		myconf+=(
+			$(use_with gif)
+			$(use_with jpeg)
+			$(use_with png)
+			$(use_with svg rsvg)
+			$(use_with tiff)
+			$(use_with webp)
+			$(use_with imagemagick)
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=( --with-dumping=none )
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=( --with-dumping=unexec )
+	else
+		myconf+=( --with-dumping=pdumper )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	unset SHELL #965834
+
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
+		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
+	else
+		EMACS_EMAKE_ARGS=()
+		emake
+	fi
+}
+
+src_test() {
+	# List .el test files with a comment above listing the exact
+	# subtests which caused failure. Elements should begin with a %.
+	# e.g. %lisp/gnus/mml-sec-tests.el.
+	local exclude_tests=(
+		# Reason: not yet known
+		# mml-secure-sign-verify-1 #967849 #979419
+		%lisp/gnus/mml-sec-tests.el
+
+		# Reason: permission denied on /nonexistent
+		# (vc-*-bzr only fails if breezy is installed, as they
+		# try to access cache dirs under /nonexistent)
+		#
+		# rmail-undigest-test-multipart-mixed-digest
+		# rmail-undigest-test-rfc1153-less-strict-digest
+		# rmail-undigest-test-rfc1153-sloppy-digest
+		# rmail-undigest-test-rfc934-digest
+		# vc-test-bzr02-state
+		# vc-test-bzr05-rename-file
+		# vc-test-bzr06-version-diff
+		# vc-bzr-test-bug9781
+		%lisp/mail/undigest-tests.el
+		%lisp/vc/vc-tests.el
+		%lisp/vc/vc-bzr-tests.el
+
+		# Reason: malformed html tag in test, https://bugs.gnu.org/79041
+		# shr-test/zoom-image
+		%lisp/net/shr-tests.el
+
+		%lisp/progmodes/eglot-tests.el  #966957
+
+		# Reason: flaky (https://bugs.gnu.org/73441, fails even with the fix)
+		# proced-refine-test
+		%lisp/proced-tests.el
+
+		# Reason: test not skipped if tree-sitter-cpp is missing #979386
+		# c-ts-mode-test-filling
+		%lisp/progmodes/c-ts-mode-tests.el
+
+		# Reason: tries to access network
+		# internet-is-working
+		%src/process-tests.el
+
+		# Reason: fails with app-crypt/freepg
+		%lisp/epg-tests.el
+
+		# Reason: does not pass -Q to emacs (https://bugs.gnu.org/81676)
+		# emacsclient-test-alternate-editor-allows-arguments
+		# emacsclient-test-alternate-editor-allows-quotes
+		%lib-src/emacsclient-tests.el
+
+		# Reason: tests not backported #982533
+		%lisp/progmodes/flymake-tests.el
+	)
+	use elibc_musl && exclude_tests+=(
+			# Reason: newlocale(3) lenient locale validation #906012
+			# fns-tests-collate-strings
+			%src/fns-tests.el
+		)
+	use threads || exclude_tests+=(
+			%src/emacs-module-tests.el
+			%src/keyboard-tests.el
+		)
+
+	# Redirect GnuPG's sockets, in order not to exceed the 108 char limit
+	# for socket paths on Linux.
+	mkdir -p "${T}"/gpg || die
+	local f
+	for f in browser extra ssh; do
+		printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+			> "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die
+	done
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+src_install() {
+	emake \
+		"${EMACS_EMAKE_ARGS[@]}" \
+		DESTDIR="${D}" \
+		NO_BIN_LINK=t \
+		BLESSMAIL_TARGET="" \
+		install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# dissuade Portage from removing our dir file #257260
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		pipestatus || die "gzip .el pipeline failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	;;; ${EMACS_SUFFIX} site-lisp configuration  -*-lexical-binding:t-*-
+	X
+	(when (string-equal emacs-version "${FULL_VERSION}")
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	if ! use mailutils; then
+		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
+		own e-mail features are going to be used as an e-mail client
+		(e.g. Rmail), you are strongly encouraged to enable it. If not,
+		Emacs will use its own implementation of movemail; which has
+		fewer features and is less secure. For more information see the
+		Info node '(emacs)Movemail' in the Emacs manual."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	# Force an update of the emacs symlink for the livecd/dvd,
+	# because some microemacs packages set it with USE=livecd.
+	# Otherwise, create it only when it is not yet set.
+	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect --root="${ROOT}" emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-31.1.ebuild b/app-editors/emacs/emacs-31.1-r1.ebuild
index 033cbf0f6501..4c411433beb5 100644
--- a/app-editors/emacs/emacs-31.1.ebuild
+++ b/app-editors/emacs/emacs-31.1-r1.ebuild
@@ -31,6 +31,9 @@ else
 	elif [[ ${PV//[0-9]} != "." ]]; then
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://distfiles.gentoo.org/pub/proj/emacs/${P}-patches-1.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
@@ -469,6 +472,9 @@ src_test() {
 
 		# Reason: fails with app-crypt/freepg
 		%lisp/epg-tests.el
+
+		# Reason: tests not backported #982533
+		%lisp/progmodes/flymake-tests.el
 	)
 	use threads || exclude_tests+=(
 			%src/emacs-module-tests.el
diff --git a/app-editors/emacs/emacs-31.1.9999.ebuild b/app-editors/emacs/emacs-31.1.9999.ebuild
index 033cbf0f6501..d33edfcc9f16 100644
--- a/app-editors/emacs/emacs-31.1.9999.ebuild
+++ b/app-editors/emacs/emacs-31.1.9999.ebuild
@@ -469,6 +469,9 @@ src_test() {
 
 		# Reason: fails with app-crypt/freepg
 		%lisp/epg-tests.el
+
+		# Reason: tests not backported #982533
+		%lisp/progmodes/flymake-tests.el
 	)
 	use threads || exclude_tests+=(
 			%src/emacs-module-tests.el
diff --git a/app-i18n/ibus/ibus-1.5.34-r2.ebuild b/app-i18n/ibus/ibus-1.5.34-r2.ebuild
index 1af5d6295872..7d4f4755c621 100644
--- a/app-i18n/ibus/ibus-1.5.34-r2.ebuild
+++ b/app-i18n/ibus/ibus-1.5.34-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-misc/siegfried/Manifest b/app-misc/siegfried/Manifest
index 2485561c36c9..7e1616ca6916 100644
--- a/app-misc/siegfried/Manifest
+++ b/app-misc/siegfried/Manifest
@@ -1,9 +1,6 @@
-DIST siegfried-1.11.4-data.zip 13107124 BLAKE2B 27ff7723e75dd99dca65bcbf754202718673fa3e49d69bdab8b40e7146a2540af38eecea386b6c4a5587d6eee60f2fa98b30a2ee5cf053ae7db51a1f6e400f8b SHA512 cc10eaf71765ca36e0ba65e52435837d6ff4e3acedbda98c053c5db2e082bc9cf5700411d206227c9dba50ecb9477c8f4c7f3de5ec9c7b49f8f3479460b82128
-DIST siegfried-1.11.4.deps.tar.xz 12730128 BLAKE2B 4271d6e97d98a96978cfc9414a2dd17341db2fd2cc84c6fea9baffd94e13c26bd115a1157304f178e90e5390b7c53e0dee6da54bdacd1297f81451e5666a71bd SHA512 1d8668e38fe954666e0d6541cab622bf73544dbb22cb26304d51c105b0fd4819caa06d63169382be8817cd5c2a84834c2a7746cc497d298a64e2863e1661917c
-DIST siegfried-1.11.4.gh.tar.gz 12503987 BLAKE2B fb17f57f0e6705d5be971494ccd76d1611dcf6a2e82f52f5201907cf2c1758fa0e27c2ce05456cb5dc851fc5221130ae363811b1f29ad563aea87303d2da51f2 SHA512 ab4a1c9670a0026fda150bf0e2e158660af9124f858ff4e1ac0c6bb5d35737cfde46d7f0a7295effc96f126e60c26721abd5809f2d31121731f775dde356669a
-DIST siegfried-1.11.5-data.zip 13130332 BLAKE2B 8da854abb05648c0f2bbe0fadef0e31e8eb9eb8b81ce2e2bdc99825283f243c756a5d50fa7e8b85bea42ee456a1f8c2aeb16627f23ac69c0a7ba7e8028c29794 SHA512 5b794c0a9bbcd133443ac3534a6dfe896ad9a33a82dd012a0540980e9b0bcf8b05b2ff620ec9bdef29e9baeabe52a8e0582543bb4455e39e3de38e1c6aaad937
-DIST siegfried-1.11.5-deps.tar.xz 12398180 BLAKE2B 14735a4e9e2904c561c35484702f899274ca31e4c80b651524e78abc0ccc2c3c984e09ce1fc0f9515e20bf539b88a32859f768d5c9b29c61feac0ca3c424aefd SHA512 170d6936da3524307af54b6dcfaa9cdb5c5a6cb99f25af8186a8a43e9b92e7d0664034b1bcec232c1784905c7316fa4014ff86d28e93d1f194bea1cd43267f3f
-DIST siegfried-1.11.5.gh.tar.gz 12517770 BLAKE2B 369835249f2a9d3d8a00c6eea6eba7cc746d9f6308fe51b778069e888c8a56ce468f4f85d53ad409d3321fe6582c6c30999ffa98696fed3f61cd2be76c0c0fee SHA512 7d88405980cd80d8a1a09c9289815e60314eff49e7f0a18c5e6535a197c3836dce0efb9423ee159108286dfe362f3c33cd28d17df38398ca9d07d1ffa0a57a34
 DIST siegfried-1.11.6-data.zip 13132634 BLAKE2B 952f90fbd6585e921812e82271e4acbd82a51b75ff215fcb801fd1bd619a5f585b50db77d3e178d80de9238caeb18f9efe01e59f8cf862b9ac5ba1e79257fcfd SHA512 ce83d892d681da14d75810df85c88f6bb9fdfa3a2c01bb4bdf18a8c3c4c755b9b5e8d851ad2e0fd749177d17941fd51e47f233c9dae0b8fd260c3459f2dfc23d
 DIST siegfried-1.11.6-deps.tar.xz 12398180 BLAKE2B 14735a4e9e2904c561c35484702f899274ca31e4c80b651524e78abc0ccc2c3c984e09ce1fc0f9515e20bf539b88a32859f768d5c9b29c61feac0ca3c424aefd SHA512 170d6936da3524307af54b6dcfaa9cdb5c5a6cb99f25af8186a8a43e9b92e7d0664034b1bcec232c1784905c7316fa4014ff86d28e93d1f194bea1cd43267f3f
 DIST siegfried-1.11.6.gh.tar.gz 12521626 BLAKE2B 3ff14b6d3707628fde7877f20b9d406ee4fa8aced173f0025dd54f06be0e75aa2cb045f36b696e0119049dfca2b6f7573928d81172abe546301bbccb0f468060 SHA512 17a47ac8390d802c4fc42b339af2be75de7bc0fdc83f441be1ee830c85ac5fffa7e9cbc909379342f2d556f2fabc948e2219a0f7982f429aba8aca21fd013d6e
+DIST siegfried-1.11.7-data.zip 13080907 BLAKE2B a912cd0b8d04c08c9a3dc4e88ecf7f16c0d5ce6f002d0298bed0fa87fd2484b0c7f6b7bd8be35ae53629af3f394c0f8dd593a689276971e09b9fad00e8a491cb SHA512 c13ed15361e3ad6e772050132cc4df7bee383f0982a842a158b5bdd8d11cc1f0ef62464825cdd86f0c30fe47a8fbbd7e0b6b77f9d8811cffc7160b413ee2cf39
+DIST siegfried-1.11.7-deps.tar.xz 12398180 BLAKE2B 14735a4e9e2904c561c35484702f899274ca31e4c80b651524e78abc0ccc2c3c984e09ce1fc0f9515e20bf539b88a32859f768d5c9b29c61feac0ca3c424aefd SHA512 170d6936da3524307af54b6dcfaa9cdb5c5a6cb99f25af8186a8a43e9b92e7d0664034b1bcec232c1784905c7316fa4014ff86d28e93d1f194bea1cd43267f3f
+DIST siegfried-1.11.7.gh.tar.gz 12447650 BLAKE2B 29ef432689fff9b1f71d1cfd2f8a6e14dd3770e2609c22f4a565bf4900e564fe6a0526a9f89c77f5912306c5b1670b99ee12d6fe76c9c4d5d4410f607ec8032c SHA512 221229bbeb0fbf31d0b3e5f8f6fccfb0fd3c3882076377328d840d9490b3006dfbcbe061b1c64fc0da8fe4476bd0d0f6338d5e7abf1fe7400cd91362c8d2f7c1
diff --git a/app-misc/siegfried/siegfried-1.11.4.ebuild b/app-misc/siegfried/siegfried-1.11.4.ebuild
deleted file mode 100644
index fd3d24d13717..000000000000
--- a/app-misc/siegfried/siegfried-1.11.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-MY_P=${P/_/-}
-DESCRIPTION="Signature-based file format identification"
-HOMEPAGE="
-	https://www.itforarchivists.com/siegfried/
-	https://github.com/richardlehane/siegfried/
-"
-SRC_URI="
-	https://github.com/richardlehane/siegfried/archive/v${PV/_/-}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-	https://github.com/richardlehane/siegfried/releases/download/v${PV/_/-}/data_${PV//[._]/-}.zip
-		-> ${MY_P}-data.zip
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${P}.deps.tar.xz
-	"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-# vendored deps
-LICENSE+=" BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	!app-misc/dfshow
-"
-
-src_compile() {
-	go build -v -work -x "${S}"/cmd/roy || die
-	go build -v -work -x "${S}"/cmd/sf || die
-}
-
-src_test() {
-	cp "${WORKDIR}/siegfried/fddXML.zip" cmd/roy/data || die
-	go test -v "${S}"/cmd/roy || die
-	go test -v "${S}"/cmd/sf || die
-}
-
-src_install() {
-	dobin roy sf
-	insinto /usr/share/siegfried
-	doins "${WORKDIR}/siegfried/default.sig"
-}
diff --git a/app-misc/siegfried/siegfried-1.11.5.ebuild b/app-misc/siegfried/siegfried-1.11.7.ebuild
index 4e133d53d763..4e133d53d763 100644
--- a/app-misc/siegfried/siegfried-1.11.5.ebuild
+++ b/app-misc/siegfried/siegfried-1.11.7.ebuild
diff --git a/app-text/tesseract/files/tesseract-5.5.3-cstdlib.patch b/app-text/tesseract/files/tesseract-5.5.3-cstdlib.patch
new file mode 100644
index 000000000000..c3f87a23d8d9
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.5.3-cstdlib.patch
@@ -0,0 +1,21 @@
+From c822b4f73d0a055f3588957c320b1acf06b69da5 Mon Sep 17 00:00:00 2001
+From: tachalorah <tachalorah@proton.me>
+Date: Mon, 3 Aug 2026 11:37:55 +0700
+Subject: [PATCH] arch/simddetect.cpp: add missing <cstdlib> for getenv()
+
+---
+ src/arch/simddetect.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/arch/simddetect.cpp b/src/arch/simddetect.cpp
+index 0031556163..084a2b92f4 100644
+--- a/src/arch/simddetect.cpp
++++ b/src/arch/simddetect.cpp
+@@ -18,6 +18,7 @@
+ #ifdef HAVE_CONFIG_H
+ #  include "config_auto.h" // for HAVE_AVX, ...
+ #endif
++#include <cstdlib> // for getenv
+ #include <numeric> // for std::inner_product
+ #include "dotproduct.h"
+ #include "intsimdmatrix.h" // for IntSimdMatrix
diff --git a/app-text/tesseract/tesseract-5.5.3.ebuild b/app-text/tesseract/tesseract-5.5.3.ebuild
index 22f606ec3e25..900ac7c3ee5c 100644
--- a/app-text/tesseract/tesseract-5.5.3.ebuild
+++ b/app-text/tesseract/tesseract-5.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc float32 jpeg openmp png static-libs tiff training webp"
 
 COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
@@ -34,6 +34,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.1-arm64-neon-tesseract.patch
+	"${FILESDIR}"/${P}-cstdlib.patch
 )
 
 pkg_pretend() {
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index 5f1b82d4ba78..2d54f952ec3d 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,3 +1,5 @@
 DIST mariadb-connector-odbc-3.1.18-src.tar.gz 556590 BLAKE2B 9644521f91136b3bc30846d8c9df7cfa21c8fff0e9219bf0c758a0294f34783a57f1200834b84833284624160652315adb4f6eb465a90378e676e5767c7bd40a SHA512 1d240988d03dbb0ef2f4eb0667ff973a35d700f319caaea78db6d5c0ca569ed5adcee978fb10cd9f067c0c5aecbfe697e5adb3d736e564bae82cf6c11cd0dba2
+DIST mariadb-connector-odbc-3.1.23-src.tar.gz 574433 BLAKE2B fe44e5d2a03937c7ac5d0e89344fb35d85775526cfe5dce854080deeb0f01f9826ac39a00fc7564b98e7b53f8bcd4665a30db93b65840b15bb7088972855e65e SHA512 873dca00054ad08d836c703a6a0e54ac2fbca17587ebb16c6138afc68f51ee8b8ef92722f10a82548f5d0dc12a8d6442e3fd620b3e2d0a65dfd291c87f6d0561
 DIST mariadb-connector-odbc-3.2.7-src.tar.gz 667911 BLAKE2B 4ffaecb0239ede28fccfd00bd3fbf9cdef6139cbb898ec930c583aa5d690911952355b6998451273838f756f12a46f5335bdd12c97a39d53a9eeb534362e532c SHA512 b9cba5a067e044b312e116dba9faada63ddae379a67aec3abfd29b2d7bf004dedf0241f550f17c296e87765a47cd10793de8a65f4e90c9eff94e0dc5250d5d9f
 DIST mariadb-connector-odbc-3.2.8-src.tar.gz 686685 BLAKE2B 37844d9d417a35cb955a433cfd9041f868b18f7248271f2a778afd87c625a9c4fff827a61858b6ddab12935383e066a1c81ba6b84546c2a2c7174d4d3c1c0390 SHA512 f92c636f245637b8ae4d745cc5b4042135c42500410d967a6ee319c3872f1e54c6ea99633e6937a8022bba46ac5a3ff3f8bdd30f67c5098230448be5b8fb07ae
+DIST mariadb-connector-odbc-3.2.9-src.tar.gz 689181 BLAKE2B 605260b36f5ae85797bfac39c581e899fc4321bc053fa21892a0f89b7d0023cf8c0f5931866880ba825d13dc35131cc8cafd1b2a73ebecf26428f85e0a3fcaa7 SHA512 4933f2509fb8179d48a8df90b1a300fad4c05809e04c9af0cfef5e214c9924b951efd90ab555a415147af28223b5b6f4e633e34e85afe98dc4b39559e25aaadc
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.23.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.23.ebuild
new file mode 100644
index 000000000000..071829c01201
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.23.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2018-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/"
+SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
+S="${S}-src"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+# USE=ssl merely enables the configuration options (seemingly for interactive
+# sessions) and does not cause direct linking to any SSL libraries.  However,
+# it doesn't make sense enable these configuration options unless the
+# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl,
+# require mariadb-connector-c to have it too.
+DEPEND="dev-db/mariadb-connector-c:=[ssl(+)?]
+	dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
+}
+
+multilib_src_configure() {
+	append-cppflags $(mariadb_config --cflags || die)
+	local mycmakeargs=(
+		-DWITH_SSL=$(usex ssl OPENSSL OFF)
+		-DMARIADB_LINK_DYNAMIC=YES
+		-DUSE_SYSTEM_INSTALLED_LIB=YES
+		-DINSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LIBDIR="$(get_libdir)/mariadb"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/${PN}
+	doins odbcinst.ini
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING" || die "Error removing COPYING file from installation"
+}
+
+pkg_postinst() {
+	elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
+	elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
+}
+
+pkg_config() {
+	[[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
+
+	if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
+		einfo "maodbc (MariaDB ODBC driver) has already been installed."
+	else
+		ebegin "Installing maodbc (MariaDB ODBC driver)"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
+		eend ${?} || die
+	fi
+}
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.8.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.8.ebuild
index 2eeb40cb60e8..817361d7c0de 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.8.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.8.ebuild
@@ -12,7 +12,7 @@ S="${S}-src"
 
 LICENSE="LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 # USE=ssl merely enables the configuration options (seemingly for interactive
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.9.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.9.ebuild
new file mode 100644
index 000000000000..2eeb40cb60e8
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.2.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2018-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://mariadb.org/connector-odbc/all-releases/ https://github.com/mariadb-corporation/mariadb-connector-odbc/"
+SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
+S="${S}-src"
+
+LICENSE="LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+# USE=ssl merely enables the configuration options (seemingly for interactive
+# sessions) and does not cause direct linking to any SSL libraries.  However,
+# it doesn't make sense enable these configuration options unless the
+# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl,
+# require mariadb-connector-c to have it too.
+DEPEND="dev-db/mariadb-connector-c:=[ssl(+)?]
+	dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
+}
+
+multilib_src_configure() {
+	append-cppflags $(mariadb_config --cflags || die)
+	local mycmakeargs=(
+		-DWITH_SSL=$(usex ssl OPENSSL OFF)
+		-DMARIADB_LINK_DYNAMIC=YES
+		-DUSE_SYSTEM_INSTALLED_LIB=YES
+		-DINSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LIBDIR="$(get_libdir)/mariadb"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/${PN}
+	doins odbcinst.ini
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING" || die "Error removing COPYING file from installation"
+}
+
+pkg_postinst() {
+	elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
+	elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
+}
+
+pkg_config() {
+	[[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
+
+	if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
+		einfo "maodbc (MariaDB ODBC driver) has already been installed."
+	else
+		ebegin "Installing maodbc (MariaDB ODBC driver)"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
+		eend ${?} || die
+	fi
+}
diff --git a/dev-debug/valgrind/valgrind-3.27.1.ebuild b/dev-debug/valgrind/valgrind-3.27.1.ebuild
index a97239284305..3280daff3f83 100644
--- a/dev-debug/valgrind/valgrind-3.27.1.ebuild
+++ b/dev-debug/valgrind/valgrind-3.27.1.ebuild
@@ -42,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-lang/perl/perl-5.44.0.ebuild b/dev-lang/perl/perl-5.44.0.ebuild
index 901307cf2374..d0d7ff00a7cb 100644
--- a/dev-lang/perl/perl-5.44.0.ebuild
+++ b/dev-lang/perl/perl-5.44.0.ebuild
@@ -54,7 +54,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] ; then
-	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"
 fi
 
 IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_quadmath"
@@ -63,6 +63,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
 	app-arch/bzip2
+	sys-libs/timezone-data
 	>=virtual/zlib-1.2.12:=
 	virtual/libcrypt:=
 "
diff --git a/dev-libs/aws-c-io/aws-c-io-1.0.0.ebuild b/dev-libs/aws-c-io/aws-c-io-1.0.0.ebuild
index 18309787fbd9..3afddaf5e1f1 100644
--- a/dev-libs/aws-c-io/aws-c-io-1.0.0.ebuild
+++ b/dev-libs/aws-c-io/aws-c-io-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awslabs/aws-c-io/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/aws-c-s3/aws-c-s3-1.1.1.ebuild b/dev-libs/aws-c-s3/aws-c-s3-1.1.1-r1.ebuild
index f0b43add6c36..e5f01dea4d44 100644
--- a/dev-libs/aws-c-s3/aws-c-s3-1.1.1.ebuild
+++ b/dev-libs/aws-c-s3/aws-c-s3-1.1.1-r1.ebuild
@@ -37,3 +37,12 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_install()
+{
+	cmake_src_install
+
+	if use test; then
+		rm "${ED}/usr/bin/s3" || die
+	fi
+}
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.86.0-tests-setuptools.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.86.0-tests-setuptools.patch
new file mode 100644
index 000000000000..3520387d99aa
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.86.0-tests-setuptools.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/work_items/575#note_2838785
+--- a/tests/scanner/test_ccompiler.py	2026-08-17 05:31:19.341878650 +0000
++++ b/tests/scanner/test_ccompiler.py	2026-08-17 05:45:37.094350170 +0000
+@@ -82,7 +82,9 @@
+         except ImportError as e:
+             raise unittest.SkipTest(e)
+ 
+-        with patch.object(distutils.ccompiler.CCompiler, 'spawn') as spawn:
++        # setuptools >= 84 replaced spawn() with call() -> subprocess.check_call()
++        with patch.object(distutils.ccompiler.CCompiler, 'spawn') as spawn, \
++             patch('subprocess.check_call') as check_call:
+             with Environ(environ):
+                 cc = CCompiler(compiler_name=compiler_name)
+                 # Avoid check if target is newer from source.
+@@ -90,8 +92,11 @@
+                 # Don't actually do anything.
+                 cc.compiler.dry_run = True
+                 cc.compile(pkg_config_cflags, cpp_includes, [source], init_sections)
+-        self.assertEqual(1, spawn.call_count)
+-        args, kwargs = spawn.call_args
++        if spawn.call_count:
++            args, kwargs = spawn.call_args
++            return args[0]
++        self.assertEqual(1, check_call.call_count)
++        args, kwargs = check_call.call_args
+         return args[0]
+ 
+     def preprocess_args(self, environ={}, compiler_name=None,
+@@ -103,7 +108,9 @@
+         except ImportError as e:
+             raise unittest.SkipTest(e)
+ 
+-        with patch.object(distutils.ccompiler.CCompiler, 'spawn') as spawn:
++        # setuptools >= 84 replaced spawn() with call() -> subprocess.check_call()
++        with patch.object(distutils.ccompiler.CCompiler, 'spawn') as spawn, \
++             patch('subprocess.check_call') as check_call:
+             with Environ(environ):
+                 cc = CCompiler(compiler_name=compiler_name)
+                 # Avoid check if target is newer from source.
+@@ -111,8 +118,11 @@
+                 # Don't actually do anything.
+                 cc.compiler.dry_run = True
+                 cc.preprocess(source, output, cpp_options)
+-        self.assertEqual(1, spawn.call_count)
+-        args, kwargs = spawn.call_args
++        if spawn.call_count:
++            args, kwargs = spawn.call_args
++            return args[0]
++        self.assertEqual(1, check_call.call_count)
++        args, kwargs = check_call.call_args
+         return args[0]
+ 
+     @unittest.skip("Currently a Python build time compiler is used as the default.")
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild
index 0b06f43d9a85..d9bca98ab8bc 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.86.0.ebuild
@@ -56,6 +56,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.86.0-tests-setuptools.patch
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
diff --git a/dev-libs/hyprgraphics/hyprgraphics-0.5.1.ebuild b/dev-libs/hyprgraphics/hyprgraphics-0.5.1.ebuild
index 82b7b8365924..8b4435de5e81 100644
--- a/dev-libs/hyprgraphics/hyprgraphics-0.5.1.ebuild
+++ b/dev-libs/hyprgraphics/hyprgraphics-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland graphics / resource utilities"
 HOMEPAGE="https://github.com/hyprwm/hyprgraphics"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	gnome-base/librsvg:=
 	>=gui-libs/hyprutils-0.8.2:=
@@ -33,3 +37,19 @@ RDEPEND="
 	x11-libs/pixman:=
 "
 DEPEND="${RDEPEND}"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/dev-libs/hyprgraphics/hyprgraphics-9999.ebuild b/dev-libs/hyprgraphics/hyprgraphics-9999.ebuild
index c631c4a30c65..9288ff2fcaa6 100644
--- a/dev-libs/hyprgraphics/hyprgraphics-9999.ebuild
+++ b/dev-libs/hyprgraphics/hyprgraphics-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland graphics / resource utilities"
 HOMEPAGE="https://github.com/hyprwm/hyprgraphics"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	gnome-base/librsvg:=
 	>=gui-libs/hyprutils-0.8.2:=
@@ -33,3 +37,19 @@ RDEPEND="
 	x11-libs/pixman:=
 "
 DEPEND="${RDEPEND}"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/dev-libs/hyprlang/hyprlang-0.6.8.ebuild b/dev-libs/hyprlang/hyprlang-0.6.8.ebuild
index 320a7618ef18..1299c8cdb9c0 100644
--- a/dev-libs/hyprlang/hyprlang-0.6.8.ebuild
+++ b/dev-libs/hyprlang/hyprlang-0.6.8.ebuild
@@ -19,13 +19,24 @@ fi
 LICENSE="LGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND=">=gui-libs/hyprutils-0.7.1:="
 DEPEND="${RDEPEND}"
-BDEPEND="|| ( >=sys-devel/gcc-14:* >=llvm-core/clang-18:* )"
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	tc-check-min_ver gcc 14
-	tc-check-min_ver clang 18
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
 }
diff --git a/dev-libs/hyprlang/hyprlang-9999.ebuild b/dev-libs/hyprlang/hyprlang-9999.ebuild
index 320a7618ef18..1299c8cdb9c0 100644
--- a/dev-libs/hyprlang/hyprlang-9999.ebuild
+++ b/dev-libs/hyprlang/hyprlang-9999.ebuild
@@ -19,13 +19,24 @@ fi
 LICENSE="LGPL-3"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND=">=gui-libs/hyprutils-0.7.1:="
 DEPEND="${RDEPEND}"
-BDEPEND="|| ( >=sys-devel/gcc-14:* >=llvm-core/clang-18:* )"
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	tc-check-min_ver gcc 14
-	tc-check-min_ver clang 18
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
 }
diff --git a/dev-libs/libei/Manifest b/dev-libs/libei/Manifest
index f36eb0546373..4926748c207c 100644
--- a/dev-libs/libei/Manifest
+++ b/dev-libs/libei/Manifest
@@ -1,3 +1,2 @@
-DIST libei-1.5.0.tar.bz2 184499 BLAKE2B 92f77c3af99c9c6dd17c5e49a2eb5b2f9b1c3f5d0a0c8e16a5384d05ab111e8577f8dd1e4b91847a2ff26ff20304582e14c6e6d6c807ee00a88f25404142ef01 SHA512 a75cd7256ff15fe8a10f8c944b1484520d3af7c4fb32dcecc9a4bc1dc4f92184599bbdb60765cdefc006cda7c79a308f2412bf6a63ff364fa286e93c378f6d6d
 DIST libei-1.6.0.tar.bz2 194749 BLAKE2B b9d86ea35a53c874fb52d8763439cedc4c0eabea803f5dafb1a331a19df5b2424ec78e3a6c1f3c07728bc899951e533ef20a6f05db2771a86701caa1444adba5 SHA512 9d7c1eb74438ac6fe031d329af922ca019406a14a0a5ef4a0ec6d743617cc9b91aeb5306be04e1afe6daf88e731ed8a38c808aa0280d683cb596a2644aec29d0
 DIST munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz 27724 BLAKE2B 9670c9b7a0b5d9ee6ec8df2dea9e241b043964ecf1fa3f6060ad1d16c40ab6afe47f53c6d4a791003e101a0b363263b858e6e4e445f868292753dd1ee7f7e3ce SHA512 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c
diff --git a/dev-libs/libei/libei-1.5.0.ebuild b/dev-libs/libei/libei-1.5.0.ebuild
deleted file mode 100644
index 6d7a0bbfae5f..000000000000
--- a/dev-libs/libei/libei-1.5.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit meson python-any-r1
-
-DESCRIPTION="Library for Emulated Input, primarily aimed at the Wayland stack"
-HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei"
-SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2"
-MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118"
-SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="elogind systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libevdev-1.9.902
-	|| (
-		systemd? ( >=sys-apps/systemd-237 )
-		elogind? ( >=sys-auth/elogind-237 )
-		sys-libs/basu
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/jinja2[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/structlog[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.3.0-skip-protocol-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/python-dbusmock[${PYTHON_USEDEP}]" \
-			"dev-python/pyyaml[${PYTHON_USEDEP}]" \
-			"dev-python/structlog[${PYTHON_USEDEP}]" \
-			|| return 1
-	fi
-	python_has_version \
-		"dev-python/jinja2[${PYTHON_USEDEP}]" \
-		|| return 1
-}
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-		mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die
-		rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=""
-		-Dliboeffis=enabled
-		$(meson_feature test tests)
-	)
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
-	else
-		emesonargs+=(-Dsd-bus-provider=basu)
-	fi
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# munit subproject is installed but not wanted
-	if use test; then
-		rm "${ED}"/usr/lib*/libmunit.so || die
-	fi
-}
diff --git a/dev-libs/s2n-tls/Manifest b/dev-libs/s2n-tls/Manifest
index fdddbb764918..354d15c45ce1 100644
--- a/dev-libs/s2n-tls/Manifest
+++ b/dev-libs/s2n-tls/Manifest
@@ -1,2 +1,3 @@
 DIST s2n-tls-1.6.0.tar.gz 5108926 BLAKE2B 3ba2e31607bf9807caa715f526171e930c10e8a308b7b5a451b737ec19c43688ab2641d82e201e584daa7273da88f7288d2e44b1c814cf016f922eb008b92973 SHA512 6675edc33284c04e9d2197079dcfec3c4327dcc54b9c330509fc3080b5fa699da2e28239939ef135f2d1c567d304ce5c604f78dde7b6ee483bd33e0efb920ba6
+DIST s2n-tls-1.7.10.tar.gz 4938244 BLAKE2B 475c343a0887f966c53e06021b73bf24401cab1d0a2ab5a55ae8a9c378a945e93c38347abbd0d27e706f56e1504647efdce30b5e03da35ff49e7a2f3024619d0 SHA512 fadd8cdd5fca93f7390fe726441f14da81093dd74ead83057fe19c5bcaae759b17b01b33f418ae09d77a22da51dd09db4debde2f5e978dfa12840b0b4a9628ac
 DIST s2n-tls-1.7.9.tar.gz 4934186 BLAKE2B c75bfd9a658f94ba667385072c65f6c470562fd0b80f4c507b92c21d8e9a8bd84b753db55b07c78c359c43c7b51bb7364d017cc4c8afccc529fe2383a48ce4e8 SHA512 b963727d39d807ab651000f9a6bf730c1ca03065bbb44f848efc825051328e22170880af37b6d10f2117c5cf3ccf85b081db0686e79d15249d5846eae64ef90a
diff --git a/dev-libs/s2n-tls/s2n-tls-1.7.10.ebuild b/dev-libs/s2n-tls/s2n-tls-1.7.10.ebuild
new file mode 100644
index 000000000000..458ef1a11418
--- /dev/null
+++ b/dev-libs/s2n-tls/s2n-tls-1.7.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2025-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="s2n-tls is a C99 implementation of the TLS/SSL protocols"
+HOMEPAGE="https://github.com/aws/s2n-tls"
+SRC_URI="https://github.com/aws/s2n-tls/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# stop overwriting LDFLAGS
+	sed -i -e '/set(CMAKE_SHARED_LINKER_FLAGS/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.49.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.49.ebuild
index cb56218db191..cfe8583806a2 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.49.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.49.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index d45d77169344..eaa152a501b6 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,3 +1,2 @@
-DIST wayland-1.24.0.tar.xz 241764 BLAKE2B 7ac6ac1f33cb2cae60e4058478655eeabd4f8f8e0fe07f6b9b386967ed4b31bdaac571dc2b812f3189534e3e53797822ca39f829207e45c24b494f039f82a836 SHA512 60216602cffd1473ae15381f9e9a6f3829e742cac83843ca65360ba78bcff8d9442f15eb6a6d5d29c8f74dd920762ca1605f51658d22a1d3c18e338505b9f974
 DIST wayland-1.25.0.tar.xz 609628 BLAKE2B d763149c9b06b431435e5b81aac32214774a1667bc85386befc2a2fef795c9c2df44e3e1fc9743c79fa5a491e44ea47f067ca92c9f3e31f57a6b999cbe781bf4 SHA512 20ae71ecc8b6d61b3e111171260911469cc7c3470048629db28eb4115415124e5a9392e1d9be84adb324cf1a29e557ae8e033e17c51fbab2fc80d9c6b9aad82c
 DIST wayland-1.26.0.tar.xz 612384 BLAKE2B f5a9179f5e82d564812dfdc0bbca2e4bed6ff9963b9a1ff181489774eb10946a37f5ec004a87354bf1e8ac012553926dcc6e65feb9eacdb9a18cbc034590a325 SHA512 50861b0c40cedec5f31b49ff1e99fc135a299fa4a8e2ff50ff4bac3f42e2f3f7be38271929fd2f6e58d83d5df516f643946ceba7937cc199581487c082c7ec31
diff --git a/dev-libs/wayland/wayland-1.24.0.ebuild b/dev-libs/wayland/wayland-1.24.0.ebuild
deleted file mode 100644
index 023cbb97849a..000000000000
--- a/dev-libs/wayland/wayland-1.24.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-inherit meson-multilib
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	~dev-util/wayland-scanner-${PV}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-	)
-"
-DEPEND="
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool doc documentation)
-		$(meson_native_true dtd_validation)
-		-Dlibraries=true
-		-Dscanner=false
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Tests create sockets under XDG_RUNTIME_DIR, and socket paths are limited
-	# to 108 bytes. A directory under ${T} easily exceeds that, so use a short
-	# one in /tmp instead (bug #664650).
-	export XDG_RUNTIME_DIR=$(mktemp -d /tmp/wayland-XXXXXX) || die
-
-	# Sockets are created at
-	#   ${XDG_RUNTIME_DIR}/wayland-tests-XXXXXX/wayland-test-${PID}-${SEC}${USEC}
-	# With a 7 digit PID, 10 digit seconds, and 6 digit microseconds, the
-	# suffix is 59 bytes. With the NUL, that leaves 48 of the 108 byte
-	# sun_path for XDG_RUNTIME_DIR.
-	if [[ ${#XDG_RUNTIME_DIR} -gt 48 ]]; then
-		die "XDG_RUNTIME_DIR ${XDG_RUNTIME_DIR} too long for socket paths"
-	fi
-
-	multilib-minimal_src_test
-
-	rm -rf "${XDG_RUNTIME_DIR}" || die
-}
-
-src_install() {
-	meson-multilib_src_install
-
-	if use doc; then
-		mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die
-		rmdir "${ED}"/usr/share/doc/"${PN}" || die
-	fi
-}
diff --git a/dev-python/aiostream/Manifest b/dev-python/aiostream/Manifest
index a0e46161fdb6..2daba4600343 100644
--- a/dev-python/aiostream/Manifest
+++ b/dev-python/aiostream/Manifest
@@ -1,2 +1,2 @@
-DIST aiostream-0.7.1.gh.tar.gz 46944 BLAKE2B f081eb96125ce4e5ccf77dcff6eedbba7c9a2a643ba1dde19139232b16b9be34a7803135d52857d2cd4a921da37441b040affe790a0a18dcf289bffe74e97229 SHA512 2859e6781a133fce70e9ba3af0f021b05f35b975298341400161ac0d1e4b884b93ad0f423beb4cd4bcc97c9f2050cd32f6fb9f6f55cee34ad1a9aeb14e549d09
 DIST aiostream-0.7.2.gh.tar.gz 47105 BLAKE2B c9369872a3fe2f12f3feaefbb4f267855d60af16ba3cd74b3d0d97ac4f40e3e4d9ddc6b22a5873c1faa22134e6bb65a47aae234cdc2709e5f60b3bc80ec230cd SHA512 667b9094c15be49db44444216ce7cef85e1c1298984822cc0fa800c03385b23c8c3cc3b20b95095a31e2af9e12438c774242bb1f27d0ceaa28da6b497718407c
+DIST aiostream-0.8.0.gh.tar.gz 47850 BLAKE2B a40721d0a487692bad082b499a5070f6566302b6b86d55c786814194511667e3491ee1f4c398dade6aaf45091a19ff63a418535cbbcebd8d5b81797b7eefbc38 SHA512 7882e3527c3e180b8afe9d14751beabf7839faff028dc8479756eafe6374aa6cfd28a363207bc29ba512d4f742a1abf18b6b720d0417f20fcf7b8d27ded4dccc
diff --git a/dev-python/aiostream/aiostream-0.7.1.ebuild b/dev-python/aiostream/aiostream-0.8.0.ebuild
index ba7515c52bf9..ba7515c52bf9 100644
--- a/dev-python/aiostream/aiostream-0.7.1.ebuild
+++ b/dev-python/aiostream/aiostream-0.8.0.ebuild
diff --git a/dev-python/b2sdk/Manifest b/dev-python/b2sdk/Manifest
index fc4cf285ad98..f5483080f393 100644
--- a/dev-python/b2sdk/Manifest
+++ b/dev-python/b2sdk/Manifest
@@ -1 +1,2 @@
 DIST b2sdk-2.12.0.gh.tar.gz 491790 BLAKE2B 07fb95e44751e48f20da5df8baf81235eed128c655e5993cf38cf78c26201328d377e50d3a243e7a8a3609e01f6a5a86bab3dc20f2b38feff89ce7aa697213f5 SHA512 cf1d37112dc5b6059bab5f6f5d970a29cfc89a9825ad6044c107d5f7a0a38024c7851e3d72b41a1c750d86bcd25d1234d37aabcddc9c77692e67abcd8b4df622
+DIST b2sdk-2.13.0.gh.tar.gz 497308 BLAKE2B c34f4144bd54305668f041a61a77b08871857ad08746e4deeaa83ca499ba09d985c4fcfa86d761c589248258296bd24a21093e7b52cad45296d011001fe62e22 SHA512 7e615a1fa43ff1288d5f34ea7530dc0ed90195db331f21eeaa26f32083a27fdbc5d18c81f30a591d7d10c84637af24bcc67db2597b23a8697ba04001c2c23923
diff --git a/dev-python/b2sdk/b2sdk-2.13.0.ebuild b/dev-python/b2sdk/b2sdk-2.13.0.ebuild
new file mode 100644
index 000000000000..1c369300e6f9
--- /dev/null
+++ b/dev-python/b2sdk/b2sdk-2.13.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2025-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 pypi
+
+DESCRIPTION="Library to access Backblaze B2 cloud storage"
+HOMEPAGE="
+	https://github.com/Backblaze/b2-sdk-python
+	https://pypi.org/project/b2sdk/
+"
+# No tests in sdist
+SRC_URI="https://github.com/Backblaze/b2-sdk-python/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/b2-sdk-python-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# pydantic can be used but it has a fallback
+RDEPEND="
+	>=dev-python/annotated-types-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/logfury-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-9.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/tqdm-4.5.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Requires network access and real API keys
+	test/integration
+)
+
+EPYTEST_PLUGINS=( pytest-{lazy-fixtures,mock,timeout} )
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/bcrypt/bcrypt-5.0.0.ebuild b/dev-python/bcrypt/bcrypt-5.0.0.ebuild
index 4ed674de68f6..1884b770076b 100644
--- a/dev-python/bcrypt/bcrypt-5.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-5.0.0.ebuild
@@ -84,7 +84,8 @@ distutils_enable_tests pytest
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_prepare() {
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index 76a7046cb6cf..8eb0ceab5a5e 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,3 +1,3 @@
-DIST blessed-1.47.0.tar.gz 14035743 BLAKE2B b6aeab48f2f1188598507c1ec11ff16837e9f49bc097f659e2fbee285bbb1acda59c058fabab4a9a390655821c2a9e9478056a76e1536b6370dede0ed31cef54 SHA512 887aa6ea815ab49b56b876d252f2cec8c2ddc266a8801e8d7b53e0f94c49ecc6a70e1c9f69d91d0aba02acf686c922c290aaa29b3f6c5e89f092bfcb570863d6
 DIST blessed-1.48.0.tar.gz 14036135 BLAKE2B e1a62915b81d77e4224db3fc1fb0b0a3d35877f09eaa4cfe0891787bd41ef6b5eb26c85dbfbd7fdbdc92e365c6674cbe45709e88bc0efc9591d41f10a34aca77 SHA512 24165346feb391cfbff335f32131b4475c4126f2538b257597970f9efbd04b9915aa9d9162e8e4e0f1c32923cd2a2e45c8705f27be21676e8c2e53e8a59e83cc
 DIST blessed-1.49.0.tar.gz 14055928 BLAKE2B ddc5793230d896f6851999c1f519178a026b38002e1149eae03d4ccabdcb56612e536f312d557896725cb88e8cd94bf16a743248d54351b5e324aa2e16a0915e SHA512 6a74f7b5ac374eb34f0d6558aec506e197dc9df809f4460f1d10ac5febf84e7f07afef62dc7423901a9cf3463a2872c87669c8e939d8bcc69213c64d093f00ce
+DIST blessed-1.50.0.tar.gz 14062021 BLAKE2B a16609378d7b73de78ae07970119fa64a77c5dbe775d7edf62894b7cbbfbc9989fc0630b38398c8139a50ffcb40e579c3b9039dd7249b60ad526b9cb9e0065f2 SHA512 dc8d6805d04d8681b190c30481899e261aafa973129ce825c392142ea8b1e3dec476c7a9fe442d14cf9a712fe872dc0e14099047b787b5dc2349c586d6ca0e3c
diff --git a/dev-python/blessed/blessed-1.47.0.ebuild b/dev-python/blessed/blessed-1.50.0.ebuild
index 8016a594c75d..2d966eb57b93 100644
--- a/dev-python/blessed/blessed-1.47.0.ebuild
+++ b/dev-python/blessed/blessed-1.50.0.ebuild
@@ -16,11 +16,11 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/jinxed-2.1[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.8.3[${PYTHON_USEDEP}]
 "
 
 distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 05788faf236a..fde47e16bc7d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -14,3 +14,4 @@ DIST boto3-1.43.90.gh.tar.gz 1226424 BLAKE2B 027f90499bd5b8e3389b65dbe06b3221efa
 DIST boto3-1.43.91.gh.tar.gz 1227750 BLAKE2B cc3273f932ae1c6f5a75211f52fcf2b1b7c33562a7c71d4cb3efeb4b20f8da47ae503f2e7542d925913e4107cb7340d2e2ebcf7e1f7ea6424481b9e06a0e405d SHA512 9aa16e9b42ca0b5fcfed14f1f5db0ddb5e1950c04da80231b25d3374ca770a146cabda3e7052b358ca721d17b29dbb2496bdee44201022001ccacf4cd7d7ee29
 DIST boto3-1.43.92.gh.tar.gz 1229218 BLAKE2B 1286e2d3a0d6e9f557660c6ad611e149d63fdaab11224ee9eb3bbae72a1108253cc631f44307d0790a3296f0ae99a8d4572a77c353d42a69527f9929dad0b51e SHA512 fd2caee8ba3d5a7fe7299496068d2e46d2b8a247ca5e554602d4dea81a4261f7b412fa6c8f0377bc08b9ac6b4e9ff87a8814951059f2fcec86ae4f7bdbe31cf6
 DIST boto3-1.43.93.gh.tar.gz 1230597 BLAKE2B 183d94cea0d706147a75674cb85a600ad21c2683618ba18a14e8630f23b19c94c11d0bc03ddc517194dad42dfb9445d1b34076b1f1b3ecbcec51ceccf30e5db0 SHA512 01612175497aada3b3fdf62ffcdb0626dc0fd5090d7d156d2a1f5fad4ec19b904ffecfd4b59880cf71ec07658bf00c2245bdd3c989a7513689ab59a2511e06ea
+DIST boto3-1.43.94.gh.tar.gz 1231556 BLAKE2B 759bb159fb0fc616fab031fdf398482fc559d9a08f8a66bc62d7d4d5284a8a08886eae757f47482cbcc60a45f8bf55df781d963a9b79c2ca7922ee54410b991b SHA512 7c642a77a6d6f218a3eff7f3477cba09b4b4f0f750313adc8f9904639c382566412db2e9aed98353cdd8f180c7fce0a7fd9793479b3dcbe50c08c51c1b13d4c8
diff --git a/dev-python/boto3/boto3-1.43.94.ebuild b/dev-python/boto3/boto3-1.43.94.ebuild
new file mode 100644
index 000000000000..93fbbe6dd59b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.43.94.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.19.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_PLUGINS=()
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index eaa72aeb63d2..7034f2a11b01 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -14,3 +14,4 @@ DIST botocore-1.43.90.gh.tar.gz 17119827 BLAKE2B ade6107a22be148042c1c67dfd60445
 DIST botocore-1.43.91.gh.tar.gz 17127799 BLAKE2B 7746ea5a5eccb1142bd440dfed2524cdea8bd37c558ef79645d173cf87404784b8ebc420a9e868da7465951ce907e2c33438ad78465c0082d5a2ff363df053cf SHA512 0e095317d1d77ae4a7f6e7605fd92b809f27034fee9e6414470fbc379e9a0bfffe00580e88c14ab96250c8ad39ecc105b7a7417a4f526807cf8f523516031606
 DIST botocore-1.43.92.gh.tar.gz 17135217 BLAKE2B 90d05a69153bc9ce4c1879dbc0af44fd876fb64439c94877e9ddbaceef1c6ef0b237807826a9b1fa67f706855ed87f20406e5b3c1de0e5a39197e2ae67c5a20f SHA512 2f2d7d6ec7b9309f0e95b2d8f84c701755ba28027c0ef0e340fe0f3e1bd78148c8fe8eb43a3bf7b036af4784dbb59076900e52702c43ff3c92e35065959616f1
 DIST botocore-1.43.93.gh.tar.gz 17142451 BLAKE2B eec2955aa252ff8bc49c24095006f0c75669f7946dcdaece4c7f640e724910b14c1b1b0b07fb8e6661d96e95fe148201381d70b4685a7282c2c64f2656fde57a SHA512 e021322d630deb94f738aa5096a7b72ffdeffbeaf5d3f6fbc9e835b7f41afa25a738d353e37b4fbd73b5b8889334ccdf4caec64d4c63e4e966e0e245c6117cf0
+DIST botocore-1.43.94.gh.tar.gz 17147633 BLAKE2B 2a872b6b2289e8a330ea901b32faaa3a1950782009103b27fdc7d54cd0d6163ce3f5fc3bc8ef722fc63fef76db805fce7c2e40854858b6b8c2bb293b264adbbf SHA512 6f63be5ab5f625c018de0c6e0046eeb2e6adfd1913bebe6b91615968309ba41c9ee1d36baa38abca6e714a43c679e88a1931a5c9fe4dde34fa98a9a562280854
diff --git a/dev-python/botocore/botocore-1.43.94.ebuild b/dev-python/botocore/botocore-1.43.94.ebuild
new file mode 100644
index 000000000000..a3a161f78545
--- /dev/null
+++ b/dev-python/botocore/botocore-1.43.94.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cachebox/cachebox-6.2.7.ebuild b/dev-python/cachebox/cachebox-6.2.7.ebuild
index c52bc77720d2..2a7757b34b06 100644
--- a/dev-python/cachebox/cachebox-6.2.7.ebuild
+++ b/dev-python/cachebox/cachebox-6.2.7.ebuild
@@ -90,7 +90,8 @@ QA_FLAGS_IGNORED="usr/lib/python.*/site-packages/cachebox/_core.*"
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 python_test() {
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 32bb5bae3641..d1a979c01ff2 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,7 +1,5 @@
 DIST autocfg-1.5.0.crate 18729 BLAKE2B 27580e39b366c6fca02c9db09997b6415c409f12068f1249184268bf96fd85ba659e25ec730f99e10caf452f96c486f3d7442bf09c4552b5f39519b21d6f88cc SHA512 f279856f234d39d369623576acf9546a1ca24d7fe449f36d4fb93ea75a7efaf2c4015b9616a69bbbed358c5e5882e16b045352f046aa4c049b3d13b1e8257b08
 DIST bigdecimal-0.4.10.crate 126514 BLAKE2B 3386e9df36307710a3076f267ce52cfc861d6b433fe65d0a1e7ab055f123af3689dc60b4b09761553dd53f05c295c72f7e8040428d04cfa09f958c747e31399a SHA512 706b7e33a2b375fc84ab6b617382145dd65e38e361498774493fad240a399e5a5e5f948604c831e9ca65eaa36df12ec7197c51fc80487680849129775d9256fc
-DIST cbor2-6.1.3.tar.gz 89503 BLAKE2B 3bb2234ff84c7b373ef5e5a95217c2a9820d7ebbdbfb866f797ce0174098a28dde3782b47500ff16f8d7de7d5ebdf3d7a1dcf4ef04f1c3f28f1760fcb33d6d07 SHA512 83416f8cce4c800f14b0538e7c03b4f45f4a72ceea2388e811d591ef441ec7df79512efcd0a2f79657ab1b8481217f7bd99f431307d0967a683601ced096fb66
-DIST cbor2-6.1.3.tar.gz.provenance 9461 BLAKE2B e97bd11c89c566c0a4dd5ba4e2a1d95b9761ea312be613472aca0f60e2421fbf4e9585cae43681ad24ac607155be30ace2374ace184f11e9d4a10f77d8229b4d SHA512 ae73e2b50dcb17d058fb78e008616c1040ccc505216efd929afd544fb5700f847dc694bc150eac4f9bd55ee587b717ebf2c752889d23f6c403924ff96415f881
 DIST cbor2-6.1.4.tar.gz 90840 BLAKE2B 847f17577739b416ce576e4cee417e4c5d1d983bd44faeeac03dc4b5747519e7e3937911e9622a60ba9d833453c840b13364ca4a2b81f1ca74b0065caa7fd712 SHA512 f16de2df37b45864f2580a96a7edb632ce961c8f858780912497584641cbb3f5c9c1f0eba37d9c20439e6efc96074c6a87f5b4917bf66c2e61059ed5dfa8ae32
 DIST cbor2-6.1.4.tar.gz.provenance 9661 BLAKE2B 6948293585a4a5d33c9f218db41a1a3ac9633dc282e051c788f1aec76deb625b0a6271387e9995d4fc140b5f22975265a4b34ad74ac781d46998e2787344fc84 SHA512 45c06eadee0c0ced0c97f2f0c2a74355bdd439adab11e288648e2e2a1049dc824b613d36234b57d11e128e8b656a25ccaebfa5139d7e122fb349e4011b00546c
 DIST cfg-if-1.0.4.crate 9360 BLAKE2B beadbfb273ee97cbb6e3740891fbace57511399ad203459b66b397587d794677a9515cde4e9ec4320c3795518bf1551d72b9a889f8ac4b225168f493288b7c19 SHA512 176e04df7ba783b7143bb84397b777f5c5a1305c08a5c3a218d4a66830620be89ed68992ba27686165bcd3fb2f34b2daf80b2a1d4b481ecc267c988e84d28e9d
diff --git a/dev-python/cbor2/cbor2-6.1.3.ebuild b/dev-python/cbor2/cbor2-6.1.3.ebuild
deleted file mode 100644
index a71765ea663a..000000000000
--- a/dev-python/cbor2/cbor2-6.1.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_VERIFY_REPO=https://github.com/agronholm/cbor2
-PYTHON_COMPAT=( python3_{13..14} )
-
-RUST_MIN_VER="1.85.0"
-CRATES="
-	autocfg@1.5.0
-	bigdecimal@0.4.10
-	cfg-if@1.0.4
-	crunchy@0.2.4
-	half@2.7.1
-	heck@0.5.0
-	libc@0.2.182
-	libm@0.2.16
-	num-bigint@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	once_cell@1.21.3
-	portable-atomic@1.13.1
-	proc-macro2@1.0.106
-	pyo3-build-config@0.28.2
-	pyo3-build-config@0.29.0
-	pyo3-ffi@0.29.0
-	pyo3-macros-backend@0.29.0
-	pyo3-macros@0.29.0
-	pyo3@0.29.0
-	quote@1.0.44
-	syn@2.0.117
-	target-lexicon@0.13.5
-	unicode-ident@1.0.24
-	zerocopy-derive@0.8.40
-	zerocopy@0.8.40
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-"
-
-EPYTEST_PLUGINS=( hypothesis )
-distutils_enable_tests pytest
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cbor2/_cbor2.*.so"
-
-src_unpack() {
-	pypi_src_unpack
-	cargo_src_unpack
-}
diff --git a/dev-python/cbor2/cbor2-6.1.4.ebuild b/dev-python/cbor2/cbor2-6.1.4.ebuild
index a71765ea663a..be06c5d6c846 100644
--- a/dev-python/cbor2/cbor2-6.1.4.ebuild
+++ b/dev-python/cbor2/cbor2-6.1.4.ebuild
@@ -69,5 +69,6 @@ QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cbor2/_cbor2.*.so"
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
diff --git a/dev-python/cramjam/cramjam-2.12.1.ebuild b/dev-python/cramjam/cramjam-2.12.1.ebuild
index 6bfaae68d05f..fc29c860b55a 100644
--- a/dev-python/cramjam/cramjam-2.12.1.ebuild
+++ b/dev-python/cramjam/cramjam-2.12.1.ebuild
@@ -171,7 +171,8 @@ QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/cramjam/cramjam.*.so"
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_prepare() {
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 09fa91ca8684..3b05a04efa40 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -5,6 +5,8 @@ DIST dulwich-1.2.13.tar.gz 1361288 BLAKE2B a87e2cdf3150cdf05a572d79bb65ce23760ee
 DIST dulwich-1.2.13.tar.gz.provenance 9634 BLAKE2B 17b7da9e754d622cea090b145067cc020ac95b783a180b82dfcf6cdca9241646cf6b6574530ca528ceb30eef2f437c968ad8c934c820fccb3b06b1813ff2e0b5 SHA512 054c0060ccbcc4e022e31aa334a2d909308a0d479f8838ff76aa6000ce89e69065225a166e0d686393f67c8ca7fadb50218db7d46465ef67e7f13b15327b52e5
 DIST dulwich-1.2.14.tar.gz 1361695 BLAKE2B df32f5624b285000ad3fa0d8d9608ad196a1bd1e168effe5d0b0b106db394ca4e8e815be21b0c0a6c0726a6b7861ade5d6ede19b30c73c9188081ed6b8584291 SHA512 8bea61b50759879872b7960bbb2bcd9d94570079e97ce2f0ab9ba7f5bd1dfa63eceae2253d461f1e7c6093d70cdb5295b7f4d9204330c2724a577873304de972
 DIST dulwich-1.2.14.tar.gz.provenance 9959 BLAKE2B 01bb7882dfa2b845aa32f936e07ad3f8e0c0099d42f3e51a89a73e1c412410de5a09a65d1250fbe34f46d9b15325638f3af4e8d445bbf5f820ec5d933c493625 SHA512 66ae3484f7bb2de0f48710ddfe2aabddfe82271c9d8234ade2dc78a2487b7aec467575b9d21f1cf0bd8fa5705e14f4e7f99377cdedd29c28cb5c4227a0037923
+DIST dulwich-1.2.15.tar.gz 1371420 BLAKE2B 3d8b0c7d8aacc48987497c68479edbc5a62e5a2e459676c678b42a0603b06d862295df01a7a906d802288d6a45139e5b88b8194a8f4ce8e24dd2254432666468 SHA512 b5a9e7f8762202c20ebbe8e465574c639771de0b2483daa63516380de4be953d5f304015aa06ebc5a8edbda4da81ab82a75bc8dbdb5974238efa364bad7e93c7
+DIST dulwich-1.2.15.tar.gz.provenance 9975 BLAKE2B 9433193f4f451e3aa02755313c982001563d014f66425e71d31ed8d6f41ed2d680ca728f1d513269754d7e5c848c21046830231394fc7db09dfe85922d316b1f SHA512 c14b41f443d5970d7c7e62252b307ab81321b5e291d7ac766fde9b09e4fea384bb1f5f0d09d2948ed22972e41eae3f755c443231049a4dd80d39a31dd3a1ad5a
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST libc-0.2.186.crate 821883 BLAKE2B ebe7aac5f8937a8064c64a0d4dc72e5fc794080e09b96c6d245bdec0fd9a19d49ab38e25306e22e47564764cf5dcde45855237cffc70230a143eca2626bd5c3c SHA512 6a58e671ec6811dff9a0d7d4db8f37d38bcbca9efff20dad4706190e5cdb77b426567754bcf0ef0f2d0c31d6506401f724f3ca500b9bed57bb8605b1141ed690
 DIST memchr-2.8.2.crate 99069 BLAKE2B 1a9567e9e05fd357df8ff8ef835316b3692e2df6e8a2a8783ddb2fa7596ac7bca88159b800a2b8ae070cb1ca09d8c48abea658b884cc091a6a12e40b5d35bd6e SHA512 011574c7b8519b19298e553d170c1defc5fd06698d4c00684715802de57b235562c8849ca7bc0ad2b77a05eb2f94af1f49289285803d4461460469248319a15e
@@ -13,14 +15,20 @@ DIST once_cell-1.21.4.crate 35010 BLAKE2B 9117ed1d478e626b7b7be2e3ff8b68a382b051
 DIST portable-atomic-1.13.1.crate 197001 BLAKE2B 6d0898c2a537a9bf204b7749cca5f5fddf280772b56eb7ce8fdd9cf7d71561137b26ef89f415c40277a1c89981333eef78e5bb4624515a294ba28fdaeb4c70ea SHA512 2a1b31ac9814af884640b3398ab824a9795c72d260527a0966b193113808cfbb3345d50cd1beaebb45863437c3d06c8706d34b26efecceefc649319a4bc274a3
 DIST proc-macro2-1.0.106.crate 59765 BLAKE2B 87f95795621c4c992c370dc3a1240a2d5580e3362356525efe640f8f26ad0492b3c88755d575c080ff7db11376b0d82f31141bf6f86c895249b85e46c081220f SHA512 b726e2c92af434bfa88cd4f53c3fe6db647503567675fb439890dee3d15f5111137e3242b28d164114ce081c10acf3fd11950753ddb349190c87ee04e7d97744
 DIST pyo3-0.29.0.crate 1241253 BLAKE2B 29deb7fa70010bf3d7e9e93bbcd87c0b56c4ee7ef0c2e5956181d2fb5f06f4c9b3f28bd1ad280126c26c048808b91b847e1fb69ddd617ef9e9e5e004cf4e48ae SHA512 e6822400de53ebcef4a14c899dc065abae621a126483873139f5eb850877c94f4bccee3a183d4e2a69eadcd3c3b82b0a6f3e1053d926b103be572329607f2f67
+DIST pyo3-0.29.2.crate 1255741 BLAKE2B 5187b7dc0f0b2b1441b451850f442a9cf7b8e65baab3c94996be80e39543350ce8739baccb2df0caae1049a4cf744274e4ca9a9d752887d09df5c03e380d42b0 SHA512 85326462a932fd49441f320a879192306a7a6f3a66468ca468fefdb3dff9a530b7895010f156c8c3b125279b94dd304b72825fd4bbdcaeba8e3a58bd8cdcc929
 DIST pyo3-build-config-0.29.0.crate 39616 BLAKE2B 7b62a5976b890db84e5256f3136185c2a9c3b7110782b5b0cdc314a5231fde30a853ddcd17af63b53488b3e8d5e310b01002b6f3c32cfeb1e5c3e168cd6460d7 SHA512 df77e8d7d5fe173749437ff6b90fa1703083377d515ab8a85dc77d9cac9c3fc331ede4b040f7e3694311ddb5adff577cf90c181a27c196ab93a4569e918fdea8
+DIST pyo3-build-config-0.29.2.crate 41104 BLAKE2B b4a78b704ae7c6cd8393abd436fc5d4e9f984ad6f4c95f1fd069888865a516f1a65eaebeecc7bb61e6a0d62d637ff4312a8d6a31f2dabb262d0f3c5177abdf39 SHA512 ecae961c373a87eb13ed3881ac4954112bbf54b3e02eb287d818e44e5ab46cd4700220da5072dd1fb22d68435d012a413a3680b54505c700ee059f1472833b6a
 DIST pyo3-ffi-0.29.0.crate 88184 BLAKE2B 5891af92a3bcba764c4701dcc0a99edbced010a5ac46df3217d004f5c3a368f18331733c6723bd49e522c6f7105455df13e2be0f07695ed5ce6ae71c15dec438 SHA512 baaf01d13ddc09316ba16b22e9ca15a67e5bda5b861ed7961c3393fd4692fc1c96952f81465d1dcb6531b9083f96c5630981b3d7802cb1ac2af67aafaffbec76
+DIST pyo3-ffi-0.29.2.crate 90029 BLAKE2B f20803f6866a99767ce814984cc624783c2207ab54909deaba0a674c3c8f3e98c56bac80e1ea0e13b295634b0c6a713bd961b6c58aacbbc3be5fa9e224ff86e3 SHA512 a5b1db7e856af10f32ba3ce6a4dddc48a11f48431b82cbc1e40be88370836902afc9ab2918eb953d7fbed1ad7daaebefdf70489c7c798e591782e7dd6e2d0ddd
 DIST pyo3-macros-0.29.0.crate 8915 BLAKE2B c12d23753d5aba7333183d4b41f16c8da1d4297a3ff86b3b150e9185c1978fc184ac198e566a41833292a8a78ab59446eafd5ef7169e5cb41493e7cbeaa68280 SHA512 fb6633ac76229d2e0ad88d51136a9318f03823b27c700a62cfbc957b4c834985e2f4c0cdaf5ea5e9993ec9e8ce3d63cd6b3fb823f2a042e65186adbed78da7c2
+DIST pyo3-macros-0.29.2.crate 9044 BLAKE2B f7caebd70dc9f54914d1d87e4c800f7bddc5d1e09835b0afd96e1f98320127660aa38f58b634ca196d823c926e279bf87c17506161a61bbae0908c51fc3b7eef SHA512 32281797e849ccb23c0ba03f8bea13ffcd86acfc3d5df65543c13befc03c142e88bfaf45f0cf5489cfe9e6acf9170ca6c24ced5d3f3f72be37bc7d2ce2bdb935
 DIST pyo3-macros-backend-0.29.0.crate 91943 BLAKE2B 7c2977dd9c80f3dd1f5375b0c65492b46048ca02e6355ad746bc8430cf92eaf25c701f416469eb69724fde5220651b1095c09eb9e3ff860176f862d7c7287407 SHA512 13a7af3958c09969637827d97ab9bbc664c407dda9e4283afaf495757798cf6f84932468bc092160fa75211ce0aafe6efc657f3a390234d77a67362cfb31fe0f
+DIST pyo3-macros-backend-0.29.2.crate 93749 BLAKE2B dce6aeef93fc8483dfffd5b514d21530ff499f241ac157e2ea304c8cd050e9fc1343d356a5a85dacb8a73d4d4405b89b4eab128f85fac54aa00f53298ab409a5 SHA512 944b8482e2a6fd0dce82eabe50f915d82b066cf11944e413ab81c01fc917dfe1877748cb8eb92f23d8acee43a9d1fb35f8690203ec440e7db7c66b03c7f27358
 DIST quote-1.0.46.crate 31628 BLAKE2B b004131fc9942e278d3a89e9a68ea76098b94a488a4e5577074f59983809d92bb4803f759c47426a683191cc23bbe9783bbebbcbcaed6488d45a0e01b787cd36 SHA512 f51e65743b9f15b491d20bb6c3a0df921cfec29df8bafca36c9dde034b5117fe3f4eedcc258126c6cb1729be1ffde5fcf7e5b0fb0c3de4a618f46ab3cd803e77
 DIST serde_core-1.0.228.crate 63111 BLAKE2B 8a64e4627ad21a3d16dd37d53fb809d11171bf337ec16bb1223075cbf81b6b85cd1c8d19abadf42460d0fbea323e2f351eeb6ef823389d519121b74e68edb215 SHA512 43897e3a7ebdc85d81d1cb30cda8f0a11610f6f551529c8a21462c24fb83110652b462846aa3e1bed5fbf8b5d7927018845a524ee9e079e2c8acf2c687efd6c4
 DIST serde_derive-1.0.228.crate 59605 BLAKE2B 166ee2f9ff9f7a0928d0a65a72db3d9226c377bca2a1771956e8ecd9c7faf0544673c9c21be2a5553e621b55c74c7b958052592a1cf6eb6427a2d4f3e3dc6bb8 SHA512 8bfdfeee10ee7ef0670972aa963ef63b13e8eb2c8a09b9e0b717f92551aa89b3dd2a0dcbae6ccf20a1caece07e6adb18f0db56fdac020e4e0281b0d24e376003
 DIST similar-3.1.1.crate 79833 BLAKE2B 7e8ae0e74b88ce0014cfd924ca6d8b2e807ab4709610dc82363358dc051cb1121e16c41f6a271e67483c0005d3e15e32d66600311393fc69e54872bf8e82b19a SHA512 f197b2dbca2c9a09314042ddd6d413410f952f284cf12b8d86b7a6a2584ba61efb4a29e8d3bc954fdde79265711a97fe1a3e94ef82e8ade9379a5981c7bb793e
+DIST similar-3.2.0.crate 100297 BLAKE2B ab05252abee1d7ef5fe2ce91b2305a6463b263c7e528e56a4e68559696a6fef17f45bad278d2d584d5e20bae05064495ffb272ff1a43c6626ced3a212aedd30c SHA512 d4308622122e803d2d4f7b6d7f2182823837f73f23248a862972af9e7e786bfc204c4889da2f0aa667a54ab48a0d0cac1f7499db490ad89bacbb05b57b773e51
 DIST syn-2.0.118.crate 305533 BLAKE2B f0ba994123a9ade5ea94e72f91d836c5af769ccca4c8c8d9ba8ae8c2bf2c7cfc88d4b068efa886e3c25c5635b2759b1bbf6b7b4afea6b66fc5084ad744272ba8 SHA512 24cbedce5f751fb5fab46ce27b9772fb59692e5520039a4d66a9f4d8d8b381d2af5c5be5eebd1e24cdba49fcb40a90b38f61477dd5dc96d8f272823f9a93b61d
 DIST target-lexicon-0.13.5.crate 26928 BLAKE2B f8c62cb91f68a635e6ce3fc254df9ce378b5e8f62c1147404c967484b9ed97fb33d7993b4671611db76566063e999d658d201f856f70196ec678d72cc758cf6d SHA512 956df27c01e1186c5356117ffd07810fc0b62fb919d5bfd215955ba85be00ef675212a3c0dc36679986be7b825442fec5c93c7643b7e1e19c04572e6463546fc
 DIST unicode-ident-1.0.24.crate 49298 BLAKE2B 34ba2906a3ebc06f52a4ba77dff96a8f3fb977718d260886fa9e051c5830765641b65a63977110f3a79f31fa177b385f81b01d56c80f6a0324d36eae72e2ebf0 SHA512 7be712d8d0075ac9341790180e312f66264d3e0255c91b38df0951baa5e446dec24551bb2125a66a1cb9b6ca2f1ea37c0cc15fa3dd74f398ecf4d5302c7dc259
diff --git a/dev-python/dulwich/dulwich-1.2.14.ebuild b/dev-python/dulwich/dulwich-1.2.14.ebuild
index 332679df12ab..deb2b7bb7430 100644
--- a/dev-python/dulwich/dulwich-1.2.14.ebuild
+++ b/dev-python/dulwich/dulwich-1.2.14.ebuild
@@ -93,7 +93,8 @@ pkg_setup() {
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 python_compile() {
diff --git a/dev-python/dulwich/dulwich-1.2.15.ebuild b/dev-python/dulwich/dulwich-1.2.15.ebuild
new file mode 100644
index 000000000000..8c3dff5fc7db
--- /dev/null
+++ b/dev-python/dulwich/dulwich-1.2.15.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=1
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_VERIFY_REPO=https://github.com/jelmer/dulwich
+PYTHON_COMPAT=( python3_{13..14} )
+
+RUST_MIN_VER="1.85.0"
+CRATES="
+	bstr@1.12.3
+	heck@0.5.0
+	libc@0.2.186
+	memchr@2.8.3
+	once_cell@1.21.4
+	portable-atomic@1.13.1
+	proc-macro2@1.0.106
+	pyo3-build-config@0.29.2
+	pyo3-ffi@0.29.2
+	pyo3-macros-backend@0.29.2
+	pyo3-macros@0.29.2
+	pyo3@0.29.2
+	quote@1.0.46
+	serde_core@1.0.228
+	serde_derive@1.0.228
+	similar@3.2.0
+	syn@2.0.118
+	target-lexicon@0.13.5
+	unicode-ident@1.0.24
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/jelmer/dulwich/
+	https://pypi.org/project/dulwich/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="GPL-2+ Apache-2.0"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions Unicode-3.0
+	|| ( MIT Unlicense )
+"
+LICENSE+=" )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples +native-extensions test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/urllib3-2.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.11)
+"
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/fastimport[${PYTHON_USEDEP}]
+		dev-python/gpgmepy[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6[${PYTHON_USEDEP}]
+		dev-python/merge3[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP},server(+)]
+	)
+"
+
+distutils_enable_sphinx docs
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so"
+
+pkg_setup() {
+	# avoid rust_pkg_setup which will die when there's no Rust found
+	if use native-extensions ; then
+		rust_pkg_setup  # implicitly inherited through cargo
+	fi
+}
+
+src_unpack() {
+	pypi_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
+}
+
+python_compile() {
+	# make extension build errors fatal
+	local -x CIBUILDWHEEL=1
+	unset PURE
+	if ! use native-extensions; then
+		local -x PURE=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
+	unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
+	unset EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v tests.test_suite ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/faker/Manifest b/dev-python/faker/Manifest
index 57e80a2036fa..dc59ab34a53b 100644
--- a/dev-python/faker/Manifest
+++ b/dev-python/faker/Manifest
@@ -1,3 +1,4 @@
 DIST faker-40.36.0.tar.gz 2025903 BLAKE2B fb7877800cd1f2baf4ab5497d5996b968721396da21ead130d419537490c8bfe7d1d9a14c8799b70144e84be311b0c3ed6e5d6638f4a01802507ea5baca264bd SHA512 889e96ba9497dea82a909b47a183b6a6872b5b9f47fca4cc52285968b8f00f0898fd9e6b831769f775b4f298d0ec7e0ba19eafa2ffe3d0b08a9d023a7a131ba9
 DIST faker-40.37.0.tar.gz 2025920 BLAKE2B 2b9456eaaa83cc0904a03462f9407a639126dd36820246b75fce3687287ac1b323a27ccec1390816628f13901bb2ce5cf767f85d73d6cffe038aa6d724a80bc4 SHA512 35458e864afadc9ee73b3ed40e3f99387f46ec122e6a1a29efa0dae47a4535c733bd61a72f5aa5629aef9c63de0696404512b1dff32ba9014cb056483309ed12
 DIST faker-40.38.0.tar.gz 2029190 BLAKE2B 5cf20928b68bb9bfd899e4e2a597cf4e61ad606036b03632f9b2cb9ae853ecdabd3be0201c878bf8c0f6f68b17e45def090500c687e89187880a60358044c9bc SHA512 40007ace30ca733e0a7a8f5dfd4aeda628ee9a889b47f4e7f8bcfcc19630ce17da908856b15e6d9a07141dceb4da89bc8af10d070a0ed36b11170851cd05d981
+DIST faker-40.39.0.tar.gz 2029463 BLAKE2B f4d5df1d00b456d973153a33b7642b0bee11c1439191d179914f54365a1302fe8e0a01cecb77ec61c7d567b672cd03ec28367431c05fdcd6ba5bffd9ed2e6ef2 SHA512 7a7b85f598940bd0b8f1a4dc01b49ad917cff593eff54f33a6a6ceb3a647c12a74e836778c5947fe04c7bdb67167455f413b3ba33335715c1e59ff4adfb337a3
diff --git a/dev-python/faker/faker-40.39.0.ebuild b/dev-python/faker/faker-40.39.0.ebuild
new file mode 100644
index 000000000000..aba1396e5071
--- /dev/null
+++ b/dev-python/faker/faker-40.39.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/python-stdnum[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+# note: tests are flaky with xdist
+EPYTEST_PLUGIN_LOAD_VIA_ENV=1
+EPYTEST_PLUGINS=( "${PN}" )
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	epytest --exclusive-faker-session tests/pytest/session_overrides
+}
diff --git a/dev-python/fastbencode/fastbencode-0.3.11.ebuild b/dev-python/fastbencode/fastbencode-0.3.11.ebuild
index 93851a263943..9c4fb52da71a 100644
--- a/dev-python/fastbencode/fastbencode-0.3.11.ebuild
+++ b/dev-python/fastbencode/fastbencode-0.3.11.ebuild
@@ -70,7 +70,8 @@ pkg_setup() {
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_prepare() {
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index b1786660c322..51463cddbe3f 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -6,3 +6,5 @@ DIST google_api_core-2.35.0.tar.gz 192600 BLAKE2B 3b124dabd34faba1b46b00c6cf4c1a
 DIST google_api_core-2.35.0.tar.gz.provenance 6093 BLAKE2B f40b129971da678fc75f68ba2b84bf408f5d00a5c713f4832d2a9c3e33e0bb35a279471d84317d0b1824d6fa5eef7fa62e1919aab7df8843a16d7efe384e5258 SHA512 1559570c5be55e094e23f38462e9b0189de0d2c2bdd8ea4bee01640eb9485fc1e2ca0222f71d3a83641da325ffddbe2e13ec07702917b57e5cad99dbde6dbe0e
 DIST google_api_core-2.36.0.tar.gz 196879 BLAKE2B b9026e37bec28104b81040536544938b319e6e559296c846991c74147399eb07042e8f2b9810af6e13f5d5936918d088f024005e999ee8bf497079431d22c15d SHA512 119d446ebd67bdd2f527d8bbc05e7877e1fa528e9421dabbef95597cf2e1a4555fe630f9e573b10836b98a65aa437c3a7d72a89a06d700cbf5214fd7084a44ca
 DIST google_api_core-2.36.0.tar.gz.provenance 5964 BLAKE2B ef264b3a188a19058f713cd8f83323e71734276d465b72f77b99a37c2ece8f0b9e25a70faa3879305621f84f1f99fe31029ec7c4f5c435565518c83a0ec4c17b SHA512 63ddeb9323376f41ce5368674f4a29cf5a8bfa0d9a4b60f3a469e4a11e2c8aaa3288cad03159ef4da605f93726ad1e4d46952403c2c00b90147014dc8e641835
+DIST google_api_core-2.37.0.tar.gz 203563 BLAKE2B ba146807ce2492ddf6b3f20bf755bbc94d87e4954502b48eb64aa849b4903deb4f6b636d1e29490464142befe1939410b18b13459c6330187440dd3e4aaff774 SHA512 eac0fdccc3cb91f90798f24b59820c21d10e57bfdc4ef82ec99275fc5e973d97f0b8101d8cf0544f9ddf3aa31cc769d67a20f4652b45d5a90edee74b2310c413
+DIST google_api_core-2.37.0.tar.gz.provenance 5874 BLAKE2B 69e200997fbface49b057ecb9a71e8e4831165a4a35f70ae9a8d47e5ed014eff9ffc8aa6e1d91babfb0f48b253b8ec2f55dbeb9f237e188a4af13a85174efbc8 SHA512 ae9e22056daf16c716651bb469c7d5429d5bae483c5dff67b063c3721fecf3b4a9f2b6f0c18256a78f8adb4563f856366826d947cb716433ddebfff3484b391f
diff --git a/dev-python/google-api-core/google-api-core-2.37.0.ebuild b/dev-python/google-api-core/google-api-core-2.37.0.ebuild
new file mode 100644
index 000000000000..2b11a77adbaf
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.37.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_VERIFY_REPO=gcp:google-cloud-sdk-py@oss-exit-gate-prod.iam.gserviceaccount.com
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/google-cloud-python/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="grpc"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.69.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	<dev-python/opentelemetry-api-2[${PYTHON_USEDEP}]
+	>=dev-python/opentelemetry-api-1.44.0[${PYTHON_USEDEP}]
+	>=dev-python/proto-plus-1.26.1[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-6.33.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.33.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	grpc? (
+		>=dev-python/grpcio-1.75.1[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-status-1.75.1[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		>=dev-python/grpcio-1.75.1[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-status-1.75.1[${PYTHON_USEDEP}]
+		>=dev-python/opentelemetry-sdk-1.44.0[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-{asyncio,mock} )
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# The grpc_gcp module is missing to perform a stress test
+	tests/unit/test_grpc_helpers.py
+)
+
+python_test() {
+	rm -rf google || die
+	epytest tests
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 2985058cb870..9ef152ddd21a 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,2 @@
-DIST greenlet-3.5.3.tar.gz 200270 BLAKE2B cfcda747255fcae1406edaab4b934cf88d12ccf5cfcc81ed7575404ae24444ee763bed47666a5ab9911a6a2a0aa3e82a2e973358163932d600b035e06610635e SHA512 a6c2d188c0edc71e3820baa43f130b87d902c9b4dcc4e1f8bc627c0198266d088d6e9a635ff5c1ad939ee5ac019704c5abd7ecdd73f6e54bf08ccb86518b7fed
-DIST greenlet-3.5.4.tar.gz 206538 BLAKE2B ac8781e0fb45b0e1ecf0dda9b30daa658ffc708fb1d48d742d8da1377c4498517bf689d1bcb83cb3d1005ddc34e18d372e78a5ccbcab1a9fa64893d7e8df8d3f SHA512 c7681567f21533eff0fbc235c212f036b8547c05f846d599f8942fa37b2c15e6cff45bc4aa5986d885aa15158a1f6cd8a628bb58056351364edb106fef27a7e0
 DIST greenlet-3.5.5.tar.gz 207585 BLAKE2B ad401a20f6b3731aefe1c353d95d889772ebb45153315547947d1ae2ed598286e677eabc869c417b747c59b53217aaea97bc3e32de2c0dde02a5672740d7e3f9 SHA512 c3d58ce72041b0d2737861c417954df8a75d12ff6e51a0a8e69c7985cf195d07dd42b1b8a7597430cd8a577fd3110383e31d538c6a1cd8fbd114179fd4445a18
+DIST greenlet-3.5.6.tar.gz 207653 BLAKE2B 315978a3ec8f28955278397ddb7db5edb50a210dde4c2c11776c5bd65d25b23d619815cf57d277e4a613e158ecbfefb6a29c2bf317d91fccda73eeda2523fdbb SHA512 20ff04967858c07265e3e66e4c990301dd459b21f3a7048cca85e018f3318e2a6cd3df64ecdc4016d8a42c1639f28d5a89092c84ba4796b9dcc9677ddaadb8df
diff --git a/dev-python/greenlet/greenlet-3.5.3.ebuild b/dev-python/greenlet/greenlet-3.5.3.ebuild
deleted file mode 100644
index c69f59979da2..000000000000
--- a/dev-python/greenlet/greenlet-3.5.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="
-	https://greenlet.readthedocs.io/en/latest/
-	https://github.com/python-greenlet/greenlet/
-	https://pypi.org/project/greenlet/
-"
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# patch cflag manipulations out
-	sed -i -e 's:global_compile_args[.]append.*:pass:' setup.py || die
-}
-
-python_test() {
-	local -x GREENLET_SKIP_LEAKCHECKS=1
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenlet/greenlet-3.5.4.ebuild b/dev-python/greenlet/greenlet-3.5.6.ebuild
index c69f59979da2..33588218e841 100644
--- a/dev-python/greenlet/greenlet-3.5.4.ebuild
+++ b/dev-python/greenlet/greenlet-3.5.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/grpcio-status/Manifest b/dev-python/grpcio-status/Manifest
index a819fa01cc1e..0521c0448c60 100644
--- a/dev-python/grpcio-status/Manifest
+++ b/dev-python/grpcio-status/Manifest
@@ -1,5 +1,4 @@
 DIST grpc-1.80.0.gh.tar.gz 15772645 BLAKE2B 48f3acc5c3268f651dc865ce3095c306ad3fa0a4eacf6e6eea499d961c0e001e2ab43fe8f0d53713d19998f28ce0184045ad2a8ef4cdc41aee31e2fe70e2b53e SHA512 5ef6ec2277dcb2257f8ac7546057e9a3da6668676a3a4ff64e08e66abb465b5705103c4aa0b41955535ee437d4feef5b811aa3e31636c4cb76bf68c52caaccf7
-DIST grpc-1.81.1.gh.tar.gz 15840192 BLAKE2B 900ca16869e1295428054c2bb4c4363ec855878faef2705cdd81249d46596958c25983dbbd87358d942caae6d5910a781d45da71f8e2a4b714affba02aba0dd5 SHA512 2fcc219bf91de49607ed1f74243c2d43c0fb0def4944e48fbd4b382033d648f0e0b8551426993d04db49b9cae8d8b9efe20a817f6985ed3c72f086bf8ea2e26e
-DIST grpc-1.82.1.gh.tar.gz 16053195 BLAKE2B ae8495a950eab7b6d0b202deda766532de36c5ba37130d58d4790d5eabb65e3dff2615b33ec473df8c7056fb252ee98689b93064d1734ad7c1f3375cd3ad2801 SHA512 f776f2c329247292cad3649e0bdee75ba37360eb2ee13b1f8750b2a3a2cfd63a0a51295dc71cc9ca0d9477a4a882c4ecaf3ee6f23322926c126146bace0c94a6
 DIST grpc-1.83.0.gh.tar.gz 16249899 BLAKE2B 6eb5aad73d603fe55ae7e88315a193346c4ae63f28b0800c48a5f9f915caaaf5b05aca4d26fe4be97ec6dd1006e4a85d0b27fa414df4a823358ba33f9a5fd2b2 SHA512 6bc1fa040a5087522f8b8292e00d289105e1343883290432e8327f9bca23248b31c95ef8d6954cad1fc9be7a4c1042cbfedc458da2e11de251e980a44ec753a4
 DIST grpc-1.83.1.gh.tar.gz 16254795 BLAKE2B 2a8382cc0504c60272b84e699c8aaf5c7256d296357d914e6d3d63387f032be468e096f8147ffac5bfb018be375d0b24b6b135605346c2612e1ccceb0a54615d SHA512 2afa0e389beabfa6f16e845338b456a8b397ef66ca533c9ecac4461d9fa568b4f5a28bb64401d3d91122c26d65e66ce887f2680af0b5fb6069cdc8d01ac21032
+DIST grpc-1.84.0.gh.tar.gz 16364079 BLAKE2B b3b7aba77c8bc46662f58420ecaf3340a407bf8720a03e2d9a6c6355629254b4a5a6ab6e1e86d7d830be675ca20573deaf93bebb3be7875bf9915e9b733fb583 SHA512 59134070566c0f9964ee80d376162ff07c3627d3fc7e6bd4c238018fd798a1d2adbade1a413997ecbff040b2f8df0fd0a04fdc0c20e6d40b376d73ea4fd77570
diff --git a/dev-python/grpcio-status/grpcio-status-1.81.1.ebuild b/dev-python/grpcio-status/grpcio-status-1.81.1.ebuild
deleted file mode 100644
index 44049e1200fc..000000000000
--- a/dev-python/grpcio-status/grpcio-status-1.81.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2024-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
-
-MY_P=grpc-${PV}
-DESCRIPTION="Reference package for GRPC Python status proto mapping"
-HOMEPAGE="
-	https://grpc.io/
-	https://github.com/grpc/grpc/
-	https://pypi.org/project/grpcio-status/
-"
-SRC_URI="
-	https://github.com/grpc/grpc/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/src/python/grpcio_status
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/googleapis-common-protos-1.5.5[${PYTHON_USEDEP}]
-	<dev-python/protobuf-8[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-6.33.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${WORKDIR}/${MY_P}/src/python/grpcio_tests" || die
-	epytest tests{,_aio}/status
-}
diff --git a/dev-python/grpcio-status/grpcio-status-1.82.1.ebuild b/dev-python/grpcio-status/grpcio-status-1.84.0.ebuild
index daa9f2d13263..daa9f2d13263 100644
--- a/dev-python/grpcio-status/grpcio-status-1.82.1.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.84.0.ebuild
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 371e75a72796..6c28dc176035 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,15 +1,12 @@
 DIST grpc-1.80.0.gh.tar.gz 15772645 BLAKE2B 48f3acc5c3268f651dc865ce3095c306ad3fa0a4eacf6e6eea499d961c0e001e2ab43fe8f0d53713d19998f28ce0184045ad2a8ef4cdc41aee31e2fe70e2b53e SHA512 5ef6ec2277dcb2257f8ac7546057e9a3da6668676a3a4ff64e08e66abb465b5705103c4aa0b41955535ee437d4feef5b811aa3e31636c4cb76bf68c52caaccf7
-DIST grpc-1.81.1.gh.tar.gz 15840192 BLAKE2B 900ca16869e1295428054c2bb4c4363ec855878faef2705cdd81249d46596958c25983dbbd87358d942caae6d5910a781d45da71f8e2a4b714affba02aba0dd5 SHA512 2fcc219bf91de49607ed1f74243c2d43c0fb0def4944e48fbd4b382033d648f0e0b8551426993d04db49b9cae8d8b9efe20a817f6985ed3c72f086bf8ea2e26e
-DIST grpc-1.82.1.gh.tar.gz 16053195 BLAKE2B ae8495a950eab7b6d0b202deda766532de36c5ba37130d58d4790d5eabb65e3dff2615b33ec473df8c7056fb252ee98689b93064d1734ad7c1f3375cd3ad2801 SHA512 f776f2c329247292cad3649e0bdee75ba37360eb2ee13b1f8750b2a3a2cfd63a0a51295dc71cc9ca0d9477a4a882c4ecaf3ee6f23322926c126146bace0c94a6
 DIST grpc-1.83.0.gh.tar.gz 16249899 BLAKE2B 6eb5aad73d603fe55ae7e88315a193346c4ae63f28b0800c48a5f9f915caaaf5b05aca4d26fe4be97ec6dd1006e4a85d0b27fa414df4a823358ba33f9a5fd2b2 SHA512 6bc1fa040a5087522f8b8292e00d289105e1343883290432e8327f9bca23248b31c95ef8d6954cad1fc9be7a4c1042cbfedc458da2e11de251e980a44ec753a4
 DIST grpc-1.83.1.gh.tar.gz 16254795 BLAKE2B 2a8382cc0504c60272b84e699c8aaf5c7256d296357d914e6d3d63387f032be468e096f8147ffac5bfb018be375d0b24b6b135605346c2612e1ccceb0a54615d SHA512 2afa0e389beabfa6f16e845338b456a8b397ef66ca533c9ecac4461d9fa568b4f5a28bb64401d3d91122c26d65e66ce887f2680af0b5fb6069cdc8d01ac21032
+DIST grpc-1.84.0.gh.tar.gz 16364079 BLAKE2B b3b7aba77c8bc46662f58420ecaf3340a407bf8720a03e2d9a6c6355629254b4a5a6ab6e1e86d7d830be675ca20573deaf93bebb3be7875bf9915e9b733fb583 SHA512 59134070566c0f9964ee80d376162ff07c3627d3fc7e6bd4c238018fd798a1d2adbade1a413997ecbff040b2f8df0fd0a04fdc0c20e6d40b376d73ea4fd77570
 DIST grpcio-1.80.0.tar.gz 12978905 BLAKE2B 2583bbdfcb05aaced115b4a4ab7d26b95efbe35bf7c2bd7989d9791d50553e05ba3e6323ce8b52c78459b34b5daeb1566ffd1e2b17c14208a13e4a06f0a2a6d5 SHA512 04ef676d6847f3d2820998c07d9f80585c105dc43e3f754b517566e86a92af94328ecdecba0b772e0abe2a53eb49102a12db93099b50d5bee576ac69cb928db5
-DIST grpcio-1.81.1.tar.gz 13026582 BLAKE2B 8aa2754b7232a211c23852da22e7aa1c73ed630a2ccfceaf99ad80b23ed5845aeacdb87ec34d748357c6573b436bee38bed148c65d54cc438f3badeeb977435d SHA512 7b34b02a5ea487ef98fb6c1017ddc0127f292f54968d71c08ff5cbf9efa016c49a562f67165564d1a6ff219f24be1b2a6a525f12c251699893c8772d226baa41
-DIST grpcio-1.82.1.tar.gz 13187300 BLAKE2B 3e53868afd2e06460b613a40c3913c92feb154e145b8bd42e6cf6c9d098047e9895151e37dca0a999f58f618ae7b149aaa6ec3d28ea426569061d867753817fc SHA512 ebd36dc0028a1e40ce27f2ffcf2ba7a280c84a4e8d854b8c44753b52e2cdcf24b7d9188acf5456bc090ea7d68afc158d0b694cf12f1f550722c1f2a8eb18e560
 DIST grpcio-1.83.0.tar.gz 13428824 BLAKE2B 0ddce59208ec61621e85c07cab32da67381e09ef22e47c2cc3dfac355fe2a4acd52b5fce80e1eb46e75263041aba50ebbb0839dae91124ea273847f472e3a308 SHA512 b9fbe71ea6c745473884400839b535fd305bff1f8e0ab35d9a8f1fbab5f5e30a6d2be1931a0fd48763493c8869049813814af81e5c99209a913541a3179df8d8
 DIST grpcio-1.83.1.tar.gz 13445033 BLAKE2B 6d40c7fe05a85698925de774945595854838b161267c20213388306660bba9105fbc5f7f3d0941f5db7f0188d2be7b10f926ac5f5448c99eec9a7dd51f817a28 SHA512 b01a71938a4a1df648054e53c67a6fd070da2da1e09bb10c39519ed3f75735a4d05fd4446539235627395869b911286e671993f31e58a68072c5094af0a28e22
+DIST grpcio-1.84.0.tar.gz 13493876 BLAKE2B a2e7034727a1a55c91b517b93f897426aaac582c2d423a60ad0b0d0f3f2f9d2922a2bebbf169c0945de12f6e65c03f296ba26783bedb0ce38a00cd23cd6e2a3e SHA512 25ffad1f00b00fe106bd6fa4d07e41078aa134d3ea61a1b325cccd42dcb55ac3bffbf1d17326066d2ba7cebbaf925c6c2333a40c22cbc8f67644fec04104ca2d
 DIST grpcio_tools-1.80.0.tar.gz 6133212 BLAKE2B 9bf051314482ff946aa6edd4f8b517dec63c1188914d76a2b4d130b68408ee5ec3ec3b5a2075b7ec2257e92ee9dbad37c18c425a2b947b81640f67cadd284df6 SHA512 7d9e17cee024af6731a8b75da6de0c26b554f2c50d75acfefc7708545935af4ab8f60fe0e16550c4c2943eb6c3414c49c38dc1a71df948c87c6c743ee72fff68
-DIST grpcio_tools-1.81.1.tar.gz 6236155 BLAKE2B e95db929827c7f465473e0640d2fd53df1d9e6f6ee80f1f3b49709e496f678d248c78c37e90b6f96cd2348fb903bd6e8047b3490353f1c436fe0e0781a26069c SHA512 ca68845b4beef98cd83d4dbdb9d12449ee9289dcf81ca4723617a35a1c576bc937fbbcac12ab0e304d2b7f49993a8a8fbcb00b7021ea141a71196c2a93fb8cdf
-DIST grpcio_tools-1.82.1.tar.gz 6399590 BLAKE2B 4a731b32ddfce566c2405c33736b7dbcf66ef5a63e49b45673996d3fd46d948286a777cea1114f8e3cb1b8583bdea737470dfe8dd406c9737d970bee285dfd67 SHA512 bfc8b9353530b5d8b3eef2fdbc4d442ec6219d0d393c272ef0ed1309041bead71472c920a0e735f5801fb40e094a6ec0176daf8bc9ad93bd8dbd22030806fee4
 DIST grpcio_tools-1.83.0.tar.gz 6400437 BLAKE2B 537209842337e749b0689d7e114395f8eeb6435d3bbcb4d8a857e487e58fc10b31b65fa313ea51f483f048125ea2a2351c88690020e6cc16e7782021c0377d51 SHA512 f18ba3130d1134eaced50f19dbc64edafffe4ad4a7edf66641316c980b0a4a1fe8c3bba21162303841e929a94de689ed1e2d015b2cef7534c9bb99a27e9f4365
 DIST grpcio_tools-1.83.1.tar.gz 6399877 BLAKE2B 66b3f52f76ca0d342d74b7e61d2bfecfea1127a938742d824c67e695601349dc6d0625c8ea141960d3e88702e2b9a260d12c079beec0c114427ff50e89df66fc SHA512 828d6f5e382eb28eb7366e479a51e17fe7e7baeef08aae33f02b3f0b54604afdb54910632670f09ba26bd568d1c45fdd7f49a8b2bad46f73d55279d612b287df
+DIST grpcio_tools-1.84.0.tar.gz 6401750 BLAKE2B 900df1a351252ddba7a63d7e656c999c9c6946a78c7d65d4b6239e65e42e947149d65d40fdd3f42615fc64d9fbd7d0aa77322c39171a3b761aee38ac8086a3e1 SHA512 2782982639bda49feaf979d50068598a1fbbd015c8ecb7abe244c70987d6c01a2ee9186ae4f7206d33927cb8186ade17dfb10723970b47faaae70737eb2a8f70
diff --git a/dev-python/grpcio/grpcio-1.81.1.ebuild b/dev-python/grpcio/grpcio-1.81.1.ebuild
deleted file mode 100644
index df192ea67fb1..000000000000
--- a/dev-python/grpcio/grpcio-1.81.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 flag-o-matic multiprocessing pypi
-
-MY_P=grpc-${PV}
-DESCRIPTION="HTTP/2-based RPC framework"
-HOMEPAGE="
-	https://grpc.io/
-	https://github.com/grpc/grpc/
-	https://pypi.org/project/grpcio/
-"
-# Tests need other packages from the source tree, so use a GitHub
-# archive.  sdist provides bundled library sources (git submodules).
-SRC_URI+="
-	test? (
-		https://github.com/grpc/grpc/archive/v${PV}.tar.gz
-			-> ${MY_P}.gh.tar.gz
-		$(pypi_sdist_url grpcio_tools)
-	)
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-DEPEND="
-	dev-libs/openssl:=
-	net-dns/c-ares:=
-	virtual/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-"
-# TODO: try to remove coverage dep
-BDEPEND="
-	>=dev-python/cython-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-6.33.5[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-# signal handling tests hang often
-EPYTEST_RERUNS=5
-: ${EPYTEST_TIMEOUT=15}
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	sed -i -e '/INSTALL_REQUIRES/s:~=:>=:' setup.py || die
-}
-
-src_configure() {
-	# -Werror=odr -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/856775
-	# https://github.com/grpc/grpc/issues/36158
-	filter-lto
-
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	# system abseil-cpp crashes with USE=-debug, sigh
-	# https://bugs.gentoo.org/942021
-	#export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	# re2 needs to be built against the same abseil-cpp version
-	#export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-
-	# copied from setup.py, except for removed -std= that does not apply
-	# to C code and causes warnings
-	export GRPC_PYTHON_CFLAGS="-fvisibility=hidden -fno-wrapv -fno-exceptions"
-	# required by abseil-cpp
-	append-cxxflags -std=c++17
-	# silence a lot of harmless noise from bad quality code
-	append-cxxflags -Wno-attributes
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/unit/_dns_resolver_test.py::DNSResolverTest::test_connect_loopback
-		# not a test
-		tests/unit/_compression_test.py::test_compression
-		tests_aio/unit/channel_argument_test.py::test_if_reuse_port_enabled
-		# expects grpcio-admin
-		tests/unit/test_all_modules_installed.py::TestAllModulesInstalled::test_import_all_modules
-		# TODO
-		tests_py3_only/unit/_simple_stubs_test.py::SimpleStubsTest::test_default_ssl
-		tests/unit/_cython/_channel_test.py::ChannelTest::test_multiple_channels_lonely_connectivity
-		tests/unit/_cython/_channel_test.py::ChannelTest::test_single_channel_lonely_connectivity
-	)
-	local EPYTEST_IGNORE=(
-		# not a test
-		tests/unit/test_common.py
-		# requires oauth2client
-		tests/unit/beta/_implementations_test.py
-	)
-
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# grpcio proper builds against system libs
-	# grpcio_tools supports bundled libs only, and requires different
-	# flags
-	unset GRPC_PYTHON_CFLAGS
-	cd "${WORKDIR}/grpcio_tools-${PV}" || die
-	distutils_pep517_install "${BUILD_DIR}"/test
-
-	cd "${WORKDIR}/${MY_P}" || die
-	local protodir=src/proto/grpc/testing
-	local testdir=src/python/grpcio_tests
-	"${EPYTHON}" -m grpc_tools.protoc -I. --python_out="${testdir}" \
-		"${protodir}"/{empty,messages}.proto || die
-	"${EPYTHON}" -m grpc_tools.protoc -I. --grpc_python_out="${testdir}" \
-		"${protodir}"/test.proto || die
-
-	cd "${testdir}" || die
-	"${EPYTHON}" -m grpc_tools.protoc -I. --python_out=. \
-		tests/testing/proto/{requests,services}.proto || die
-	"${EPYTHON}" -m grpc_tools.protoc -I. --grpc_python_out=. \
-		tests/testing/proto/services.proto || die
-
-	# TODO: aio tests are failing randomly, so we're skipping them entirely
-	epytest tests{_py3_only,}/unit
-}
diff --git a/dev-python/grpcio/grpcio-1.82.1.ebuild b/dev-python/grpcio/grpcio-1.84.0.ebuild
index 6e9fb2ecc763..77e10cf7bc6c 100644
--- a/dev-python/grpcio/grpcio-1.82.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.84.0.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	>=dev-python/cython-3.1.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-6.33.5[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-7.35.1[${PYTHON_USEDEP}]
 	)
 "
 
@@ -100,6 +100,7 @@ python_test() {
 		tests_py3_only/unit/_simple_stubs_test.py::SimpleStubsTest::test_default_ssl
 		tests/unit/_cython/_channel_test.py::ChannelTest::test_multiple_channels_lonely_connectivity
 		tests/unit/_cython/_channel_test.py::ChannelTest::test_single_channel_lonely_connectivity
+		tests/unit/_auth_context_test.py::AuthContextTest::testSecureNoCert
 	)
 	local EPYTEST_IGNORE=(
 		# not a test
diff --git a/dev-python/httpx2/Manifest b/dev-python/httpx2/Manifest
index e50180c9679c..9867913ece73 100644
--- a/dev-python/httpx2/Manifest
+++ b/dev-python/httpx2/Manifest
@@ -1,3 +1,3 @@
 DIST httpx2-2.10.0.gh.tar.gz 2140799 BLAKE2B b6d809bf1053f17abbadf6543b57133d112a07c112da54dee19f7c5bb08f5ce0606c1a822e4ba75b70ed155543faaeabfd84ca174a6d0b8bfa97515906bee2fe SHA512 18bfeac68d50a0851a8dcc996f0a6dbea99ab1d546bb2463e7abe466f2c0d71e44b8712af1e02cdf53be4a220003dad17ade625f7df431a05cf38eee02a953d0
 DIST httpx2-2.12.0.gh.tar.gz 2144469 BLAKE2B be96a3cea133a993248d7743524c3208581f881c275486a3b4f8241c5410f4d9d3a0ceca15bd4cbb598a84e91a46f0ec7b54a9b091fed550b19a6512d6d172d7 SHA512 33bc7d37f6f9b20f275f36fd49b94734714f9f47dc4d4b2029d27a7cf7d2d4f5ee1da8060c4cea65750b9362c65964b4d2f90dc2cff1dbe42051fd2bca03542d
-DIST httpx2-2.9.1.gh.tar.gz 2093326 BLAKE2B 2124f7276c6f6bac2304fd0bd4bdd388592f85f419c89c2e3ad0cb7f6ab9eb04fff6cdc1544a5e4a898e0034873784ac1d17d90f49ba4bd901c3d17de7003804 SHA512 8b0045ad01e1020414b5ea17a694e332d531007f59b7157765fa3e15dbe95c9e54717930fa1f860fba55edfde9fa3136f9f5107d4e5bfc96f4fc7e45ca1543fd
+DIST httpx2-2.13.0.gh.tar.gz 2103962 BLAKE2B 6d940bdcc39f36ddcf50377457931ee9e2c3b758512421bb416329e2b575e2ed4fa152240773d56f15f5f4745f1bd1f8cb2f67ac13d10bfe18ff1b316aea25ed SHA512 182e40dc35ca1ebfa2a6cb1ecc061f399d9dce2e2dff31c039c0eeedc9f7cf6f48fd6eda75c804320077f2b0538059412fad5857d6f7989592974e3262c21f68
diff --git a/dev-python/httpx2/httpx2-2.9.1.ebuild b/dev-python/httpx2/httpx2-2.13.0.ebuild
index 94f06356db37..9ad182936744 100644
--- a/dev-python/httpx2/httpx2-2.9.1.ebuild
+++ b/dev-python/httpx2/httpx2-2.13.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cli"
 
 RDEPEND="
@@ -43,7 +43,7 @@ BDEPEND="
 	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
 	dev-python/uv-dynamic-versioning[${PYTHON_USEDEP}]
 	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		>=dev-python/brotlicffi-1.2.0.0[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cryptography[${PYTHON_USEDEP}]
 		dev-python/h2[${PYTHON_USEDEP}]
@@ -56,7 +56,7 @@ BDEPEND="
 		dev-python/websockets[${PYTHON_USEDEP}]
 		>=dev-python/wsproto-1.2[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			>=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}]
+			>=dev-python/backports-zstd-1.0.0[${PYTHON_USEDEP}]
 		' 3.12 3.13)
 	)
 "
@@ -78,22 +78,13 @@ python_compile() {
 
 python_test() {
 	local EPYTEST_DESELECT=(
-		# random HTTP header case mismatch
-		tests/httpx2/test_main.py::test_auth
-		tests/httpx2/test_main.py::test_binary
-		tests/httpx2/test_main.py::test_follow_redirects
-		tests/httpx2/test_main.py::test_get
-		tests/httpx2/test_main.py::test_json
-		tests/httpx2/test_main.py::test_post
-		tests/httpx2/test_main.py::test_redirects
-		tests/httpx2/test_main.py::test_verbose
 		# Internet
-		tests/httpcore2/test_cancellations.py::test_h2_timeout_during_request
 		tests/httpx2/client/test_proxies.py::test_async_proxy_close
 		tests/httpx2/client/test_proxies.py::test_sync_proxy_close
-		# unexpected logs from uvicorn
-		tests/httpx2/test_utils.py::test_logging_request
-		tests/httpx2/test_utils.py::test_logging_redirect_chain
+		# random charset case mismatch
+		tests/httpx2/models/test_responses.py::test_response_decode_text_using_autodetect
+		tests/httpx2/client/test_client.py::test_client_decode_text_using_autodetect
+		tests/httpx2/client/test_client.py::test_client_decode_text_using_explicit_encoding
 	)
 
 	local EPYTEST_IGNORE=()
diff --git a/dev-python/libcst/Manifest b/dev-python/libcst/Manifest
index 19f1255b8e00..d44b4f1a868e 100644
--- a/dev-python/libcst/Manifest
+++ b/dev-python/libcst/Manifest
@@ -25,21 +25,17 @@ DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de1305
 DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST indexmap-2.4.0.crate 83544 BLAKE2B f4b3e1b877c9355a491e33d10e3ef730f943b54bb14f33ed476120e2a8f0cd3550f6aeee1a56e1868881e1853b3d41283ab803faf5afbf32c86b36e08e7f2026 SHA512 9c7f2b495f0568ce56e2fa8d3355948783b490b23b46a83acade2864e41eb31a50cf372d818b2a1d3d24327282a9866e690348134a20ee481d748bdc581145ec
-DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itertools-0.13.0.crate 146261 BLAKE2B b23d59a87f80d24925bc868c0ac7abb6b9d05aad5ca08833634ef760ce228a1b753062ec4bd22237d0e74727edecd7ba3df9789cee896345b69780d7de66866c SHA512 c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4
 DIST itertools-0.14.0.crate 152715 BLAKE2B 3c075b735a6ae4b66980b1f7ca0ccf4237286b140268ea179e4ac01b1349105da227f03ea9ea721d3e762c3cf8b736cc48b6902148eae73addd864b9c79aa219 SHA512 bb168e21281ef3e43f9c93a079fc1938d79b6db2366fe17e26a90f7ce6fa55df73e54a06334cdb2a7b208b0a64473b5af9de76827a9ecb49378a5f9073d2e645
 DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST js-sys-0.3.77.crate 55538 BLAKE2B 8a4c04a8e93bf5dab63784a24320a314cc5cb629df788e116c452857b8c049c6bf357f3bf8f35086eaa81bc2d7f0954001addfd0577d845844871ee138e81bc6 SHA512 d9370ed6ea892bd51ea181630ca661c348f82d575381aa4c8b529113dfcab6687f4d19bceecad7e1b28ebaca74d405862150a5b5ee2d5d55efdaf98eed1ab255
 DIST libc-0.2.149.crate 715592 BLAKE2B 21dd5d4f9351f3c75790077c7b025046db665f2d48d7a72cda7667bc60febf79d82708cf7d39a323a594397cd590bd3d2a2f85349b4473b90ea4da918382ed0a SHA512 0def64d400d473d6eed30e985522d36801ee6472b15f90e74dc4592e0a8ffbaf30b731be280de52b30255cf60aeca8efe817b67049227dc7000c807e007d7289
-DIST libcst-1.8.6.tar.gz 891354 BLAKE2B f99592fe85a543e5996ebed401478cc27f8cba53d9945fa5e948e109e2b52f35a11da78a44fc66a16c1877be55b99d16015e90cac9811410f37b615ec2d9ddac SHA512 fe6c2b1cb1a9ef2b02e8f73fae3b91fc42af7e2ae78f9c0120dd5417635026aa26ee2cf1413f3ecc1fbbd9655381e2c49a878ec7475c205ab93a89ae7f317100
-DIST libcst-1.8.6.tar.gz.provenance 9393 BLAKE2B 3938392a475caaf546df3c0280e956202a016abfdb4566a391e49e02c6d2346ed4ddf683c3d9f6ca6e32288ff06f5e6e1e8537f095fa06b513c5cf5a9ecbe4e3 SHA512 ea4d3e60ffd0d6f7b34f1dad72011c7ef50f03cfed44fec8fa58e1c387ff1b6f748a55c1a2f297fe392573c91a7965adbf92e45d39a4e49fd553718df7a2e788
 DIST libcst-1.9.0.tar.gz 914739 BLAKE2B b7d693757ec6f43dd42128921a37ff69e89edaac5a0da7a00e150c8ecb9777c237f0eea5b930870e312a583b3a3394fa9eb245a3cf56774b2f67e092191fc266 SHA512 1399106b974fef350273beb415a6bfabfd07eac9419a64e68257fabeb350da6903fcfeed2f9e06db3befa59c14cf53e7c450a7e39e5fd991c381cc89fbf41feb
 DIST libcst-1.9.0.tar.gz.provenance 9497 BLAKE2B 5a06306f56d5f1753e00598c922f43e6a1a680c73d99c87534372c77b480a2faed7255b1a1068ee20095731f59297ea5e93fc3ad2ce0f7f2389512dc1e5bb494 SHA512 7a009c9baf04604c6cb0219d376e2379c40a3c74862e3b46b1b7d71497a783f34e039ca23de8abfac6de2b592a86d5ceb842bcc80afa8581134c1a5fe91afe12
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
-DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST once_cell-1.21.3.crate 34534 BLAKE2B 3578aaef305cad2fdffdc40c392775a3540bfab3f3aeafd22466d9507bf8346b9fcc200929d48525b051070c0aaa423ecbcaa12868b34dca007991effb224166 SHA512 32a87506c6f4598f3ca2c88556014ef2093d5db9a08602335e847caa537a866492fa74c894e7e1da2e4289a1d3dbffcb90a9e37a4a1453203832f434b8206990
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
@@ -52,15 +48,10 @@ DIST plotters-backend-0.3.7.crate 13709 BLAKE2B 7ba96de1435beaffe0171dd4fd010f84
 DIST plotters-svg-0.3.7.crate 6715 BLAKE2B 1437ad7e1c1b3e82ab1f58660ff6931e510f6ea5ea6cae6eb48582d4652bc65c5dad518d3312e25303651c03d90bf56d9abac4c2e3979f8290b4cb35c0b6ba5c SHA512 9a60e19026edfad359a7d042630b60825d7723855fc0c17881ac880c29160a81449ca672a3ae5cea4405293947ae0556f31cb37f519dad4cef56353248350cd6
 DIST portable-atomic-1.4.3.crate 126291 BLAKE2B 08fbfd391c9eb55c02b8345549a57fb5c3b8cfcd81e3867ca49cba94faa7b2d372e4f2996fbef4a52742d852b117d4b7cc488571df7272b93caf47a9a2680c46 SHA512 89f14902c1e55c37d7663bc9255378441a0951e5d8e21665a8102e06b766135cec6d982f9ed01b4167e872a7853102ad0e9347e9b163ea81d81b00ee2362e9a0
 DIST proc-macro2-1.0.95.crate 51820 BLAKE2B 93229d80556ec03bce4031607d13c7902cacc2d7e2586a692ffe8543d52e3f3ba253c9c311ddedf6d9348ce8758ae8ff64577675cda2dac557f936a328de47e3 SHA512 f78e4d47ecd29c1b2315554705e445507bbfb9449afd0bf1b74df28f266ac6382ca8c3ce135ddc55c989eaee64d1794a0933a941c8ff55f543fa21c400016547
-DIST pyo3-0.26.0.crate 1151579 BLAKE2B bcc8236785502928bf4a0b7a320e0a8f3d6140c562de4351a52d015aaebb8dd6b4d68fe607c8ea13ec66941c8f01d2c18c4249adfacb521355d4bf158667f3a3 SHA512 e073a4d893f88aa0301ef0ead78048137515edd93c490e6dccbc301ff65a208534c65c1d216b04639d4b1ec1e4b69bc87bd34974e5d0659134c28dcce589c194
 DIST pyo3-0.29.0.crate 1241253 BLAKE2B 29deb7fa70010bf3d7e9e93bbcd87c0b56c4ee7ef0c2e5956181d2fb5f06f4c9b3f28bd1ad280126c26c048808b91b847e1fb69ddd617ef9e9e5e004cf4e48ae SHA512 e6822400de53ebcef4a14c899dc065abae621a126483873139f5eb850877c94f4bccee3a183d4e2a69eadcd3c3b82b0a6f3e1053d926b103be572329607f2f67
-DIST pyo3-build-config-0.26.0.crate 34309 BLAKE2B 5ea8b51da2f425674cd3bfcc1090ffdd08da01d2161dc66b08995c20cc859422f9f84077c545e5a0580182910aeb9dbba97838915148a82b86948d1cca3c8722 SHA512 a982d0a0baa4af58c2cef7c0c4b2671e3f559ca7f30586eda9fbd05e842efa2bfea0089ddbc729225b848871f6a25f85e86576e1dff519192ba289cd92c6aa8b
 DIST pyo3-build-config-0.29.0.crate 39616 BLAKE2B 7b62a5976b890db84e5256f3136185c2a9c3b7110782b5b0cdc314a5231fde30a853ddcd17af63b53488b3e8d5e310b01002b6f3c32cfeb1e5c3e168cd6460d7 SHA512 df77e8d7d5fe173749437ff6b90fa1703083377d515ab8a85dc77d9cac9c3fc331ede4b040f7e3694311ddb5adff577cf90c181a27c196ab93a4569e918fdea8
-DIST pyo3-ffi-0.26.0.crate 78247 BLAKE2B 65f1c399bc763bf8afc36ccac27d28242ebcccebd08ab8d9b3165ca5c9abb10f76e76fe5a250aa1e0cdc1d1e8a613160660f07bc0dbc2812675acb9dfc8e89c2 SHA512 91c2ae828e997dee5e48d839794727e94576228e9329c358a3bc77a59f8f37fa0ae6c2579229782b3f46ab90725844ce9194b9de4d3849d824adf1d40743bf7e
 DIST pyo3-ffi-0.29.0.crate 88184 BLAKE2B 5891af92a3bcba764c4701dcc0a99edbced010a5ac46df3217d004f5c3a368f18331733c6723bd49e522c6f7105455df13e2be0f07695ed5ce6ae71c15dec438 SHA512 baaf01d13ddc09316ba16b22e9ca15a67e5bda5b861ed7961c3393fd4692fc1c96952f81465d1dcb6531b9083f96c5630981b3d7802cb1ac2af67aafaffbec76
-DIST pyo3-macros-0.26.0.crate 8906 BLAKE2B 60eef72d27b5bc922b75f71ae24bb6f380288cb3a619bf2940b0de47b27e86cce0ffdb1fbdc9c0540d3f15c9df4884497aa1e6efec0f1579ac722b414818a428 SHA512 07bcddba0926c3dff7629da3260f9a38593fbb337b6a68d55c223f5944d912885e5319cd635ae1785026fed4adea1fcc19695ae83aca5bea127c5a8868fd2c43
 DIST pyo3-macros-0.29.0.crate 8915 BLAKE2B c12d23753d5aba7333183d4b41f16c8da1d4297a3ff86b3b150e9185c1978fc184ac198e566a41833292a8a78ab59446eafd5ef7169e5cb41493e7cbeaa68280 SHA512 fb6633ac76229d2e0ad88d51136a9318f03823b27c700a62cfbc957b4c834985e2f4c0cdaf5ea5e9993ec9e8ce3d63cd6b3fb823f2a042e65186adbed78da7c2
-DIST pyo3-macros-backend-0.26.0.crate 81809 BLAKE2B 73885035855daf00b001e97e0a5ebe09412d212c8f01aa4db6638ef09990bf1bccbacf2e5a7e6ec21929bb1c2beba06587ecdb6ee954eda9e9c51c6c276cea95 SHA512 4146011a8ef18ecaa44b425eebe6e5e1370945063b98aaa83452e57b66aefbf5d483367b1d4d44aa5091303c4ba7f568c6428ecec0cfa6c90ba41631d4e99367
 DIST pyo3-macros-backend-0.29.0.crate 91943 BLAKE2B 7c2977dd9c80f3dd1f5375b0c65492b46048ca02e6355ad746bc8430cf92eaf25c701f416469eb69724fde5220651b1095c09eb9e3ff860176f862d7c7287407 SHA512 13a7af3958c09969637827d97ab9bbc664c407dda9e4283afaf495757798cf6f84932468bc092160fa75211ce0aafe6efc657f3a390234d77a67362cfb31fe0f
 DIST quote-1.0.40.crate 31063 BLAKE2B 09036ff3e5ebbd775c466bb936de91d4c070481eb4b98c62a4cddcda57cd7b67d63f979b321f6ec64aabee3f5da6c28e7a3efb83f4647768ba578f1bd0bd0bdb SHA512 45a76e22a2b0bec47e4ba73c3b73cc41d821dfcce9876134c5d8eed514da214aee4ce7612e372c8709f888c0d8b9b7e5442f27adb7a59f3571f0339ed7e2ac99
 DIST rayon-1.11.0.crate 182470 BLAKE2B 40a21dac636e7a652d62d9db520bc50a7a0019f0f96aec6a9002dffdef3d7ee0b2a323e4c3022e5cbaa22efe52bc72573bcfc7d399dffc853bec08190ea4eab6 SHA512 24238ba604099b3e58282b7338ccc63e52621e329ac908d7f3799c632f4ff97ae305a5b361479d4d7d0f09b76f49ab3b75c4187c41542caaca0575d51c299d2c
@@ -77,7 +68,6 @@ DIST serde_derive-1.0.208.crate 56019 BLAKE2B 68812664bf69f8a65e2be984257975b765
 DIST serde_json-1.0.125.crate 148919 BLAKE2B 551b29a79dd35e20e7432b434a163b62ffcadcb40a7755946e25ea29f59a39c55a85d589f6b90d449847023d0021b6ab189e41b52922468df5c46ed663a012fd SHA512 45cc034bed4ad15a6698ed2b723b3540db255c7ba8014c103d3b7782f10a3a8e2f6d5fe5d0dc47b54286f01f20c21818a5dda670a942182a07dcd1d71bea67a1
 DIST serde_spanned-0.6.7.crate 9164 BLAKE2B 559a62c0ac00a1559947224bd268842f35c52f65d0d52102c98b5e683dfe4c36acb015edf97c5f79ff818dc575b3ae43c3f100d18eb7afc3ab9c96e348ba6794 SHA512 d0ef413867a705080fa68f84a059b4d04b604bec59323329ded7ae03e0caec49c89fc53640c1e58c27bb23b5c9f260ed176ac52f3a93d25d8d7643252dba037f
 DIST syn-2.0.101.crate 299250 BLAKE2B 7018cdede66dca82e7d7a7e07e52a178687957fcfd69f1a2862094497d2fb9d78ada14b94761679bbc5f6c76c808a63e948ed071e4f65c2f9580a40bf58c9426 SHA512 05e4233a51f4d229dd4c9bd23c5224c42ec5554d02fd316dad10dfdb876aa1d379c7ea30b1ace979537da91ee746ca4fdcef7690885f83fd41ec8c9dc5984101
-DIST target-lexicon-0.13.2.crate 27923 BLAKE2B 0761f0ffdc23b9c9df86b384d59611c7b8b5e29ff068f03367ad2fe84cfb6d11e1af149b9338236978e9566fedc51387db9f239d2a602db41045ac3db907faec SHA512 d25e3cc3d679cb6b6f24c03e0c24db9d6ca31b8ed42ac9531bd7637557fbba225a6c8ac4f68a8eaf3569195814d599e668a968afbc73b940a77cbc27552cc90a
 DIST target-lexicon-0.13.5.crate 26928 BLAKE2B f8c62cb91f68a635e6ce3fc254df9ce378b5e8f62c1147404c967484b9ed97fb33d7993b4671611db76566063e999d658d201f856f70196ec678d72cc758cf6d SHA512 956df27c01e1186c5356117ffd07810fc0b62fb919d5bfd215955ba85be00ef675212a3c0dc36679986be7b825442fec5c93c7643b7e1e19c04572e6463546fc
 DIST target-triple-0.1.4.crate 7143 BLAKE2B 2e950355a9a51b6f3512497c18f5ca1e1359bc65711cfe35fac622ade0409e1a1dc0df0fb68f3722083d3d8d4f999e504ce56140357fa42fd887f5cc793f03a7 SHA512 ae57684930546887776670c2216517532410f325542d7ddeca1e561f1f212635689d00c5d4e2c3cbb884222bae1ceb8b9f32461704896adf5537d19e2a096501
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
@@ -90,7 +80,6 @@ DIST toml_edit-0.22.20.crate 106726 BLAKE2B c545e7460ffcff1404dcb77e577121f6ef33
 DIST trybuild-1.0.105.crate 44901 BLAKE2B d5a9c2f0b2e7c50b506d29a56089e04c7c797311a2e02b0f28816cef8b1c5ef0de7f5c32efdbaa91dfd6e17e013335016faa77f1def4ad705bd42fac5981f83c SHA512 f837f70cb53123d64760bb9327e368686e5c2a732fd2c315e835d245f8a00c062ceb9d1a5390e28d7df45f42546724024266e16e7fee0dc6ea62cff625f9b3e0
 DIST unicode-ident-1.0.18.crate 47743 BLAKE2B 517ab42a847020515b2b871844d0571ea672340f89a762631a791eac18935ac122122fa5566e58b99ab47de179eadb5298e8ff1d05b123c4e93b7fa989c8e31f SHA512 d11f89fb696f9e2953c96a40b5478832651b268c83b9c7a700b07e768e795d6e8dc346597d1226df21219d36866768d1f640bd8edb68db8bd3d5d437b2bfd324
 DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d
-DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasm-bindgen-0.2.100.crate 48288 BLAKE2B 8fc4f71c7d6cef15f131a9bdbb50e3eaf9f3894a5b6c1d73876824efb731b46e8c3449947893103f23bc15cad228a1b8bcccd45ada20df53b3f3dde6e419c184 SHA512 2a8ea7ec669efe10f5701dc3b2bf496e33afa70c31dbc65fda5191c9c28ddde54fa38bb168a41b0319a4ff0bb5ccd897ce51ccd7e523e647b3544fb390f8a4e3
 DIST wasm-bindgen-backend-0.2.100.crate 32111 BLAKE2B 6bbbef709753e22230176121388a95fdb8f4dd32e0755dce5bf6c1127c54a236af292f319d14b5cd97bdb310fee65288e8f404921b83693e287164cf9d589a2e SHA512 a2ee30c1185644f989af6be34e93149a791c05125de24c0ff91c320f683f6f5d939fe42b8ca09d629096388a39256469f8b96a6e35722ccfdbe8d978c9a51770
diff --git a/dev-python/libcst/libcst-1.8.6.ebuild b/dev-python/libcst/libcst-1.8.6.ebuild
deleted file mode 100644
index e80e56e8d151..000000000000
--- a/dev-python/libcst/libcst-1.8.6.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_VERIFY_REPO=https://github.com/Instagram/LibCST
-# TODO: add freethreading when the deps are done
-PYTHON_COMPAT=( python3_{13..14} )
-
-RUST_MIN_VER="1.80.0"
-CRATES="
-	aho-corasick@1.0.4
-	anes@0.1.6
-	annotate-snippets@0.11.5
-	anstyle@1.0.10
-	autocfg@1.1.0
-	bumpalo@3.12.0
-	cast@0.3.0
-	cfg-if@1.0.0
-	ciborium-io@0.2.0
-	ciborium-ll@0.2.0
-	ciborium@0.2.0
-	clap@4.5.38
-	clap_builder@4.5.38
-	clap_lex@0.7.4
-	criterion-plot@0.5.0
-	criterion@0.6.0
-	crossbeam-deque@0.8.1
-	crossbeam-epoch@0.9.9
-	crossbeam-utils@0.8.10
-	difference@2.0.0
-	either@1.6.1
-	equivalent@1.0.1
-	glob@0.3.0
-	half@1.8.2
-	hashbrown@0.14.5
-	heck@0.5.0
-	indexmap@2.4.0
-	indoc@2.0.4
-	itertools@0.10.5
-	itertools@0.13.0
-	itertools@0.14.0
-	itoa@1.0.2
-	js-sys@0.3.77
-	libc@0.2.149
-	log@0.4.17
-	memchr@2.7.4
-	memoffset@0.6.5
-	memoffset@0.9.0
-	num-traits@0.2.15
-	once_cell@1.21.3
-	oorandom@11.1.3
-	paste@1.0.15
-	peg-macros@0.8.5
-	peg-runtime@0.8.5
-	peg@0.8.5
-	plotters-backend@0.3.7
-	plotters-svg@0.3.7
-	plotters@0.3.7
-	portable-atomic@1.4.3
-	proc-macro2@1.0.95
-	pyo3-build-config@0.26.0
-	pyo3-ffi@0.26.0
-	pyo3-macros-backend@0.26.0
-	pyo3-macros@0.26.0
-	pyo3@0.26.0
-	quote@1.0.40
-	rayon-core@1.13.0
-	rayon@1.11.0
-	regex-automata@0.4.9
-	regex-syntax@0.8.5
-	regex@1.11.2
-	rustversion@1.0.21
-	ryu@1.0.10
-	same-file@1.0.6
-	scopeguard@1.1.0
-	serde@1.0.208
-	serde_derive@1.0.208
-	serde_json@1.0.125
-	serde_spanned@0.6.7
-	syn@2.0.101
-	target-lexicon@0.13.2
-	target-triple@0.1.4
-	termcolor@1.1.3
-	thiserror-impl@2.0.12
-	thiserror@2.0.12
-	tinytemplate@1.2.1
-	toml@0.8.19
-	toml_datetime@0.6.8
-	toml_edit@0.22.20
-	trybuild@1.0.105
-	unicode-ident@1.0.18
-	unicode-width@0.2.0
-	unindent@0.2.3
-	walkdir@2.3.2
-	wasm-bindgen-backend@0.2.100
-	wasm-bindgen-macro-support@0.2.100
-	wasm-bindgen-macro@0.2.100
-	wasm-bindgen-shared@0.2.100
-	wasm-bindgen@0.2.100
-	web-sys@0.3.77
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.5
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	winnow@0.6.18
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="A concrete syntax tree with AST-like properties for Python"
-HOMEPAGE="
-	https://github.com/Instagram/LibCST/
-	https://pypi.org/project/libcst/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT Apache-2.0 PSF-2"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=dev-python/pyyaml-6.0.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/libcst/native.*"
-
-export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
-
-src_unpack() {
-	pypi_src_unpack
-	cargo_src_unpack
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# do not require the freethreading fork for regular 3.13
-	sed -i -e '/pyyaml-ft/d' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		libcst/codemod/tests/test_codemod_cli.py::TestCodemodCLI::test_codemod_formatter_error_input
-	)
-	local EPYTEST_IGNORE=(
-		# fuzzing, require hypothesmith
-		libcst/tests/test_fuzz.py
-		# require pyre-check
-		libcst/metadata/tests/test_type_inference_provider.py
-		# requires `python -m libcst.codegen.generate` which has extra
-		# deps and needs patching to work in our venv
-		# TODO: figure out if we don't need that for revdeps anyway
-		libcst/codegen/tests/test_codegen_clean.py
-	)
-
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	# fixtures
-	ln -s "${S}/native" . || die
-
-	nonfatal epytest
-	local ret=${?}
-
-	rm native || die
-
-	[[ ${ret} -ne 0 ]] && die "Tests failed on ${EPYTHON}"
-}
-
-python_test_all() {
-	cd native || die
-	cargo_src_test
-}
diff --git a/dev-python/libcst/libcst-1.9.0.ebuild b/dev-python/libcst/libcst-1.9.0.ebuild
index 4ef61db64e5d..a08653f92d70 100644
--- a/dev-python/libcst/libcst-1.9.0.ebuild
+++ b/dev-python/libcst/libcst-1.9.0.ebuild
@@ -143,7 +143,8 @@ export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_prepare() {
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index fb9f43b598aa..fec477fcb698 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1 +1,2 @@
 DIST mysqlclient-2.2.8.tar.gz 92287 BLAKE2B 371050f4c670668dd44fa53e67ddab8111355d6ca9f0eb2349927d2e5edc1f9f259d6e04bc6c0c0a975fe782a4e9cf9e98f695128098d8436463692af253f685 SHA512 113043e722896bba4bbd6c510c58d11336e916cda2e00fd261ce8b8db929e6a59427a125083626fc069e0f6cf524be730efe5b3250f0296a616f6670b91bcf67
+DIST mysqlclient-2.3.0.tar.gz 102185 BLAKE2B 196ddf4832c3811b1c7bd7e84db414f55b83649cc71089efa338eb02a2e903f8004c867b7f7335ba7d3c931324ea672106233d9d2efde28f8f2331e32716a4dd SHA512 ded8ad2a630da49378ff2a350abbd87bee406760822b0b6e1af7ad26bf10036167879fd9a473c35afa465d7e9e337a625d4be7ff782c746d1b1fbd7e93022670
diff --git a/dev-python/mysqlclient/mysqlclient-2.3.0.ebuild b/dev-python/mysqlclient/mysqlclient-2.3.0.ebuild
new file mode 100644
index 000000000000..c937d0662128
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-2.3.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="
+	https://pypi.org/project/mysqlclient/
+	https://github.com/PyMySQL/mysqlclient/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	dev-db/mysql-connector-c:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	rm -r src || die
+
+	local datadir="${T}/mysql" \
+		install_log="${T}/mysqld_install.log" \
+		pidfile="${T}/mysqld.pid" \
+		socket="${T}/mysqld.sock" \
+		log="${T}/mysqld.log"
+	einfo "Creating test MySQL instance ..."
+	if ! mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${datadir}" >& "${install_log}"
+	then
+		cat "${install_log}"
+		die "Failed to create database"
+	fi
+
+	einfo "Starting test MySQL instance ..."
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--pid-file="${pidfile}" \
+		--socket="${socket}" \
+		--skip-networking \
+		--datadir="${datadir}" >& "${log}" &
+
+	local i timeout=10
+	einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
+	for i in seq 1 ${timeout}; do
+		[[ -S "${socket}" ]] && break
+		sleep 1
+	done
+	if [[ ! -S "${socket}" ]]; then
+		cat "${log}"
+		die "MySQL failed to start in ${timeout} seconds"
+	fi
+
+	cat > "${T}/mysql.cnf" <<- EOF
+		[MySQLdb-tests]
+		socket = ${socket}
+		user = root
+		database = test
+	EOF
+
+	local -x TESTDB="${T}/mysql.cnf"
+	distutils-r1_src_test
+
+	einfo "Stopping test MySQL instance ..."
+	pkill -F "${pidfile}" &>/dev/null
+}
diff --git a/dev-python/numpy/numpy-2.5.1.ebuild b/dev-python/numpy/numpy-2.5.1.ebuild
index 113e45b74372..e477b9384ab2 100644
--- a/dev-python/numpy/numpy-2.5.1.ebuild
+++ b/dev-python/numpy/numpy-2.5.1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="
 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"
+	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.
diff --git a/dev-python/patiencediff/patiencediff-0.2.19.ebuild b/dev-python/patiencediff/patiencediff-0.2.19.ebuild
index a502e3cf68fa..852641dae8a1 100644
--- a/dev-python/patiencediff/patiencediff-0.2.19.ebuild
+++ b/dev-python/patiencediff/patiencediff-0.2.19.ebuild
@@ -57,7 +57,8 @@ QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/patiencediff/_patiencediff_rs.*.s
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_configure() {
diff --git a/dev-python/pydantic/pydantic-2.13.5.ebuild b/dev-python/pydantic/pydantic-2.13.5.ebuild
index 1fc89623a104..be9d4d241af2 100644
--- a/dev-python/pydantic/pydantic-2.13.5.ebuild
+++ b/dev-python/pydantic/pydantic-2.13.5.ebuild
@@ -177,7 +177,8 @@ QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_prepare() {
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 9662887a90ae..b294c54a658c 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -2,3 +2,5 @@ DIST pymdown_extensions-11.0.1.tar.gz 857113 BLAKE2B a585fd5c325fb4b146ecdddf920
 DIST pymdown_extensions-11.0.1.tar.gz.provenance 10025 BLAKE2B 11c409e59669f3219fdf115b6593a7f1e40ac7725ffea84e0c3b25d468774a1bd5513df54e7885443631e64d1dcf7c2ef0a521547dca9ca8cf092a4333fc4161 SHA512 5a0515a30b1e65d73fc01e405a5fd0b470259273f1d8c3c152f2f8d2a5ab86bc72830d5c8b08b40fba564cfd0b69fd556524042412ea022cee3528b117aa7083
 DIST pymdown_extensions-11.0.2.tar.gz 855419 BLAKE2B e7a73d571f8334a829953c7df6796f930558393c7c3ae272a779ea5271f6112f2163384046c95feddc2365333b6134df41b71e078d213e7ebab0be4d0c1aeb8b SHA512 cd84ba04447bee2f2953453f1045e79c8495b5db0442227a8cc0ef348a9bb64e99e4ac0232032574967683e88b0db21b7eabeb8aa4e6edafde843e07438c5b5a
 DIST pymdown_extensions-11.0.2.tar.gz.provenance 9980 BLAKE2B 52445950a371bf69ab7ebbe1f8df0e9e689fead80f6aa1b8e356c2a851578c149ffe7ef205c78683b73131a4b463c5867e449383e166475e1bbd5f8249fbb71e SHA512 7940ae93bca9f3ff8027db324e43101871fd5768ea7c59aa25856e10f333c6bce30ada9da383fb46c7f28dd95b6862e296b998d78d3f84eabba06d9ff30ac3c7
+DIST pymdown_extensions-12.0.tar.gz 867035 BLAKE2B 2a95a81964b16f816c435892c9498614c3c9befd50c5d34b3d3e1fd324ef14a4dcb43eec487b1af865e4c778746f7b1b4f4d50ce77edb626fdbc5fc9f2f8b83f SHA512 bc1738a04021889df3a802074d93131a84ec5000db3aa4cae5b068cb9ace315941bcf57565983d172f3965cb57017c168df96ab25667132ed3e2517a61edc2b7
+DIST pymdown_extensions-12.0.tar.gz.provenance 9995 BLAKE2B 2c231bb3f412bbdad5abbeb7627be427e8ba3bc6eec22f2128ad089e71d639599494edaf9a9e84db8093ea484955843b23f642fd33c7d1f93c5a3ae0ee02175f SHA512 36de2ab58cf83c00e4f207b6421eddf225646ee38bf79dbfad6a969dde532c8d8352ba39e173567a455037710cc9dfd77e658607a02fad987e43bded7e2f82c7
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-12.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-12.0.ebuild
new file mode 100644
index 000000000000..1c6dfb8c42e4
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYPI_VERIFY_REPO=https://github.com/facelessuser/pymdown-extensions
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.19.1[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
diff --git a/dev-python/pyside/pyside-6.11.2.ebuild b/dev-python/pyside/pyside-6.11.2.ebuild
index 295588c12727..2132d844785e 100644
--- a/dev-python/pyside/pyside-6.11.2.ebuild
+++ b/dev-python/pyside/pyside-6.11.2.ebuild
@@ -32,7 +32,7 @@ if [[ ${PV} == *.9999 ]]; then
 else
 	SRC_URI="https://download.qt.io/official_releases/QtForPython/${PN}6/PySide6-${PV}-src/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
diff --git a/dev-python/rfc3161-client/Manifest b/dev-python/rfc3161-client/Manifest
index 4583811219be..e6c45cdad13f 100644
--- a/dev-python/rfc3161-client/Manifest
+++ b/dev-python/rfc3161-client/Manifest
@@ -1,35 +1,22 @@
 DIST anyhow-1.0.102.crate 48658 BLAKE2B d9c7b7c50b7319be0e67bb236e0420a67e3fd6d6f4bd53a84cafc7a5385785275151832be472c0063405e6d458b5add3907b670ba5e300e08efaae699ab77c44 SHA512 18064a92b6d577151b6f1be3df0985fdefdc5f7089ac0aa9bc92a2034c780eac5b71b8fbb260217aea122bee7c950ff00abf4b6d8f4143dff889b7164c7d6f0b
-DIST asn1-0.21.3.crate 40295 BLAKE2B 83135948a525b0ed432bd8e76e87f7400c56887c4a7cc505210014b8f4c9e47f9d139f723bf61165dfc772b9d86c0fe6a471336e480613ec556114afcf9fee83 SHA512 5f7b484e6081569cb1bd86b690ffcb49b51c5dff20dc08fedd9f803d634265fb4c157e2912b4763152cf8baf5556807aee109787618c3ecdb4a7307863502417
 DIST asn1-0.24.1.crate 50502 BLAKE2B ebb6ec767929765aa37a34f25c9ace8cebabc4b01268245c71691a247317d920e3f5dc6ff4026711e1ba99701f55d84eb1b8b66d79e9b88ad50d25606070a746 SHA512 72ab6700bc365456f6038f9d6d5ccb29a3baf378596f538b68e0e11d3668e57cebaabf72145d8fa86b6441d66eafe38aaadab41eb7b61731fd356a75ff5c45ee
-DIST asn1_derive-0.21.3.crate 8570 BLAKE2B 3b94274d1c1ecbf5dd1c70cbacfbf6885a68734483eb990b090f230b6d8da3b7f2400355ce944c456b8712a1ae01b1b5a42cc277609ba752acb664337751dcec SHA512 b7feb53a380fec0a2db010a0af2ba1228aa45de99246ac7d388f5164735beff12ca882356eaa2c0eb710a099ac51ec8e739080715790af8f3d1ced6b3ff6c69e
 DIST asn1_derive-0.24.1.crate 9534 BLAKE2B e498f5af8fef329668554673a2c583b1d0049a235ed70f2a7a26ab724304240b277c44b33995749437600568e084aaf018430b96c7011d8483bb6965ba0e9bfa SHA512 00990444fb13a033ea831f0688611ecbe33f8cdb63717382cdbccaa0834f953302383f05ae425525d8c336908780d7b80be0db430e1f233bded0544f32c9c199
-DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c
 DIST bitflags-2.11.1.crate 49082 BLAKE2B c9c875b54e0a12115ecd846ef0a66bc7070d38892285a4142f1b1f26b07d407fa440a2943f310046f5fbc9a2428fcc56f2e44d06360e551d4b27c9b8cf93eab0 SHA512 c91b5a8b420d8e875a0906ef9b518a392487fba5399355aa5e908132149ddea7cc4222dd271cd5072e50dd9abd6e56420f4205652ba32a57af46bf07636604b7
-DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
-DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
 DIST block-buffer-0.12.0.crate 14926 BLAKE2B 8c62650f39117c337c167027d356339ca8e20277e78b0e045e32cc3692b8b5b1d8023bfde5887edb22be6dd5d787fa423380b53d18fb8359c43501d28a88f3d5 SHA512 3ebe9faa231d777f76dbb7b78c72eebd913b109cf929b0a66399758d06829a7c1cc9ab06f8ac951739d91be0cb402a49bff918228359399367ce8e69a112da78
-DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
-DIST cc-1.2.2.crate 98719 BLAKE2B 7a7722721f98869bfe773ce90c6d756bb5ab76df05b516067528d7285c47cbc80d965aca97c7d7a118515035326c843b1721429e12afd6b15f187f0c59fe18c0 SHA512 5364d3822a566573d45e40a6076d3f9aef20c67f1a5687895f5a76be210a48cc44857ac778e2cce58d3a5dfb07255a3e6e541dd97be8492ae6f66fa18222492c
 DIST cc-1.2.60.crate 97051 BLAKE2B 292350c3fe7dc3e023fe4f7cd07b3a5a7233996963b42391243948f834a17cf69781bab32cf46d62722c45437f50123450811dce8aa0e96ee63f35480cc15d90 SHA512 d67fd7400bd1d20f26f7a6743ac02ad09dba0b8002172b87907f4a7ae2487ee41feb2f24fe375ca91a3ac4fde1dc8b48b6703b74297c9eb42bd1e91ac8fe4e80
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg-if-1.0.4.crate 9360 BLAKE2B beadbfb273ee97cbb6e3740891fbace57511399ad203459b66b397587d794677a9515cde4e9ec4320c3795518bf1551d72b9a889f8ac4b225168f493288b7c19 SHA512 176e04df7ba783b7143bb84397b777f5c5a1305c08a5c3a218d4a66830620be89ed68992ba27686165bcd3fb2f34b2daf80b2a1d4b481ecc267c988e84d28e9d
 DIST chacha20-0.10.0.crate 38763 BLAKE2B 84d3d12379495b724b33accdbafe0209d0ddfeec74115b59228fb03e02089f1531f1396783a408b26cfb90372670c809bee8ab056cc847102cfc92ea065656aa SHA512 97e50d8e16118070ec75c086bae3695513b63c2ad3c5d43e3fb57892f21c9634977bc506c0c094aeb61bc8864518cee3eabf6b81504128ab0a876b2f6860b43a
 DIST const-oid-0.10.2.crate 61449 BLAKE2B 47249f191178e370ea39e4fc31f9ec9cd81b7ad7e89bc14a02eb81932128ec15d51a36baa28b792b05b95329410ff5aef9de3285c4718f1bb2cf3c9d54c73742 SHA512 9ad6ecce2c1d4c177b53d602b9b610442701e72daffa370af71553a380cdfdbea800fb8d7413aa2df273121dd6d0a511fac4b64a10bcd2e046ec19b4eadad007
-DIST cpufeatures-0.2.16.crate 13405 BLAKE2B 06d061cb2577057bd2afbc8cd6783488595701dbc46772533645d86aed71ba8b20905625b897840c90aaebb41360a286935824ca49bdebc0763a81df4bd64402 SHA512 97707ae1b533ecd3a6fe412a22fb70cf4ac278c2d7dba407fa7dbebd110d06f88a7b3aee3fb7cf4b0b5ca88f6fecf390c4d3e5ccbd4d18a75fc2f93a647e7074
 DIST cpufeatures-0.3.0.crate 14156 BLAKE2B 9408d9b8f314a21702bde22f272d47263ef06e8f6fac116edb2464109ae2ff0d10b9d4f54d465bb6c55bea5722326bb8ee541352e6f5e03116a449930fa8375a SHA512 a842c5e7fe435c4339ba0e12169bcf1a2c2ebf4b0d02cf200f91d88a736607a930ba840a7db6a71afc6b125649a9f14ce0977599db917ee78880ec1ed9600f88
-DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST crypto-common-0.2.1.crate 15165 BLAKE2B 3a5fa1cef6576582bb1630a57b95b8baae9f1c4a8a4427191319f40aba4646613a9a735660071c8d2cf32c39b3e9df090b2df8ff973303ae809f7661f0605db5 SHA512 d13dc1662ddad2ab5cbd350a9bfe22a1143ec4748d1be2b707bdf32461a3988e9bef20f5a74eab2dc1365c532f653f425450eef9c80498ce16ed4f071cf38ac6
-DIST cryptography-678c0c59f743e3b301fbd34f1d26112db0cc2216.gh.tar.gz 36158811 BLAKE2B a6297849c1ac24ce7dc33b1e7d2a9bd1a0e3a7b58f3af0e857f2ed32142c438f8aa93c6378deaf4b7093ba2e8144d6cbcb455e72f2bc65183b834008cb376c45 SHA512 7e9c4f9fba4fcaaa0cf31a0f3478822021f897ff30f2d64cc9585bf25e1e3bc31d077cb7ff582e42ca0c6482f1f74857adbf5d053d2d820ac6ce5cf4a2f1b8f1
 DIST cryptography-e300bbe2f1bec75e5ee7e0ab7b196958831b3db6.gh.tar.gz 58460059 BLAKE2B 10615c02c7496818cc68e8040769db711d6d34db56c2f711807f5ca713017d7a96e81fdce588d8df44aa03422d66739fff0e5509614d2cd21adabf060e73adbc SHA512 0f6b8ec15d465843418d3884c837c422fd8225e5fee8f60d5355bf93e40092306031ba9d45ef05423b2a4072e32360670982bf7d2875d1cf84d761d1ebdbe902
-DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+DIST cryptography-ffde75a2b594822c740a2e4748b56c00548302bf.gh.tar.gz 58532511 BLAKE2B fe7f1a650ee31d2475d294ece40d8830bd2852aeb645b389d2962dd5e1494ce1a95a4fc7ea49ab89d1eccc86f99672a156af77f440425be307afad721b07f842 SHA512 2f175fd95d885165ce26e46a96cd03f023fd9a1324c6aebe754d55993e759c75620b7875cb3b205054f71ff4056527ad9da0f284cfb51aed958dc4f041776028
 DIST digest-0.11.2.crate 28579 BLAKE2B 5c44ee46951bde52ed453c616e14ae9c18f27a1ec9a1acd7207af449b4f5c70d392b5f362e4b6dea4dfba3807a078d4ce6c8db51071b74aa7715b476c63946f4 SHA512 3896a79e584f406ba424f263886e4a169bf757a0871f2e2c8203b5feab75482b7e9fae4aeec33f78ac0f7f14101ee012c32c0476fbebf4d2900532a97c61d849
 DIST equivalent-1.0.2.crate 7419 BLAKE2B 7ce4fb7b911961cd4ccfb48323eea4952110a069789c6bd177a63391c270df861afadd00c07db7b22768f0864f320e429e0200c433284f528336e2f81d071eff SHA512 8e0e2dc070794a85b276e93f9e4a65d3bbb8587b33fda211c34479a0b88504c913d8bef9e84d7996254aeabe1efe4ff1ef6259ff4fe3f9ccb90dd90070b3e4d4
 DIST find-msvc-tools-0.1.9.crate 31493 BLAKE2B 4137592addf8b58f4e4c02be537a72b132b38cecc1c263c2569fe40e2cfe4377e7141679f32661f44ed467cf9723343ab13732b3d6f4a2a84c610d0958e7e30b SHA512 729b3c1c1d520dffe5d88fc8b58e47fb7e86dc26e568fc317eea5ca8de0ee953fbafaa20ab34a6bfb43173bab39a90ff6954c11dab8d545e902305dafc8cd3de
 DIST foldhash-0.1.5.crate 21901 BLAKE2B 22c3a266becac17995ac996f5c9caa8dea77e36786c50464e4e7750d8f3f13321a0a1abd3a9abcfd6ff441ddea257066b2dfb7fc6fcf7468f537dbd1b0db737d SHA512 3a634fdec410d87ffced8aa1bf8dacd9316a04c51424563d60b4dd611617041f09085edfd0ec96e6bb0e0db74a0e950b0616d1fb94a31667af35af1637604c22
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
-DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
-DIST getrandom-0.3.1.crate 42449 BLAKE2B dd70e0abfd27a7c363ce1b91746ef7568edf1d176d5575201623b6403f3a503b5d8503d10ba01d055f9de61cd8092729d34ac8f0f4f9fc6ad79b9fce926720d1 SHA512 431682efdc2ba82114e173925b99e1059d4915ebec6b0432d4a7683e56ccff7b4b45b9ee9cf5d0ee53067d5ae1ba733524c18577379c8414c385189718fbbcfe
 DIST getrandom-0.4.2.crate 53905 BLAKE2B 23aca6717b8fc8bdbc26bffaa1ae3aa35666f82951ced24e1d7b7530feae7eb5e66a9c81b738bbd2b09ead6efa030d2850e0ffb314dc82972fe72af361b961b6 SHA512 191d847be8c21369067b707c2c20cd56531478aca534ce902271e2693e84f6d74306a690759b17a8b1e9c46c639fe0e7be3b2fe41469eba4d7c27bb1c11a442f
 DIST hashbrown-0.15.5.crate 140908 BLAKE2B 6a360eaa2e174ddd1e9761bc19edc4b57b80f84c36bb5d64003c7206755d4175a05f39c001acaf000ec69ced9e28c3853bd64702e2927aa7c38527a53abf2201 SHA512 654682535882733b56dad632851fed93a17ad0b2d3e13e3390d7802450781501e275b0e0b39fa32a6eae092132858ed79b305238cd5771c08987c5d26af6d692
 DIST hashbrown-0.17.0.crate 154597 BLAKE2B 1fd03ebd3df85e88abbc498ae8166d3d15f3196c52ce17cd29751be5aaca18d62629b96c1a4fd431e8b38c313e4aefbf78dedbf65bc202d9e4e69dbc1b03f780 SHA512 248f5333b23cb83fd8e439a17df85d0f5bea6dadb0e7cf2cd2d3bd0049494c125ea4fdf74ce2623884d2a3884d444689a0a7cfc9b52ad3d8de40f7498c56ef06
@@ -38,98 +25,59 @@ DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc
 DIST hybrid-array-0.4.10.crate 35046 BLAKE2B da3f60a8f1b76607ee648949c8eb98b7ed37bf98f55384db2f0693429b92d28bdba237a353f382aba00665a19a49f04c72c29872515ba2192b3eda4e65abd058 SHA512 12a5884b11b4ec82a03028bbd9d65d19e5e5e4a78ff2e6d46c4cffbc256684831fff850653d6d7c6a6583a6f2c91ba6ed184a1f2ec30341ae4110f33a5341d6d
 DIST id-arena-2.3.0.crate 12883 BLAKE2B 2a7f498c3ea5632af4a369d46f90106e642bccbb8e36ac7fe37be05c2125989ea2cf625db92a782408ecb5f68d3efbf3006413b5b748815ee42b9dcfb28d0ba2 SHA512 99652279014e63680d66bc8022ec3d2373d6e476646ee5551346fc9e62d1fd94b28c945bfc30df14c85d085aefc7fbb9051fe11012f63a9254bc11f03133f116
 DIST indexmap-2.14.0.crate 104085 BLAKE2B 828d8eede906c2908baecac840757ca8795587a552cc9dbcccde89a3b81444d99395670fd71404c33033aa5a1b905ed0621fc39236024c8b8b385e5d29ca6b5e SHA512 fa6bcaaf1b9bacabc72ae9d0569065325a6741b9ba5dff168ada6ece460175be47741d906d9326b48d30f6c55805d33fb64bfb497490482b4e412ac15a8ea55f
-DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
-DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987
 DIST itoa-1.0.18.crate 15935 BLAKE2B 8e41446056ccd94979f6f5a8fe8c48d6c47abaab99a41715cca31816f859b56e0cbacb998f300b62be8b719a6470f8a087f1439b72f2f6662d1cdd3d552ede5b SHA512 8dbad156e2863c28e2b380901a92414ef00e39f1fcdb06d91a0f3fb73108c2f7f36b699ccd93287808c24c29cca7f1783d48d5ca95f2173502963c0abcb2d09c
 DIST leb128fmt-0.1.0.crate 14138 BLAKE2B 6353a2520bb93e0a3cfaade09ffbd8cf981d2cf75579e865941f3fea0dc745c54472b369873b1ef4f26dd7f356860e563bc7ca6e7615d600b272c698a55e54eb SHA512 82fbc7f0786185453fbf11fb3ae58e71fce9780f81eb6a56d7b559e3a0c6825751dd8b64f1266aab73fe65f7483a206e42f31ee1a1b7b1801246c6dc9c2ea817
-DIST libc-0.2.167.crate 757723 BLAKE2B 38f1657dea6d13cb6cc87c8cbededa9f0ac280e4f141f780719164451c941ef873cf6348fef7ab249ba7eed1cbf6768c6a8dc9a51796007c8ce31cdd2f90ecaa SHA512 f6690776266836371e5f9e20ec3a93bb17bc4296219755750e4e70e745016245dab9e247fe564e0f21d10d0c7c97ae97bf54da5068464a48ebfac244cf699166
 DIST libc-0.2.185.crate 821775 BLAKE2B e0e93466a29c9d19f7d9ab3581b491908d06873a9c57a96b0cae2eed0f0d1cb184ebe80bc61e36d5ab316ab35dca529a322b29e6895f7f339e72c79cca7f8ca2 SHA512 c8dbcaaf2e5d8377a4d1003af4a7210fbfe4f9b1e8497f07d88a231a8d5c9f67014e650a5e18e913e7b4d6a1835c4cbc9c31ce0cd224ea28acbdbb39034a300e
 DIST log-0.4.29.crate 51515 BLAKE2B 3f5dc889e895428f27ef107a63004c1b321793b865c29b20293adca81db4e25443e24354af37018c9a60dff1d54897c3b7b2c014a64280523f4a3586a7eeed24 SHA512 31bcf1669c27980f0a8500082c4d0cc500f6cc943518a3dacacc3ad4d8a0c238517f23c2c1969e5a22dbb5d25614adbf4e914c0557e45e1ebc8e7385b2ed14b3
 DIST memchr-2.8.0.crate 97780 BLAKE2B 228ce0b6fe8b168f5c31031690a5eb44466609b64c5c221e0b3f56fe331b4f25c0124d613c94ef030b225000978953641f5b07458d530c1d50eec3e1d54e4274 SHA512 8089238153493a0ff6adf980efd1ea2ba10eeff9f33fff200268692662d24152a8c14a4dac37fbc6a55dca741701fd256174f10a9838ca66f038f08e090de12f
-DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
-DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8
 DIST once_cell-1.21.4.crate 35010 BLAKE2B 9117ed1d478e626b7b7be2e3ff8b68a382b051112c7ca4425367bdae86977671f8b5c576131c82fb437740b6d98b72501f718f4172d39781decac2385e8fbd4d SHA512 af67669b0107f44268ba74c355200cb2ed1aab235a6989a8bc54323eb2c9a45677010f8672e7790edadd4c981e939436e0c3a099d33c06dce9c14fd5ede86155
-DIST openssl-0.10.73.crate 283994 BLAKE2B 06675b7c6bb1c73b10826577d7d928f4d001494a4c2add24a593c8dd82731a91974147981a63f56b2f11f769b1b93194b9cbcd14e77a578d6d649ad8119e856c SHA512 be1b5384ba72984fbca1aec534764d7b5180cbafe33433cda9662c492fcf219a3a3fe4148fc3c0702aeef63e2570ae7f27dc6a8dba95c7471d4a4c20f7ab1926
 DIST openssl-0.10.81.crate 311187 BLAKE2B a66963c92f34d6efaa80363681664eafdf21af640727132155b2aa1f8c167a9af081091addb675e901ffa352145d1a155b2917df90c4a7917b01c722a592d559 SHA512 533c23b4f1e9b942ff30eb3d22232298135c370fc31c97940f4ac18c73291acca6be4e03284efecbd01096999a6529d1a33a63db332efb4aee478cbcb3f37eba
 DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c
-DIST openssl-src-300.4.1+3.4.0.crate 9945831 BLAKE2B 5ea47b7a9d934bc25999bdbf38e35b6d860c02444367277744c2ce4b43e1ee127f6662076ad1c3e80aa538c957c3e0028df6828c0a01df19cb5e9fa03779a770 SHA512 f0d5ba6af60cdbe7fa926412e1da9cef57c83fd41d9e451a9ed3e69d294e233823bc23ba1b897c40dbaa833274b5b8e2ff30ad6e801e51f26a93cb1594695480
 DIST openssl-src-300.6.0+3.6.2.crate 7191232 BLAKE2B 9fa476c2e22e3c0a32da495607b0d51f6120b02558bc3260e3a09f3dcc146b19ed708f99c6cfd6021bb5682003f5c2a86f559b5217f8bd5e497134af96e04f83 SHA512 1d81acf3a6516b24498880861d85df0f6fe7ff36bfe15bda2046ecc10e02822d3b59f16924d109bb35456a0545c371a60f972f0f6cf90db2e24060721bc0ff0f
-DIST openssl-sys-0.9.109.crate 78247 BLAKE2B 3bf1da4b999a0c9a0891baafccdc541809169921837166b31381590aedc5356992cd71f21a374877dea4cf8015eaf5d8ac7c7ffccb11511893d5d0b8e57e037c SHA512 2dbb01e3b734554d85f9fedfbf9f3ef55132fdd5a328e2930ce056d05ed55a579c3fb12b907f3989ffe15344e7f1633ccd610524d56fe6c9a687acba2d0e6fc9
 DIST openssl-sys-0.9.117.crate 76045 BLAKE2B 074b44386a0a0833db961f8f8a249abdbacbc43a5428f8957e2284263206f4c2513c3eb7b38c96975f11ae75654656eb5d6d7d438c31bb5336835d9ed067e9b6 SHA512 89eeb0bfaa2c1ac3e0a8d268a46f8bfaa9942b0f840b0403faa15474961066559b3a1d24f672b445e1029301e6a99c7e2d84dec27528183523a409e9fb57b242
-DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4
 DIST pkg-config-0.3.33.crate 21590 BLAKE2B 576349a975cd4b9ff08c7f797f300cb2774425c72ed7baced19e0ba6231246f4479939c61bcc9efeb9174a2d6917bf009f02e93c26800c65e798b9e51ccf4d8b SHA512 af931d889e72f51e0ae41c880a1f5aa6215b93148cf7041378664e4ba013d0c83d654e560a73c9d7b301b5a008c221e48ac81b413d1123786e003c97f7fff63a
-DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19
 DIST portable-atomic-1.13.1.crate 197001 BLAKE2B 6d0898c2a537a9bf204b7749cca5f5fddf280772b56eb7ce8fdd9cf7d71561137b26ef89f415c40277a1c89981333eef78e5bb4624515a294ba28fdaeb4c70ea SHA512 2a1b31ac9814af884640b3398ab824a9795c72d260527a0966b193113808cfbb3345d50cd1beaebb45863437c3d06c8706d34b26efecceefc649319a4bc274a3
-DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1
 DIST prettyplease-0.2.37.crate 72033 BLAKE2B 997c8d855023ba6dcc7aa3a8f1c0ac6f6ca72dab2804cfcfb0987832ae044ffc5f5d7541e66d7ff5b0679065e5217078a832333e6cb92d89a93660aedaf0b447 SHA512 3273621f42cd2f4f892ee81e130f50e7d30f7254f922a84e55e454c0157bd0a59c678ee352e05007fdb0a62cdab2d7693185990354b81d2b1f5d08b51cff77d0
 DIST proc-macro2-1.0.106.crate 59765 BLAKE2B 87f95795621c4c992c370dc3a1240a2d5580e3362356525efe640f8f26ad0492b3c88755d575c080ff7db11376b0d82f31141bf6f86c895249b85e46c081220f SHA512 b726e2c92af434bfa88cd4f53c3fe6db647503567675fb439890dee3d15f5111137e3242b28d164114ce081c10acf3fd11950753ddb349190c87ee04e7d97744
-DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee
-DIST pyo3-0.25.1.crate 1121993 BLAKE2B 79a982131fc4c4f9292e97bc8d938d236ee9cefb99bb90646a84703660ad506aee8ae1f1e626d985aa62c695722510f2697544581fa5c3a01f193be2bc2779fe SHA512 9c842c89d274dba0c8a3085a8524736245d65f07e5c05bc13fc89167cfdeb1a4ff2b4a9da9467eee918e45d01777473f39bda11efe0052859969d4fdeac1adc6
 DIST pyo3-0.29.0.crate 1241253 BLAKE2B 29deb7fa70010bf3d7e9e93bbcd87c0b56c4ee7ef0c2e5956181d2fb5f06f4c9b3f28bd1ad280126c26c048808b91b847e1fb69ddd617ef9e9e5e004cf4e48ae SHA512 e6822400de53ebcef4a14c899dc065abae621a126483873139f5eb850877c94f4bccee3a183d4e2a69eadcd3c3b82b0a6f3e1053d926b103be572329607f2f67
-DIST pyo3-build-config-0.25.1.crate 34126 BLAKE2B ca905f1f74e26f38ab63a4f5754055c9dff01f9396f81ece09b7ce067181b657e6746db3b373f7177805f6564d0df0db064b5fcab8160d5edc357e64dd32d0fc SHA512 d6fe4a46111188203a839c8c73b9835f98cd6bc5982868cbcc9f502c5a09b35c3e61117b50ef8372470051b5bc4959731907748ffca89f42f300a3081b7b0467
+DIST pyo3-0.29.2.crate 1255741 BLAKE2B 5187b7dc0f0b2b1441b451850f442a9cf7b8e65baab3c94996be80e39543350ce8739baccb2df0caae1049a4cf744274e4ca9a9d752887d09df5c03e380d42b0 SHA512 85326462a932fd49441f320a879192306a7a6f3a66468ca468fefdb3dff9a530b7895010f156c8c3b125279b94dd304b72825fd4bbdcaeba8e3a58bd8cdcc929
 DIST pyo3-build-config-0.29.0.crate 39616 BLAKE2B 7b62a5976b890db84e5256f3136185c2a9c3b7110782b5b0cdc314a5231fde30a853ddcd17af63b53488b3e8d5e310b01002b6f3c32cfeb1e5c3e168cd6460d7 SHA512 df77e8d7d5fe173749437ff6b90fa1703083377d515ab8a85dc77d9cac9c3fc331ede4b040f7e3694311ddb5adff577cf90c181a27c196ab93a4569e918fdea8
-DIST pyo3-ffi-0.25.1.crate 78058 BLAKE2B 351fe00c99008a34a003e50cd4f6d25e6dae5a446928358cd5146ac9924254614724a015ae77d8aade7bcb497cf5e5b5018021ff5d89a8efa6412f5ccb48744e SHA512 35ab63888f49df13fab8b96b87f6c705186173923fd5898abe8730675156426f020ee517019926ba5e06cdb4fc5f91a75f648ce9eba892e9eaf3ee17864a8ec7
+DIST pyo3-build-config-0.29.2.crate 41104 BLAKE2B b4a78b704ae7c6cd8393abd436fc5d4e9f984ad6f4c95f1fd069888865a516f1a65eaebeecc7bb61e6a0d62d637ff4312a8d6a31f2dabb262d0f3c5177abdf39 SHA512 ecae961c373a87eb13ed3881ac4954112bbf54b3e02eb287d818e44e5ab46cd4700220da5072dd1fb22d68435d012a413a3680b54505c700ee059f1472833b6a
 DIST pyo3-ffi-0.29.0.crate 88184 BLAKE2B 5891af92a3bcba764c4701dcc0a99edbced010a5ac46df3217d004f5c3a368f18331733c6723bd49e522c6f7105455df13e2be0f07695ed5ce6ae71c15dec438 SHA512 baaf01d13ddc09316ba16b22e9ca15a67e5bda5b861ed7961c3393fd4692fc1c96952f81465d1dcb6531b9083f96c5630981b3d7802cb1ac2af67aafaffbec76
-DIST pyo3-macros-0.25.1.crate 8886 BLAKE2B aad9c975c90ff93429be24287d76edd945578b546a927f54d82b6d4bf184f1f8d426ac112307205346e85999a1e89b097f68310de647f27474790bff01c3517a SHA512 08387f3d1ddb0cc253eed376e6e8ebe5722b31664ec742f16c0454b52f1fbcadbe7720ae9e2d3870fe0ca2690916cf6e3e032f5a3e65d767322c068432f6d470
+DIST pyo3-ffi-0.29.2.crate 90029 BLAKE2B f20803f6866a99767ce814984cc624783c2207ab54909deaba0a674c3c8f3e98c56bac80e1ea0e13b295634b0c6a713bd961b6c58aacbbc3be5fa9e224ff86e3 SHA512 a5b1db7e856af10f32ba3ce6a4dddc48a11f48431b82cbc1e40be88370836902afc9ab2918eb953d7fbed1ad7daaebefdf70489c7c798e591782e7dd6e2d0ddd
 DIST pyo3-macros-0.29.0.crate 8915 BLAKE2B c12d23753d5aba7333183d4b41f16c8da1d4297a3ff86b3b150e9185c1978fc184ac198e566a41833292a8a78ab59446eafd5ef7169e5cb41493e7cbeaa68280 SHA512 fb6633ac76229d2e0ad88d51136a9318f03823b27c700a62cfbc957b4c834985e2f4c0cdaf5ea5e9993ec9e8ce3d63cd6b3fb823f2a042e65186adbed78da7c2
-DIST pyo3-macros-backend-0.25.1.crate 76006 BLAKE2B 02225f8591585a6cbea7d6e53503bfbac395253cb0f45c588a2eb38908bf241034412832f2fcf4e9301318b5b9b82a888755d970f544f402a4f0cf9e4a6eefe9 SHA512 4c9006424630ab9bcd5dcdd45fe927a95a40a61757f0950396eb9f0c3f1794772092a19773c102220489cc621ad65d81dbbe459a1be472f6cd3211c50ef33cc2
+DIST pyo3-macros-0.29.2.crate 9044 BLAKE2B f7caebd70dc9f54914d1d87e4c800f7bddc5d1e09835b0afd96e1f98320127660aa38f58b634ca196d823c926e279bf87c17506161a61bbae0908c51fc3b7eef SHA512 32281797e849ccb23c0ba03f8bea13ffcd86acfc3d5df65543c13befc03c142e88bfaf45f0cf5489cfe9e6acf9170ca6c24ced5d3f3f72be37bc7d2ce2bdb935
 DIST pyo3-macros-backend-0.29.0.crate 91943 BLAKE2B 7c2977dd9c80f3dd1f5375b0c65492b46048ca02e6355ad746bc8430cf92eaf25c701f416469eb69724fde5220651b1095c09eb9e3ff860176f862d7c7287407 SHA512 13a7af3958c09969637827d97ab9bbc664c407dda9e4283afaf495757798cf6f84932468bc092160fa75211ce0aafe6efc657f3a390234d77a67362cfb31fe0f
-DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
+DIST pyo3-macros-backend-0.29.2.crate 93749 BLAKE2B dce6aeef93fc8483dfffd5b514d21530ff499f241ac157e2ea304c8cd050e9fc1343d356a5a85dacb8a73d4d4405b89b4eab128f85fac54aa00f53298ab409a5 SHA512 944b8482e2a6fd0dce82eabe50f915d82b066cf11944e413ab81c01fc917dfe1877748cb8eb92f23d8acee43a9d1fb35f8690203ec440e7db7c66b03c7f27358
 DIST quote-1.0.45.crate 31564 BLAKE2B 1b2c2c3e6ebabfe10affa4c43ca0bfd1f52d8fd49e1df463e13e63a82de41272089c8e09e4c02e8a33cfee768ace26d4d42a50752de8fb5a776c59806139ad5d SHA512 df96ede01ebd0ed642b758bf1d0862d0e116fc2b3343e14edb657ce5438ccabe743dec4a0a40de4dee98c134d169af9aba459faadf9c7a832b26377e755d49b0
 DIST r-efi-6.0.0.crate 65303 BLAKE2B 79a28aa1e41721ad39ad95837d60a7034f9eedf0f5a32017849e7f4abebf6eb55e79cc144cea52030cade11d6be6fc5ba863e711a74038ffcc67b0d6eef47bfd SHA512 65f8c75c0201c3b922e6bf032ba9e6c648840f60939615565287b9c64d44f3fccbde209d8fe691937949cd76307b59c53801e6bd43ed7b8ada46d5d8fccf7012
 DIST rand-0.10.2.crate 104493 BLAKE2B 3aa9c466444f67d7baefa1ee063a8fb3f63edd0676914596ce904dd2d1675394e1e150fbfc6f2519934ef4e3eee2e090a08ff57104f1a503a8aab2ccc2eeb0c1 SHA512 1c50a5ddceb5cfc0282774ab3252dc76a15d19cfa5d8350064d120ea5264d260beb024f2c86244a58631b4baff5b8c8b03f71a3c857f7c4988e4a81e9f8af387
-DIST rand-0.9.1.crate 97986 BLAKE2B 98e230dcc51093e9dd842ecfd7fc5727ecbfee1384be2eea49c66dbd529d3c41e4383f876d21569cf57f757589fd89b60550a1932ee9ca359e908b914b2dfbc5 SHA512 0740e083fdad176ae332cbd759c020b0a477fbf22ed71df602adaf7448d76fe2e8f7c770c84cdb492e493275a23171e56a1afe35440572d2a7de56dd78a9a242
-DIST rand_chacha-0.9.0.crate 18258 BLAKE2B aa0efd158877a116b2587177f2da84832ba8153b629aaf8181ca7622bc8ea624b5a5d205d1b745caafaad78d5a55aa08a4f35822b8925acdf7d1212baf62abeb SHA512 f62a7bb067ff984049c96cddccc841cd9931daeb5b25bb69f056bfe577f62b1b35c08f2bb5028590eefa04a9369beead4e6b03607eec97256e0383b20542af96
 DIST rand_core-0.10.1.crate 22833 BLAKE2B 2fb3972c7a83060afd88e3e1c97c26ac2236222c02259b421109406047fa7599e3408db34d22037eac42887d129692d163b5466190c87cb18b97ea6e12f1ea6b SHA512 7095ef3932cb731fd52a18208100aa01e27cc66aaafd933b70444158258ab2e9542ef0f1d0564f2db8846da597c9b4be5a3c0f865e68607b7d1725582282b94d
-DIST rand_core-0.9.0.crate 23441 BLAKE2B 8f1543e2f33622edba457c340bdb4c266f8a3c9cdd95a3afaadf487f8dca7760548316227c1decc481a7e1ca5475f6915cfadb1ffd3860631c7a91494ea7f25a SHA512 def4746229c8405ceb46eb9300838918693f17a39a749e6ca42ad73fd02b0f0e14dca0dd26b3f030338db45da0d149d8c563d95cbd71c31995c5ab6294bd087a
-DIST rfc3161-client-1.0.6.gh.tar.gz 107790 BLAKE2B bf82f0bd3bc91758a3b5f725f34b274bc16415e822e642145c4ff795dcb8bc3ae719faa85e7ae9c57180db895dce3e04a98dba1cf60aaf20c2f62a4f8ec4102b SHA512 6f9ccacd73afe5c34de6a76afeea7f1794a2cf458fbd8438504e9bb9fa5f62061571f4ce6064672050a35198f9fc83e14d4eca2a877c940704d068f430ee4a1e
 DIST rfc3161-client-1.0.8.gh.tar.gz 108810 BLAKE2B 029a2b1787f6b70bd35c9d382def7f778e381fb048a2aa275fc33d10182bf232c069136a8afd93c6443f6241da5fee091a4f0220e4ac69052f23e8c0160bd1c4 SHA512 9edbfe72622ba78c8f6d0b16e7255e1547917505a0b30bc6c3db84eafd3f733e3d6f1b9cc3dd4183b8f9989d97936a8e18bf2f3fad1d25c33bdfb97be50a90d2
-DIST self_cell-1.2.0.crate 16883 BLAKE2B 56bd187fabc138c530aa23dfc69a330a7d0a8f86609801924fd1f4b0cefc43a99a8ba21d05e59272c9d32b83405b4c980df4f01e529772b760a9564dd8eb0c0a SHA512 41addc9b737d0379c0236b1821d6051d31dca6a76f463e6e56c3bac9015da4243f9fedc3d57e051f68f6f0aa610383a0b2cade07b1ea17e92173e2088a625af0
+DIST rfc3161-client-1.0.9.gh.tar.gz 113881 BLAKE2B 10af1318041240b38d174f60648a5751ce1d1b07bc945a1bfd5839f460a677f58d86d75b1801e1eca8069f75d83fa1c86a78dc87755a67b881f5a18660e1a702 SHA512 ddff4e64a2fc6d0729a6204a48f77e6162eca4e9823bdef5cb928ced0a6aed5c551a69402bcd1dc2578d2a85dff174fa531e9eba2c7043fe213eaebd3dc1a28c
 DIST self_cell-1.3.0.crate 23869 BLAKE2B ab5a81d1ceac0f7221390fc346376ea764839893baf4af0372b47cb8852b4fcd986fc04c1386068c4f796d6180f70f8def48d7bff4ef057202ded6e2d9adbbfb SHA512 b7a629dafc90702468a9b4d97bab7f222e6f7263b3755709fe8da3311ee50245c304006ee3f12401f0226807ab1f0a44d25759caf2b84a33757fc76f9867036d
 DIST semver-1.0.28.crate 33064 BLAKE2B 03bb56f4f0ec6f4cb208277500eba03cc81a7b2a115d64849b2d154066f723d46f8625df7c512cfbb2e402a36cbc5a1627e8041ac2de92daacd4a92a6943979c SHA512 bb44373e60fccb83bc95e4277ea0abdd756a3f77b3334cf6d6b5fceac086910661ab94eb326cdc8fefce0c09220933bdf03bfd142c1594a92c9c1e4e931114b7
 DIST serde-1.0.228.crate 83652 BLAKE2B d1909d671ea6d5c2eb4ce34ee4493ecaf665d416111b4cac754b5d33b85f916296110bae7aa961efd987a2ceb4a31ba645752ce99dd28dedb9f1eecdd4d7b1b2 SHA512 9b645d6214203533b303fc5e88ad4f7686c22df084878d18a0209a92304a340fcb62fdde88a7080cf7a7348d47b9b363885c4e1da90dba08cc99ff620f375e97
 DIST serde_core-1.0.228.crate 63111 BLAKE2B 8a64e4627ad21a3d16dd37d53fb809d11171bf337ec16bb1223075cbf81b6b85cd1c8d19abadf42460d0fbea323e2f351eeb6ef823389d519121b74e68edb215 SHA512 43897e3a7ebdc85d81d1cb30cda8f0a11610f6f551529c8a21462c24fb83110652b462846aa3e1bed5fbf8b5d7927018845a524ee9e079e2c8acf2c687efd6c4
 DIST serde_derive-1.0.228.crate 59605 BLAKE2B 166ee2f9ff9f7a0928d0a65a72db3d9226c377bca2a1771956e8ecd9c7faf0544673c9c21be2a5553e621b55c74c7b958052592a1cf6eb6427a2d4f3e3dc6bb8 SHA512 8bfdfeee10ee7ef0670972aa963ef63b13e8eb2c8a09b9e0b717f92551aa89b3dd2a0dcbae6ccf20a1caece07e6adb18f0db56fdac020e4e0281b0d24e376003
 DIST serde_json-1.0.149.crate 155994 BLAKE2B 7564c287a05c95feeba2b3a17e2e43ba047b0132b40fc4dd0c09141c2aac559c00bf4c63cbd24c17f12f5e6b49cf38b240d2c6c66677ee7a9edb197aba7d57fd SHA512 85fa8cb7b479f8241a4fd2255dd80e346fa5cde103aa7f25c14ccbcdf0e3276578fd0645e1d2542ee07c7e08c32058ff662bbf03926cd796c38622a12f423d43
-DIST sha2-0.10.9.crate 29271 BLAKE2B 1d614e0efe085cdb40e05726578a9b4ca6bce93f6d3324f5dc0444cb37054912cdaf5d28d468eac2c0046030d920fced2ccd006953b80865ce8a2d43ef3daa81 SHA512 963adeeb4ed8b0e7fc19085e8721ea13e9b3aea5d115ca1b3dbca495ad14810c6450991dd3753807c293c415aaeb1054b8b4124c72e7090cd9e86f09fcbb4f80
 DIST sha2-0.11.0.crate 33969 BLAKE2B 3b3cf6f843096de127e2eb72c9eb0115715658c34aed44be423f59779450af204bad47f2f3320f3ee89db03f9b20d22b04033b0f93a72e275a0ee9106ae489b4 SHA512 04164d47ac648dc498f05245e3eb4313bd61234aaa33f1ba13f6fab0cf8cd8716dc88a9c71e8264e0d6cd020ff732461cec00d92bc294e9c261a646c1988f906
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST syn-2.0.117.crate 306011 BLAKE2B bbaec02c4322f522bdfc87caa4ce6fd1e09bbf8f4a102d9ed8728efacdd843a2750f616dce5b2d3a3e46bbb7d57439fbd10e328bc1d4a01e980986cd815798af SHA512 035c2e63542592b6a4058a2a82d4c2c1f5793f84fb1b04cbd393337a26fcf661a1f3bea439ce98a1fe943b1c4d36d2bda16df3bbc3fa6ca35e1548d530dc8416
-DIST syn-2.0.90.crate 290584 BLAKE2B 9f469001c1439ffe57c578119653d3021c2709767e8e881441459a190402679f4fb78aa65e7822ff20913801c3be00d9b8f115189ea8e63ed94ed359b40fc9e1 SHA512 44606124f113c259c19edcb2adc1378d8292b422d800604c0e0d1ba89bd2d13d518cf4a6afa58daded54da9cb285464aadb113815406a0f09c5e18f865789ae0
-DIST target-lexicon-0.13.2.crate 27923 BLAKE2B 0761f0ffdc23b9c9df86b384d59611c7b8b5e29ff068f03367ad2fe84cfb6d11e1af149b9338236978e9566fedc51387db9f239d2a602db41045ac3db907faec SHA512 d25e3cc3d679cb6b6f24c03e0c24db9d6ca31b8ed42ac9531bd7637557fbba225a6c8ac4f68a8eaf3569195814d599e668a968afbc73b940a77cbc27552cc90a
 DIST target-lexicon-0.13.5.crate 26928 BLAKE2B f8c62cb91f68a635e6ce3fc254df9ce378b5e8f62c1147404c967484b9ed97fb33d7993b4671611db76566063e999d658d201f856f70196ec678d72cc758cf6d SHA512 956df27c01e1186c5356117ffd07810fc0b62fb919d5bfd215955ba85be00ef675212a3c0dc36679986be7b825442fec5c93c7643b7e1e19c04572e6463546fc
-DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST typenum-1.19.0.crate 76414 BLAKE2B 8083988e0bf1d7927377112b8939607f32af098f198a2bfcc2c5302170d9f6e5b29cf02d3cab16c1ecd0fb9f0a45ea3c6bd4a4e4baaf2dfdf8f694093300deeb SHA512 09ebcd7a2cc11f422469cf4fe706f1988bcd81d628e2bab3f54ae82b0aa5486d03a4392187a3736c13dc0c2027053387f89ac656caff72f36365c8be38bc7ff4
-DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a
 DIST unicode-ident-1.0.24.crate 49298 BLAKE2B 34ba2906a3ebc06f52a4ba77dff96a8f3fb977718d260886fa9e051c5830765641b65a63977110f3a79f31fa177b385f81b01d56c80f6a0324d36eae72e2ebf0 SHA512 7be712d8d0075ac9341790180e312f66264d3e0255c91b38df0951baa5e446dec24551bb2125a66a1cb9b6ca2f1ea37c0cc15fa3dd74f398ecf4d5302c7dc259
 DIST unicode-xid-0.2.6.crate 15744 BLAKE2B b1bad25897717f6346f988d5a7c90c51fb842da113f19aa434a64add8f2e637258d9fab0f7b871fd2aac02e83c68359fc679b326232793cbc804523e2bff5056 SHA512 f68e78484479a5341b14d7e3391e691265851fa00feeca53af745479af6aa9b4ce3570456df785c8362043db9b04e2e57f9bad05d8305946f16af405bc611764
-DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
-DIST version_check-0.9.5.crate 15554 BLAKE2B 131e75cc287518831e142430e2a39b48e4275874f4473780d47a27552294097aa1cddb65c385583e1022478f940b495eb43c24a8b1617b8ac5a24af3340c0d72 SHA512 d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db
-DIST wasi-0.13.3+wasi-0.2.2.crate 136754 BLAKE2B a17e2670caed033c1b2e2bd709a79c1dff5d0ff46b32e9d9b0faceac2b3350397e7bc6ce113a9275c400537121c9d853130b4bd546afbf0bcd248f4c69d8a708 SHA512 c0b0ce3c4d82ad7350e017fda565a69cf91186ebc41a1c5bc21a6e2fd2f0d8e7d90bcd60488074da6062ac1fa39c684ddd8ee1d8efd66e82eff36ddb16682abd
 DIST wasip2-1.0.2+wasi-0.2.9.crate 129778 BLAKE2B f41afceba3c586d12829d2c59f45198c61ae04a0dfe72d6bad6176a3d38189a097cf633f34accff83d7ccc238a35a833381e98291e5fd37f2f4d6e08138af2c4 SHA512 284571c833a1770fcadd9a70155d8b507e9f7f0590015e1a07ad0512ac0a7f0ca4693ccd1aa1ab27e74ec58cb75f314770b66562a2167cd6b5086a7871527eb1
 DIST wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06.crate 123354 BLAKE2B d8251ea31999f954eb1264bbc7792ba16a90aec3ed3112fe84b9a93dd8a0e493390b899be9e5e215ebebf644697d3bab680cb07d5e64617cbb57e6b2a28ae95f SHA512 fb136a5475fb4696902d4f4be43e0d5d28cf3bc1b6c83e5e7837499ee038f995c9f084064e2e4585dbc3bd260e0c7c95371526b04933f2c60fb6ce302416215d
 DIST wasm-encoder-0.244.0.crate 85804 BLAKE2B 6dabb55c635d13d1d56711a43c655dfcb74bb9f0be10bccd412c21b5dcd63a46b73ff40955ff28aa0fba9341fe22161c8d253762afd587eaf69a7ca49c06e285 SHA512 ab78662abd6bc9edcc14531a87a848eb6c26081ce9bcb9ff15415ceecb48dad98ab6066638947780c65d7689d11502d4dd2353ff3462b4f49e1c1a8c00d2c1d2
 DIST wasm-metadata-0.244.0.crate 21500 BLAKE2B 8da1035b6302c23b00792d90153f74f35eb9cbe913366b43ff7e5d81481c903396b32ad54a416a14b40ff8d4ba329c6fda8c203e4b16f1ab80b3bf4535cde72e SHA512 77677c68dafabacc9697c6090d01fdb171c33ca1663c86dcd3612630b2ea6c41232a7cee125ba416d373edb34ea8e0926d164012461e2ddca8d4d18597feb855
 DIST wasmparser-0.244.0.crate 265607 BLAKE2B fb982e84536afde140d972614bf6c2875ef169f0b68010393e61d8a1041e57d5355e8f0a57df0681ce4159f830e30a59affbd733656aa9c633ad959225007b11 SHA512 d1a1f549fe93e11cf4155a8f5840fa444505ca9184e28163917bd8ddb1d53cb4d2be0335e183ec24625a7db22dd5d7e22c93c697bdd4de0d537b54af4ed7d834
-DIST windows-targets-0.52.6.crate 6403 BLAKE2B eb98d0a8daeed5fe76e7fa8edb2743e2a3e77dfb9c4ea68605a6ab10532cb7cfc43bc1cea0180869445bd940be762a40136500e26b84ca88b5e0c502004c7a4c SHA512 d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f
-DIST windows_aarch64_gnullvm-0.52.6.crate 435718 BLAKE2B 8b12ae02892cb69401329034bbca671d13bd268a112120b56b90504707cef89decfbd2560492844a9f0588fab62dc1476ab7e931126b939015d25a8cc91ca334 SHA512 f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5
-DIST windows_aarch64_msvc-0.52.6.crate 832615 BLAKE2B adc8ff61b6dc96d39c92c7d4221ae6aa0575edfc016cfcd046067ca5d8fcfd56d10e8e227be1c038ce34684be22c7ccaf5f18cd5a7638d28fbff4ba15b48b90b SHA512 a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b
-DIST windows_i686_gnu-0.52.6.crate 880402 BLAKE2B 5aab8ee07132eccb7695807eb44811beeb0657aadfb672c54e99b6ae39c067ba9b93e38fc69bb5b9b14a9759f263ccd5e301597d2727d83b31b49a409b6bd405 SHA512 a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822
-DIST windows_i686_gnullvm-0.52.6.crate 475940 BLAKE2B fec4fda8bb2bf319a501a22372fa642ae682e4dee3235b258a028190ee73220bfc55b3142f06249bb4579b17e5fde662bb2b121aefe18544653350d7d0fe7d8e SHA512 95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f
-DIST windows_i686_msvc-0.52.6.crate 901163 BLAKE2B 99ed34e052db5ba77bab240ed5d38ce450be347a794d63ec39b719304c32722c9999b540ab40abe0216318900b7412970df99dfb36d1516a9517cae0c77d1bdc SHA512 ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96
-DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc237e14e32aab97f6f91afabcdf80d2aee37d6fb4b8669aaf433ff532c85dba59b3d366c7d41b61a2f29b96f960169c900687 SHA512 c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb
-DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
-DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST wit-bindgen-0.51.0.crate 68035 BLAKE2B 0cb5e191f866c3782b6a1e822ecbae6e618e08371867462addb027dd5510638e72438d991777877d5754b2932afcb41f2edc1ec1426334a69311905f0f309b6a SHA512 61380c309630ad7f415d467daf1d639ad7a3e8dcd26e5f88aacf0230b52600f150e804821b6a1df9b79cc7fdd4f1d800d043ee7eca770b1947a3cf06f893711e
 DIST wit-bindgen-core-0.51.0.crate 35048 BLAKE2B 1ce5f1bd6d1ceceaeb91d247f63745abfd25b539b57dc12321a2342f55da1207c697641a778ad6bff2bbece300fa52a788c7890e8dc49c5357f48292fed2a693 SHA512 eec78ac1566cc4f03b1d0d7d2e84c3d0fc2458a649c01a45c9c3781034078ed51b4a9852760fe96115006fb3415bcb31b1bf429cb3cac6e51e09a1c0cfc32ed0
-DIST wit-bindgen-rt-0.33.0.crate 3357 BLAKE2B 7c5227e835eb405b681ba36a2472fb3330b9e44f8e9cef06ae5de326691d4e4535cfd09843241963572060f4ccb048aa088fb8692591f9253cd215f510969420 SHA512 fffae2da775fcb5066398aba5cd02119a07f5bb5ab2282c74f1665656de0278ba13352b8ccc6ff107677aec3ec5d401729158332f653e0a2e7b393d1aa018b8a
 DIST wit-bindgen-rust-0.51.0.crate 57051 BLAKE2B 65c45b1b8b08681ded9bae2b4ac982770fa613bfe850128de1116a51ddd6366423c27e1f704817ad69dc05694e03aabb56af5bad3aeb0aba3cbc9415fad474e7 SHA512 7a5c29b92fa53ac8f8097b04a9507f471003edabcae0223d35180937b9254c62b24d9f4cef790000bd7bc7f6966af3aced2d7196359479480455baf5f4450f9f
 DIST wit-bindgen-rust-macro-0.51.0.crate 14283 BLAKE2B 79bc4a4846ec73ae02fe69fcb7898297647a0c70526fbd555e79a4c76de968f0d4c9e2e497643d9c1e7403bb8176a2108ca25a7cef577b9db3ae04142a3bd1ba SHA512 bdf6ab20b484180bfde867b8c8b03c10fe02a9279895ece43fddbc20b1ffe771128590d3d4c72585e959512808682278e54983d11066e0192d84b7aee830e0e2
 DIST wit-component-0.244.0.crate 256882 BLAKE2B 5e9c706693e3064ffbbe28a23e64e5bc32f6772ed294dce3bd2972b8d951f2820ddcee5f9e651b1acc470740b021986cedb6f0ff7a9bdc2b6e13f997dd341024 SHA512 efbf91954b7c4fc9cf5835783245f3a8cda7e5883c6e244a3da85a64b6b2d74f44ffa5f73309de7451b5e6aaf614664869769b140872ab85913878e52e490a00
 DIST wit-parser-0.244.0.crate 159371 BLAKE2B f46db4840d3cbcd42e5d26b854247d172f8385810a10c437aaa6b67f3f72dcc230a8d75f4e5ccff6ea006c8a52c2fe92f39d9d90cb30ba594c02ae618fb66bb6 SHA512 c554a167ce9802fbc7537700376da70ed6a79f96adeba5a0e4c955a7cc4f2ae4f588071e25735903d4f509f2590341fa39b2edd018cf6d3bf8ad6477b2474b01
-DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
-DIST zerocopy-0.8.14.crate 229188 BLAKE2B 9a77e34a409cd2e02bde03ac27b5c676ba24deee2044ea40df3733c7c917b7b007b5eeb3770787215c5562f539a10df63bef3b2e14fc1907b884b5ab142315ba SHA512 3fa3186cc509fe92ecc305f331b3422a2b622803fa088028d4a8c07bb74a670e4289d8c3b5c617ce1315cd09192058e1491ee87d78c81efb2840d187d6805f30
-DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
-DIST zerocopy-derive-0.8.14.crate 80308 BLAKE2B f66557cddeae39596cd6cdbd86f4444622281fdec823660250a19ebb2610e1a611341560025ee11d31898e844edb33c8de62e1623243babe9d59529eedd81131 SHA512 7204b9584cc6bdbcb1bf2408be26ebc5266ec3084816c2eafbc7e0712437eeceaf479851388534a11a310d354b43261c1cdc0b01391bf2550ce0efd9fc4ab461
 DIST zmij-1.0.21.crate 26665 BLAKE2B e958b58e2213ad13185ec6df55d07e6c80169afa56133038fa66cefb4a9f49aa786249a486dc09b2d0a2f74e41c0d0d713135f38a84dff8f6239636a6bf3cadb SHA512 a488f11ec8721ddfe42e61d028a128818551de8fccd69d7824504e4ae2efccdc38f716fa5a10ef4de07a8a087e75e819c4a1e0790817e8539b5db697bde14585
diff --git a/dev-python/rfc3161-client/rfc3161-client-1.0.6.ebuild b/dev-python/rfc3161-client/rfc3161-client-1.0.6.ebuild
deleted file mode 100644
index e0cffab43149..000000000000
--- a/dev-python/rfc3161-client/rfc3161-client-1.0.6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{13..14} )
-
-CRATES="
-	asn1@0.21.3
-	asn1_derive@0.21.3
-	autocfg@1.4.0
-	bitflags@2.6.0
-	block-buffer@0.10.4
-	byteorder@1.5.0
-	cc@1.2.2
-	cfg-if@1.0.0
-	cpufeatures@0.2.16
-	crypto-common@0.1.6
-	digest@0.10.7
-	foreign-types-shared@0.1.1
-	foreign-types@0.3.2
-	generic-array@0.14.7
-	getrandom@0.3.1
-	heck@0.5.0
-	hex@0.4.3
-	indoc@2.0.5
-	itoa@1.0.14
-	libc@0.2.167
-	memoffset@0.9.1
-	once_cell@1.20.2
-	openssl-macros@0.1.1
-	openssl-src@300.4.1+3.4.0
-	openssl-sys@0.9.109
-	openssl@0.10.73
-	pkg-config@0.3.31
-	portable-atomic@1.10.0
-	ppv-lite86@0.2.20
-	proc-macro2@1.0.92
-	pyo3-build-config@0.25.1
-	pyo3-ffi@0.25.1
-	pyo3-macros-backend@0.25.1
-	pyo3-macros@0.25.1
-	pyo3@0.25.1
-	quote@1.0.37
-	rand@0.9.1
-	rand_chacha@0.9.0
-	rand_core@0.9.0
-	self_cell@1.2.0
-	sha2@0.10.9
-	shlex@1.3.0
-	syn@2.0.90
-	target-lexicon@0.13.2
-	typenum@1.17.0
-	unicode-ident@1.0.14
-	unindent@0.2.3
-	vcpkg@0.2.15
-	version_check@0.9.5
-	wasi@0.13.3+wasi-0.2.2
-	windows-targets@0.52.6
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.52.6
-	wit-bindgen-rt@0.33.0
-	zerocopy-derive@0.7.35
-	zerocopy-derive@0.8.14
-	zerocopy@0.7.35
-	zerocopy@0.8.14
-"
-
-declare -A GIT_CRATES=(
-	[cryptography-x509]='https://github.com/pyca/cryptography;678c0c59f743e3b301fbd34f1d26112db0cc2216;cryptography-%commit%/src/rust/cryptography-x509'
-)
-
-inherit cargo distutils-r1
-
-DESCRIPTION="An Opinionated Python RFC3161 Client"
-HOMEPAGE="
-	https://github.com/trailofbits/rfc3161-client/
-	https://pypi.org/project/rfc3161-client/
-"
-# no tests in sdist, as of 0.0.4
-SRC_URI="
-	https://github.com/trailofbits/rfc3161-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0
-"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-43[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-
-	# need this for (new) python versions not yet recognized by pyo3
-	local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
-	cargo_src_test
-}
diff --git a/dev-python/rfc3161-client/rfc3161-client-1.0.9.ebuild b/dev-python/rfc3161-client/rfc3161-client-1.0.9.ebuild
new file mode 100644
index 000000000000..30f103ad7307
--- /dev/null
+++ b/dev-python/rfc3161-client/rfc3161-client-1.0.9.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2024-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{13..14} )
+
+RUST_MIN_VER="1.87.0"
+CRATES="
+	anyhow@1.0.102
+	asn1@0.24.1
+	asn1_derive@0.24.1
+	bitflags@2.11.1
+	block-buffer@0.12.0
+	cc@1.2.60
+	cfg-if@1.0.4
+	chacha20@0.10.0
+	const-oid@0.10.2
+	cpufeatures@0.3.0
+	crypto-common@0.2.1
+	digest@0.11.2
+	equivalent@1.0.2
+	find-msvc-tools@0.1.9
+	foldhash@0.1.5
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	getrandom@0.4.2
+	hashbrown@0.15.5
+	hashbrown@0.17.0
+	heck@0.5.0
+	hex@0.4.3
+	hybrid-array@0.4.10
+	id-arena@2.3.0
+	indexmap@2.14.0
+	itoa@1.0.18
+	leb128fmt@0.1.0
+	libc@0.2.185
+	log@0.4.29
+	memchr@2.8.0
+	once_cell@1.21.4
+	openssl-macros@0.1.1
+	openssl-src@300.6.0+3.6.2
+	openssl-sys@0.9.117
+	openssl@0.10.81
+	pkg-config@0.3.33
+	portable-atomic@1.13.1
+	prettyplease@0.2.37
+	proc-macro2@1.0.106
+	pyo3-build-config@0.29.2
+	pyo3-ffi@0.29.2
+	pyo3-macros-backend@0.29.2
+	pyo3-macros@0.29.2
+	pyo3@0.29.2
+	quote@1.0.45
+	r-efi@6.0.0
+	rand@0.10.2
+	rand_core@0.10.1
+	self_cell@1.3.0
+	semver@1.0.28
+	serde@1.0.228
+	serde_core@1.0.228
+	serde_derive@1.0.228
+	serde_json@1.0.149
+	sha2@0.11.0
+	shlex@1.3.0
+	syn@2.0.117
+	target-lexicon@0.13.5
+	typenum@1.19.0
+	unicode-ident@1.0.24
+	unicode-xid@0.2.6
+	vcpkg@0.2.15
+	wasip2@1.0.2+wasi-0.2.9
+	wasip3@0.4.0+wasi-0.3.0-rc-2026-01-06
+	wasm-encoder@0.244.0
+	wasm-metadata@0.244.0
+	wasmparser@0.244.0
+	wit-bindgen-core@0.51.0
+	wit-bindgen-rust-macro@0.51.0
+	wit-bindgen-rust@0.51.0
+	wit-bindgen@0.51.0
+	wit-component@0.244.0
+	wit-parser@0.244.0
+	zmij@1.0.21
+"
+
+declare -A GIT_CRATES=(
+	[cryptography-x509]='https://github.com/pyca/cryptography;ffde75a2b594822c740a2e4748b56c00548302bf;cryptography-%commit%/src/rust/cryptography-x509'
+)
+
+inherit cargo distutils-r1
+
+DESCRIPTION="An Opinionated Python RFC3161 Client"
+HOMEPAGE="
+	https://github.com/trailofbits/rfc3161-client/
+	https://pypi.org/project/rfc3161-client/
+"
+# no tests in sdist, as of 0.0.4
+SRC_URI="
+	https://github.com/trailofbits/rfc3161-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-43[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+
+	# need this for (new) python versions not yet recognized by pyo3
+	local -x PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
+	cargo_src_test
+}
diff --git a/dev-python/rpds-py/Manifest b/dev-python/rpds-py/Manifest
index 6b5346d333c2..992aa289c5b9 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -1,29 +1,18 @@
 DIST archery-1.2.2.crate 16228 BLAKE2B 489e4b2ea181a7915ca41f31e22e9e95609c0456b162bbcf67b2bca25c3873447ee1e5a22fba963bb6119dcc34a7ea7898683bacadee49fc4e6f3d3bd8f5906e SHA512 15d0e118c22d7a8539ee8e97388a7796b15b765f5f7a878e66959865497b2db252a351251d6ae587354f58528186542d32ae14640e252acd1bb6a95c5c21490d
-DIST cc-1.2.48.crate 92458 BLAKE2B b807d0138797e1244e50adccf8b0f31511daf6c8e42289b1ec47e86fc0adf409c1ca931136fe872abfc4ab4f164028bee8f08321911a66684024c7315c67dc50 SHA512 dd6044181d334ff219e2a9daacf3d1fdc7484c33883f45acb6329dda4ccc8024cd9056b03b974bb4f0c9871048e03e89221f802379d503a396a97af9f7af3940
-DIST find-msvc-tools-0.1.5.crate 30942 BLAKE2B 25f061bfb8a195752109bd444deaebfd94228e52c6eb94396fff9ba9d450876a58bc4352158684c59d1a2cb2a13a32ecfa1e96f1d80ac0c63827bfd7f46d9c80 SHA512 71021ce1a16c454bdd30abbb937c2ca67ab28ffcf88574e3ab758683943b44a96312a53cd6f5b8e76c89284a0cedbf46edb606894af720e3612c812bed189ab8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST libc-0.2.177.crate 792045 BLAKE2B ecea1ade26b0faa9cb5fb025e237f3a59dfb562e7b3de3682b42a41038b1d436e83b42b53158c1fc1cc4b1cc64ab55ba1497e869ae850a677c089fcce9138912 SHA512 9d737091dba80244137987d06a52ffcd44a968c96b59ae9af9cfa40c38cb9675d023f6324fbf25c436ce1b9592ebf26248f85b0a7c97ee02360ca624b0efb3e0
 DIST once_cell-1.21.3.crate 34534 BLAKE2B 3578aaef305cad2fdffdc40c392775a3540bfab3f3aeafd22466d9507bf8346b9fcc200929d48525b051070c0aaa423ecbcaa12868b34dca007991effb224166 SHA512 32a87506c6f4598f3ca2c88556014ef2093d5db9a08602335e847caa537a866492fa74c894e7e1da2e4289a1d3dbffcb90a9e37a4a1453203832f434b8206990
 DIST portable-atomic-1.11.1.crate 185506 BLAKE2B 953bb1f2059dc1d891305eb89945f1f6a172fa50972725aee499de72b5dd9b4ad8ccefe4e891183ff8e6b64f4d1bb45ec33b06e0f5af34c940f817b290f746d9 SHA512 4c037ae0b4aef43077bdbf803389bc078d963f20d023e2e1d339a54f67fa9b27c174e7c1b6eca8881ecf301e30c431632d2c0dcedfb5b19552892fac0f81e2e1
 DIST proc-macro2-1.0.103.crate 60024 BLAKE2B e5ce5f77838fd063b5615b1555db02175621135132de6aa7479d67fd0a34c15e8235290112a728f3251cf913a835bf0aafaf6930880511427143b63152047259 SHA512 9a6964a2ad24dbb1108b7018882ddb48cb6e6f652d1c5eed1cac94602539fc71f011a0a276765778df161edbd6387bf03a8505d93565e0c106f09e98d7d6efce
-DIST pyo3-0.28.3.crate 1204476 BLAKE2B 8540a1c51bac4fbe04ea34d5ce38471c13d5a3f0759e60cf21d67e846b00feb8316e70f32cb8dc6b74d09f0901ffc83d5f41b1a06da6d34790ef13e4cefcad45 SHA512 f955957eec4b95cc9337d331bba3bba52b4754b301cf86cd974601e64eb20c2424023b19be89a224661fe2e185de646cd3d0d00705b6b5cbd139856c9443a247
 DIST pyo3-0.29.0.crate 1241253 BLAKE2B 29deb7fa70010bf3d7e9e93bbcd87c0b56c4ee7ef0c2e5956181d2fb5f06f4c9b3f28bd1ad280126c26c048808b91b847e1fb69ddd617ef9e9e5e004cf4e48ae SHA512 e6822400de53ebcef4a14c899dc065abae621a126483873139f5eb850877c94f4bccee3a183d4e2a69eadcd3c3b82b0a6f3e1053d926b103be572329607f2f67
-DIST pyo3-build-config-0.28.3.crate 35961 BLAKE2B 61a0101913c6d563721049ca99256c2aefd89b017a7e18c82f4a6aceca0aefeaa71fd559cd43adfb5034ce076c904e5188f8f73961ea217287fbfd12caab9401 SHA512 78f85696901b16540d42187d10e888bd929b9f23415faeb73f9798abda1af3506a308145dd4113b070521271c72624d7930fb4b19bad25aa1afd3082030c9126
 DIST pyo3-build-config-0.29.0.crate 39616 BLAKE2B 7b62a5976b890db84e5256f3136185c2a9c3b7110782b5b0cdc314a5231fde30a853ddcd17af63b53488b3e8d5e310b01002b6f3c32cfeb1e5c3e168cd6460d7 SHA512 df77e8d7d5fe173749437ff6b90fa1703083377d515ab8a85dc77d9cac9c3fc331ede4b040f7e3694311ddb5adff577cf90c181a27c196ab93a4569e918fdea8
-DIST pyo3-ffi-0.28.3.crate 80881 BLAKE2B 4ac7066c911e2aec18aa9245efed00585d063f81d69910e6a146f8efbf2939ab5de519bbf2a3dde78b40c264e97c62490db80e9b2e84aaf080d63659a6676459 SHA512 ec49b5cc67d19f46c9daea76b37b4988af0f63b9ed67c71190f015a0aa9691d4a8ffd4128413de430928428e1e8e26d44c3103f561e6b71b7e8c4597ab602d9f
 DIST pyo3-ffi-0.29.0.crate 88184 BLAKE2B 5891af92a3bcba764c4701dcc0a99edbced010a5ac46df3217d004f5c3a368f18331733c6723bd49e522c6f7105455df13e2be0f07695ed5ce6ae71c15dec438 SHA512 baaf01d13ddc09316ba16b22e9ca15a67e5bda5b861ed7961c3393fd4692fc1c96952f81465d1dcb6531b9083f96c5630981b3d7802cb1ac2af67aafaffbec76
-DIST pyo3-macros-0.28.3.crate 8963 BLAKE2B ca9967cfba565b873ed77565ff6eb8408473c227d191797e9db8c6b5cbc89abc17ffd57ae71e28877088fe19373da2f503cdefeae6b0a47796f6abcf62044f08 SHA512 57d178bd9b53dd98916e60c89bc26c34f9949829dc17bf7d6cc15b704bba7c874d85d6bd3c827d401268660a79230a6e32711048da939ec4e22342f3e08046d1
 DIST pyo3-macros-0.29.0.crate 8915 BLAKE2B c12d23753d5aba7333183d4b41f16c8da1d4297a3ff86b3b150e9185c1978fc184ac198e566a41833292a8a78ab59446eafd5ef7169e5cb41493e7cbeaa68280 SHA512 fb6633ac76229d2e0ad88d51136a9318f03823b27c700a62cfbc957b4c834985e2f4c0cdaf5ea5e9993ec9e8ce3d63cd6b3fb823f2a042e65186adbed78da7c2
-DIST pyo3-macros-backend-0.28.3.crate 88063 BLAKE2B a484b12bbab3031838f61149ab9f08b9e460a2bd02089e08e58dac2cb747afbc0cdfe64018ed4c8cb0bbbd1d22e3eb05a6a72b020da6b71a584ec51ca8d24292 SHA512 45ce31ed64ee4fd0249736d480c9840a756bc45934d6803ae11e0680057ecf4cc74c71b47ccf9241fc3ab5c1e0b9c758426f08bd523d1ace92fc308302ea3c84
 DIST pyo3-macros-backend-0.29.0.crate 91943 BLAKE2B 7c2977dd9c80f3dd1f5375b0c65492b46048ca02e6355ad746bc8430cf92eaf25c701f416469eb69724fde5220651b1095c09eb9e3ff860176f862d7c7287407 SHA512 13a7af3958c09969637827d97ab9bbc664c407dda9e4283afaf495757798cf6f84932468bc092160fa75211ce0aafe6efc657f3a390234d77a67362cfb31fe0f
-DIST python3-dll-a-0.2.14.crate 103489 BLAKE2B a2868aa62d9b5f33ba0ab3be85f486e7b0594b8e535749e251ae9c829eabf9f0211f928c729b0f5b847a89be978c4b5648d333ac657a82acaa3c39520dfe0b8c SHA512 fde53bac2b7009d409d5dfab991b431aea7c16c5e0227a7bb143e73a043cd0490cec2647f73cfc34f73a192e9b365a70fd5b42d969beb2e3251dff44230a2040
 DIST quote-1.0.42.crate 31504 BLAKE2B a8106c0fe3953bcc2aa421516dfbaad6d6cb2ea839b2ce1447a45b8732dad40a921c2008b477bc0fa029dc0e0357a339db543b1f90bb9da77a5a3681fc16bed0 SHA512 6d55047312de6bab660459750c54213e986f0a80b4458fdb706c2fb3bab83b8239cd230dd9291662076d395c818a391142af1228ae3158cfa4960d6c74d531ba
 DIST rpds-1.2.1.crate 75113 BLAKE2B a6f928a9df250115c4db6e30612b9a719855a78c69166392dde73014852dd21b5dc4799e3782b0c7294bee105107f6c845ca94104426992e7da6dda6b9553e1c SHA512 2ee0afff4c56a1796cb3ac6e9131b3a2aedd114595f7c2e59ee02c44172d8b9c3717eaf473844b71ddb6b140b688732c751f8855a80ba78de1afaa0088107b32
-DIST rpds_py-2026.5.1.tar.gz 64459 BLAKE2B c7a919de25ecd22f1336e1ab0743d9fd23ef5470d23ca3b6e2bc11fcf531b958ee20cbc2ced2a16b207c28ad8c4ffce1a1327342332494ef5f828d7b7044060d SHA512 0819dde9d6f18b1436efedd2fcfe7e16745f1c38914781abab051ff5b3cd6aa008e9564f5736f860a3fe908340eecf2890150f395f4b5d83125ccc604dfd8f9a
-DIST rpds_py-2026.5.1.tar.gz.provenance 9470 BLAKE2B 7c53ff548a5cbe504a87aa29c9b3d7c91c18beb7e3d5b71a633c30ece7eb42cd3bd9f0eedae6226a4f925e205399964c0967d0266180de928452f65840eac36f SHA512 ccf1655c5feb93f36c67afb00fef0e174fbda3bd63e49981e61fa2f1831cfa2870d0588d0d3788642d3024ef3043aa1181362abdae310ae4b75e4bb9c9d7102e
 DIST rpds_py-2026.6.3.tar.gz 64051 BLAKE2B 84219ec9808786f9611051f36472d5bbb6bd895b56627b5df1ed50e77ced873cf1c287e325c6083c1bbcc52aef6ba49c50bf2e4c7e4a864243dba9a944d19b69 SHA512 e3b2874d3f430f805fa4ea2f2fe4e22f02b4491a68aa068644c43aa5949423496cd80a1e6a9f0bd7aec3dafccdac0b177334f53eb077d077e0e56a2e43710d09
 DIST rpds_py-2026.6.3.tar.gz.provenance 9615 BLAKE2B 03e918b518033aaae2693ca46570c3b70d18c2b88f56f5849052a98a597a4496113ee50a54dbd717d8fc170282b55aff4e29aaa2e6cde74946bd348e09d33691 SHA512 4f6a36b3c1c7556f7abd6764179f2cbc7e5991e09208b70f61788aa1e534b1efea93842e4ab3ec47c8876aa5050d5a1fbca7787588a0a9dc1549c39bbfbb6f23
-DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST smallvec-1.15.1.crate 38116 BLAKE2B 8dd779d7726694672945e928399e0459f4973d284a6c2d664c2fc757ebb1177658f47c812d9800e982479cbd7413fd4283c64a4d248ba5cff6397f96b758676e SHA512 c26b097a063353beedfcc921129cd0fb838c1c9420218993a05b2655b47b6ec16f11e0054312018658b4abd893beee140c5d2739401a5e5aea2e64575f237047
 DIST syn-2.0.111.crate 302117 BLAKE2B 9fe6c0bbeb432d67f4c879956c505d160f7be418cd16b48a5430c1c4c4922251007e3d85bf219daa16a7e9d8f32c15fdc2ebd94bdfc762135cb27b897590d484 SHA512 f30fc819fc6c942cde044b6bbe608f96736070717f28da71ab4ff68aa9e780416829152da11a83513fbc0de88337c2157e4fd1e4a029ebcbb64daeaa54dbf768
 DIST target-lexicon-0.13.3.crate 28498 BLAKE2B 397315667737abde41949081f8377f704c3a1105790162249a9f0c08b60f012e67d66550e9063d900ac98f5191d13c5ed23d1a8045f99373e7a673a3cfc029e7 SHA512 23422df6edb2a8cb0a9f048864faf76ccb27d6e97fbed7b208b77206941b196f155896a0381150e387142e976439a0a296dcf4cbb4df6bc0e11c65f97f979443
diff --git a/dev-python/rpds-py/rpds-py-2026.5.1.ebuild b/dev-python/rpds-py/rpds-py-2026.5.1.ebuild
deleted file mode 100644
index 581893d36db6..000000000000
--- a/dev-python/rpds-py/rpds-py-2026.5.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYPI_VERIFY_REPO=https://github.com/crate-py/rpds
-PYTHON_COMPAT=( python3_{13..14} )
-
-CRATES="
-	archery@1.2.2
-	cc@1.2.48
-	find-msvc-tools@0.1.5
-	heck@0.5.0
-	libc@0.2.177
-	once_cell@1.21.3
-	portable-atomic@1.11.1
-	proc-macro2@1.0.103
-	pyo3-build-config@0.28.3
-	pyo3-ffi@0.28.3
-	pyo3-macros-backend@0.28.3
-	pyo3-macros@0.28.3
-	pyo3@0.28.3
-	python3-dll-a@0.2.14
-	quote@1.0.42
-	rpds@1.2.1
-	shlex@1.3.0
-	smallvec@1.15.1
-	syn@2.0.111
-	target-lexicon@0.13.3
-	triomphe@0.1.15
-	unicode-ident@1.0.22
-"
-
-RUST_MIN_VER="1.85.0"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
-HOMEPAGE="
-	https://github.com/crate-py/rpds/
-	https://pypi.org/project/rpds-py/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
-
-EPYTEST_PLUGINS=()
-distutils_enable_tests pytest
-
-export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
-
-src_unpack() {
-	pypi_src_unpack
-	cargo_src_unpack
-}
diff --git a/dev-python/rpds-py/rpds-py-2026.6.3.ebuild b/dev-python/rpds-py/rpds-py-2026.6.3.ebuild
index 254c56c55d81..187d18ef23ac 100644
--- a/dev-python/rpds-py/rpds-py-2026.6.3.ebuild
+++ b/dev-python/rpds-py/rpds-py-2026.6.3.ebuild
@@ -57,5 +57,6 @@ export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
diff --git a/dev-python/setuptools-scm/Manifest b/dev-python/setuptools-scm/Manifest
index 955ba47ffdf7..b3ce19bc6963 100644
--- a/dev-python/setuptools-scm/Manifest
+++ b/dev-python/setuptools-scm/Manifest
@@ -4,5 +4,7 @@ DIST setuptools_scm-10.2.3.tar.gz 67696 BLAKE2B 43d36a0ef3221f96d980311b5c4ac884
 DIST setuptools_scm-10.2.3.tar.gz.provenance 10125 BLAKE2B 581394d2844a82bd6f4eabc86a6c77d355a573573140e151a4b0d99525e51ea0df8fec8cbae2c331764f4377b3c4283620d8f1336251218f1c14b58318a2e31a SHA512 304b057feab4715373caff13d24b4599e73711a9de0833b4f0e6422914be997ad63fbb4fb15b14329c03e772c89493c5b68d97d6b0a37e6d99c5907db77c4298
 DIST setuptools_scm-10.3.0.tar.gz 71052 BLAKE2B a9b5917a7829ae994a2db34d263e8f9e062bbc1afad9114c791cba5804f92b11d280a734fbe3ef3fc03e0563b7364b3a0d2e481ebac01001daddb3c841ce20c4 SHA512 aa4c078f087eaf5d4bc2e8a05df52967bb80b87f549b80a8f48985e9a000e46d263c0345deb31da37b697e946266007b4a08d3c9d94267315406218e19126694
 DIST setuptools_scm-10.3.0.tar.gz.provenance 10262 BLAKE2B 8683cf524082d4b651ca668434e99c9330cbaff39ffd9afbd5b18f14349524c3aef785073f17ff8730a9777a5e9acf2cd153a0db833095c82c29c8781f3be353 SHA512 4d53231f8f07eee46cdda8ff227b6acdd20a77886be31fdb399318c25433e47ac35f863f6cac8489064bfc176fb1ac421f9d1e3be5d1273acd82ce78919ab773
+DIST setuptools_scm-10.3.2.tar.gz 73958 BLAKE2B 239404a8153e8f40b59515e27f577a0a2f8329a3ad5e840597cda36ed4dbc0e0accabce9858adf8c9548aa02bce514fd3aef21822832cb606305058876aade0e SHA512 6a86a7a125fcbcaa03dc3a88bf1d06f2fea322c7eac50968b532a6b4f8fcb55c815b5a6166105bc2e989c847a809baf3ef3855767f703478cc52acb148c6a0ea
+DIST setuptools_scm-10.3.2.tar.gz.provenance 10215 BLAKE2B 4125d21450c497895d07b53bd18ce21912964c3a8deab5a26f45cfdc943597a8d2851915f3217d46b81a05587dcb0af2364d1672ea7e59886c964598ce82b025 SHA512 020138c5794031ea6e98e0d0263ba6aff06c0685c751d5ea296bc48472da487708050d1bdfe9ea48f6b494c0b85f2c4fa7c05eae40bfeb9503fb228db151998f
 DIST setuptools_scm-9.2.2.tar.gz 203385 BLAKE2B 8577c4c6265ae851212be04b245b3da8b49d541174f5e675dea916c76b3cba5b5ab9f6264a97904e2d5ca02dee4e3f8eb88c9e8badbba2ed53bed531fe9f6b6c SHA512 757ca11a3d13601606b6914ea70e3d271d287f26ada976ec77334fc0f611208669585d2580994f1ddff830cd698a837d3e882dd5cdccdaf9f8eba34fdd8cb708
 DIST setuptools_scm-9.2.2.tar.gz.provenance 9705 BLAKE2B b710df7f8cbb324aa2927243ab0416869319813016d64f589b7a9f565576fff58c1aee18da4ea9bc3fb5a969cf74c1fcaa1332812bf88267ec9f2bf437876e53 SHA512 6ac563d0ab5f1afce28976eb030364a451508ec7d47b6e99668c37b8ba09e3b56500b104d62ad6047fad9f6be0b2b6ebea66b561041485b9d15b84c39fe92313
diff --git a/dev-python/setuptools-scm/setuptools-scm-10.3.2.ebuild b/dev-python/setuptools-scm/setuptools-scm-10.3.2.ebuild
new file mode 100644
index 000000000000..b482524d5045
--- /dev/null
+++ b/dev-python/setuptools-scm/setuptools-scm-10.3.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_VERIFY_REPO=https://github.com/pypa/setuptools-scm
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools-scm/
+	https://pypi.org/project/setuptools-scm/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# there's an optional dep on rich for cute logs
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-64[${PYTHON_USEDEP}]
+	=dev-python/vcs-versioning-2*[${PYTHON_USEDEP}]
+	>=dev-python/vcs-versioning-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	=dev-python/vcs-versioning-2*[${PYTHON_USEDEP}]
+	>=dev-python/vcs-versioning-2.4.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-timeout )
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		testing_scm/test_functions.py::test_dump_version_mypy
+		testing_scm/test_integration.py::test_xmlsec_download_regression
+		testing_scm/test_regressions.py::test_pip_download
+		# dependent on ruff version
+		testing_scm/test_functions.py::test_dump_version_ruff
+		# broken by installed packages adding commands
+		testing_scm/test_integration.py::test_commands_registered_only_when_inference_produced_data
+	)
+
+	if ! has_version "dev-python/pip[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			testing_scm/test_integration.py::test_editable_install_without_env_var
+			testing_scm/test_integration.py::test_editable_install_version_file
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e5065e5a98e1..682880484ebb 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,4 +1,3 @@
-DIST sqlalchemy-2.0.51.tar.gz 9912201 BLAKE2B d3cc81bc5d10db4a2d9670020d64831d7f5b5f56419a8ad6ab4e201dbb575be28300ac6b57724e1c1b515436339ff51d84b0ff0de9073ef9da2d37bf2c46e43c SHA512 af3965c5c43921b8e4330348b7d1a46357fa5d6a9a0acde66b4c3e65aedbd27afabc257cde113d38f3be3f3a91d524230fb17efc5515b826442d4fb4d6b7bc1d
 DIST sqlalchemy-2.0.52.tar.gz 9945637 BLAKE2B 4af6f1485d26c94569babc99ba6cb3314f0bbc4267bc17ebefbb786390214110283b0a43a81cc38d275fcd852bbb74e77ed2167dce6a5ec9b144119eb0593206 SHA512 9341389b75b684b37f2f1bba8fde882c95c77a68e5ff15b8ab16b163db9c31088a884352999b750fbabadbd723cff093e971035159e77562d5cd843305258fdd
-DIST sqlalchemy-2.1.0b2.tar.gz 10225731 BLAKE2B ec2a69fe0f636f6a9366874e071b43b3f7314de57483e8c6948042b232a0b336273f9ab1f89ad43969db1ec111b037b705b2b41dcaa0e140eb2fe66a1d6e29e8 SHA512 ad1087cc6a8a2d6646ddc74a5ef10e0218275c32a2f8b90ca41138800fd2bc9a9ca8afb60de3a0a424f6111226e55ff21d16f14de3b57ddd26bccd9d883c7c01
+DIST sqlalchemy-2.0.53.tar.gz 9966200 BLAKE2B b14be728d4ba7e6517b6e4af96127e3c5bde05218d77afa5bba16638f4270e85c69eded7bd4497c517afc2dbcc5db1baa1201c84d8354ac9a7de8e0f5cf3f98b SHA512 568035a5c37e337eee5606756e5c3bb3edff248cca4879144d690ff4215abc51d697eeb0ab7a3991ea933b65a639d2ae8812e9b325d4fd7d860a26513892609c
 DIST sqlalchemy-2.1.0rc1.tar.gz 10436777 BLAKE2B 3840f114f930dc1d18e8837cd51ebc66a193f386139eda7b825a0efcc280488a4d1f78c0997c4c81d5c8c2b6b92b2cb789beec32dbae43fa05bd638d3afe493b SHA512 66435f258067621f649ae8f28ed409772319cf9939b21cb8a7b2de1ddcdb482f536402350767ff618dbec2be5254b243f903f8c7a7261c49bc66269235bce2eb
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.51.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.53.ebuild
index de47d8afec0a..b46152f6c679 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.51.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.53.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.1.0_beta2.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.1.0_beta2.ebuild
deleted file mode 100644
index d9cf5b3c5b56..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.1.0_beta2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=SQLAlchemy
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-
-LICENSE="MIT"
-SLOT="0"
-if [[ ${PV} != *_beta* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-fi
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-EPYTEST_PLUGINS=()
-EPYTEST_RERUNS=5
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-		test/typing/test_mypy.py
-		# hardcode call counts specific to Python versions
-		test/aaa_profiling
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO: flaky? xdist?
-		test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_no_greenlet
-	)
-	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
-	case ${EPYTHON} in
-		python3.15)
-			EPYTEST_DESELECT+=(
-				# repr() changes
-				test/orm/declarative/test_dc_transforms.py::DCTransformsTest::test_basic_constructor_repr_base_cls
-				test/orm/declarative/test_dc_transforms_future_anno_sync.py::DCTransformsTest::test_basic_constructor_repr_base_cls
-				# exception message changes
-				test/engine/test_processors.py::PyDateProcessorTest::test_no_string
-			)
-			;;
-	esac
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	epytest --reruns-delay=2 -m "not gc_intensive and not timing_intensive and not mypy"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
index ae3555d3588a..7fcffa153f4c 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -1,4 +1,4 @@
-DIST tornado-6.5.7.tar.gz 519252 BLAKE2B 7d2a2f265de1137c632bf222dc8e8e65efe9328c7c82af5741e069be1dae34de33547a93844518c213ca131d064d87db1d438145e47cfc0da4ddb4485bad9a33 SHA512 bd9790da5dc84580710cc74cda0f8f691ff0af845e9e4b47c431333aae5107d808f8a3a82155d4cddefb86f4c516f3a2bef15edcb19d743b936d20d101db7cf1
-DIST tornado-6.5.7.tar.gz.provenance 9369 BLAKE2B 4893e0653f2c39d9aa89a2a7c888860aad829f255394308f11de1a2ece80a00cf479270427cf833720e524d91b42926645f63f2867a4a441b6273b7e4722a076 SHA512 3e97725d8964764cab43f4750d88843394a0577d54e6529e13de5ab55e5898f4853e59bbe973c813e7c05c67e4c9f472e3569f6e934559b9a9bcb71cd38dbcc6
 DIST tornado-6.5.8.tar.gz 520493 BLAKE2B e48ca20fe0551b8536162071e0b9267ccd167df617c25f930481668e733c656904109014e65462e561d47acc557cfe32f86a422e8f7e840b4262acbafb2b720a SHA512 88c096ca30357644c07b6013cd514b5e64135b26a77d9ff17640951632d6f68c9a68d7fa80224743f7900fbf5ddde838088bd9838395651d87d876c8d1d1a2fe
 DIST tornado-6.5.8.tar.gz.provenance 9416 BLAKE2B 1f4d1d9289f8aa8fdde1dda19454da15e9056111f0225e0701eb385ef42b0fae26a6bb9dc5df3ffb9796e4d805db5aa7406aa466ec9389802df1033cdb5231a6 SHA512 b1c364aed55ecb3cbab7343de9ebfaa181579ca81a57e498953c7d0e657bd8b08ee9fb6e5f72d8205f379fbd25237054bfecdb9982fc973e4bb55a00a0411444
+DIST tornado-6.5.9.tar.gz 536145 BLAKE2B 13071c50a8f0701d750f26aa5fb3669ee5c78c4d249d570b519a672d8fdfa76d38f90633ad21fa1c7d551c50c5f6d0dab53ebb694685d52f1cc1269cb0728564 SHA512 e497f0cacca0ca0d34b65117a72e9ebe0056f77ced09eb5d200dea24da8c28182d5704d1b17510fc139841718fce6a19c7f154d416e59292f4236eb717a0a75c
+DIST tornado-6.5.9.tar.gz.provenance 9473 BLAKE2B 9c58b5c0753dee0f9e111cd5007512fffc91964cad3eeed7e11758aff96f239692492f35f220f08ef10bfd249013d3d1c550a4f79a3669c86abd5ef5fd2922a7 SHA512 20cb384accabf2c8659f90446c2f39d3b3535662114e0707521a870e291879da15a8c6c0fac61a6e64a26e4f64ccfc8d8f1dd3db60717b3121a52263422fb061
diff --git a/dev-python/tornado/files/tornado-6.5.7-pycurl-7.47.0.patch b/dev-python/tornado/files/tornado-6.5.7-pycurl-7.47.0.patch
deleted file mode 100644
index 4bc9ebd46c69..000000000000
--- a/dev-python/tornado/files/tornado-6.5.7-pycurl-7.47.0.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 9648c5892c232fd7b02b9ad80d2bbe09ac38edb3 Mon Sep 17 00:00:00 2001
-From: Claude <noreply@anthropic.com>
-Date: Sat, 4 Jul 2026 19:10:59 +0000
-Subject: [PATCH] Fix test_strip_headers_on_redirect's URL-embedded-credentials
- cases
-
-url.replace("http://", ...) replaced every occurrence of "http://" in
-the fetched URL, including the one inside the "url" query parameter
-that RedirectHandler uses as the redirect target. That accidentally
-embedded the test credentials in the Location header's URL too, so
-the "different origin" subtest was actually exercising "does libcurl
-honor credentials the server explicitly put in the redirect target"
-rather than "does libcurl strip credentials carried over from the
-original request" - libcurl correctly does the former, which is not
-a credential leak.
-
-Limit the replacement to the first occurrence so only the outer,
-fetched URL carries the test credentials.
-
-Separately, the "same origin" subtest for this case now surfaces an
-actual libcurl regression (still present in curl's git master as of
-this writing): credentials embedded in the URL are dropped across a
-same-origin redirect when the Location header is an absolute URL
-(a relative Location correctly preserves them). This isn't a security
-issue since nothing leaks to another origin, so that specific
-assertion is skipped rather than asserted either way.
----
- tornado/test/httpclient_test.py | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
-index 64e5cc5ff..1540ac3c2 100644
---- a/tornado/test/httpclient_test.py
-+++ b/tornado/test/httpclient_test.py
-@@ -785,7 +785,12 @@ def test_strip_headers_on_redirect(self):
-                     "/redirect?url=%s&status=302" % self.get_url2("/echo_headers")
-                 )
-                 if url_creds:
--                    url = url.replace("http://", "http://%s@" % url_creds)
-+                    # Only add credentials to the outer URL being fetched, not to the
-+                    # "url" query parameter (the redirect target), which also starts
-+                    # with "http://". Otherwise the redirect's Location header would
-+                    # carry its own explicit credentials for the new origin, which
-+                    # libcurl legitimately honors instead of stripping.
-+                    url = url.replace("http://", "http://%s@" % url_creds, 1)
-                 response = self.fetch(**dict(path=url) | kwargs)
-                 response.rethrow()
-                 echoed_headers = json_decode(response.body)
-@@ -799,17 +804,27 @@ def test_strip_headers_on_redirect(self):
-                     "/redirect?url=%s&status=302" % self.get_url("/echo_headers")
-                 )
-                 if url_creds:
--                    url = url.replace("http://", "http://%s@" % url_creds)
-+                    url = url.replace("http://", "http://%s@" % url_creds, 1)
-                 response = self.fetch(**dict(path=url) | kwargs)
-                 response.rethrow()
-                 echoed_headers = json_decode(response.body)
-                 # Confirm that non-auth headers are getting through
-                 self.assertIn("User-Agent", echoed_headers)
--                # Auth headers are not stripped when the redirect is same-origin.
--                # Each of our tests uses one of these headers, but not both.
--                self.assertTrue(
--                    "Authorization" in echoed_headers or "Cookie" in echoed_headers
--                )
-+                if name == "credentials in URL":
-+                    # Some libcurl versions (known regression as of 8.20/8.21,
-+                    # still present as of curl's git master) drop credentials
-+                    # embedded in the URL across a same-origin redirect whose
-+                    # Location header is an absolute URL, even though they
-+                    # should be preserved. This isn't a security concern
-+                    # (nothing is leaked to another origin), so just don't
-+                    # assert on it either way here.
-+                    pass
-+                else:
-+                    # Auth headers are not stripped when the redirect is same-origin.
-+                    # Each of our tests uses one of these headers, but not both.
-+                    self.assertTrue(
-+                        "Authorization" in echoed_headers or "Cookie" in echoed_headers
-+                    )
- 
- 
- class RequestProxyTest(unittest.TestCase):
diff --git a/dev-python/tornado/tornado-6.5.7.ebuild b/dev-python/tornado/tornado-6.5.9.ebuild
index ed2542ccdd51..34eff013d738 100644
--- a/dev-python/tornado/tornado-6.5.7.ebuild
+++ b/dev-python/tornado/tornado-6.5.9.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.3.2-ignore-deprecationwarning.patch"
-	# https://github.com/tornadoweb/tornado/pull/3678
-	"${FILESDIR}/${P}-pycurl-7.47.0.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/unidiff/Manifest b/dev-python/unidiff/Manifest
index cc4ed4eaa641..7b6f39bb40a3 100644
--- a/dev-python/unidiff/Manifest
+++ b/dev-python/unidiff/Manifest
@@ -1,2 +1,2 @@
-DIST unidiff-0.7.5.tar.gz 20931 BLAKE2B b43ff383fdc52f2d2973a42a8178eeae46b2e73919dc4e79166fe100b3d3cc8a47c1a55f76f1f4b49d5c175eea3949e750b7c4ddea716e8f1d6faa34109cdc81 SHA512 bcb8c234643ecaf7d8227b57f90fbc546851b5e3abe84d74b33570bf3399b9be756b4dca9f1506b69e9401e724bfd9892c5deac515160685e5399bfe555716a3
 DIST unidiff-1.0.0.tar.gz 29365 BLAKE2B 2645a8dce3da5c3ce2205a09469afedf0e33a0af169e149c87e57aa46f0a550cfb2a2e027ef5bd15f928a1e53d9e9f145e61ed59fbdbb39999894b8deed2b3a1 SHA512 ae603ab2d45acd59b2c1d37cb22c6265152643a6c67caef911b388b40d3be90f3e1e949e02e3d67aa7a922c60fa8f98bd4ead853c0007922ac2836600f245cce
+DIST unidiff-1.0.1.tar.gz 31800 BLAKE2B 3876fa0a2271fcfc184e4d082f11c4a0d03c62949222d0a797902b9e8953d327c32c28978e3e4b86504999db2a85d235b6a640d5ba05bf706be501cd148e7628 SHA512 eb989b0ce576d7f227e95906d3940ecc36a8d0128555412553834d4735ef0baecc2e7301391dc17447e40604b81e24b49bce3db508874b60a724ec9c872f91e5
diff --git a/dev-python/unidiff/unidiff-0.7.5.ebuild b/dev-python/unidiff/unidiff-1.0.1.ebuild
index 3a8a281bc3f3..660240acb87e 100644
--- a/dev-python/unidiff/unidiff-0.7.5.ebuild
+++ b/dev-python/unidiff/unidiff-1.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/uv-build/Manifest b/dev-python/uv-build/Manifest
index 88bc0aad12bb..fc268a0cccf9 100644
--- a/dev-python/uv-build/Manifest
+++ b/dev-python/uv-build/Manifest
@@ -2,6 +2,7 @@ DIST uv_build-0.11.25.tar.gz 404894 BLAKE2B 6922a5e91c5c657ca5ed90edb0250cbd7192
 DIST uv_build-0.12.10.tar.gz 423598 BLAKE2B 363ee130a5da490859d0a2f0122be340f36904218998d332c4d925cd76e5f3fda2218dad501455d602b77bbb50f68463dc4186ad61ee78713aca9c77eead8137 SHA512 759ef57aa5c74698b11c0cd8c6c2b729f2ba31f5966a7ebce61f06b46e260c314d4ef99412875544c6f784fa5df8e4df30ca7ebf3907ee5619916e412dd9dd63
 DIST uv_build-0.12.12.tar.gz 424423 BLAKE2B c7ed255923f884467ecaf8d70be044bea5c39db61611d320105d2a5c4c8e885a674ed22fa285ed398abbcaa229d9cca339f31f7d2e022adf099b5e0fe175d4c8 SHA512 38b91b29112af0e9677ae666125356b1735d8608ecdbcfae1d87ceff2b8cb8f61d5ecf917292a620d0e9c6f6d3ac121994fba2a0d7d076e18cd52e813fc1e2b2
 DIST uv_build-0.12.13.tar.gz 424846 BLAKE2B 9fee11946f1067045349d28ba05b6dae8aaea430fdbbe19970c286d20f758d03343ed9a6afd2166f85ecfee3009fb66c7429f6ee8c58a6453e0203f2a3fca38a SHA512 77bf75208e6932b791b42d2a9dc199901a981d3ab8881e58cd5604e3207aef020538ff120770e0eb31646c1c0b7e972c816932c9d3bb0defc6b9583763607584
+DIST uv_build-0.12.14.tar.gz 427528 BLAKE2B 81c3c2310058e279debf4c3964ac02fbccb0deec757fbb0824cf0e9a7e6edc0a49b269b382ee8ec47290bf37194c33c806bbb6778ba52d6915bbff3109007a9d SHA512 d8ff710bab00c287e3935e1411c9b9898a9db2107ac03285155bbcdda58e2d94d40556ace50986777b90832a03ea896149846b51e57691f9f243203c32ec44f7
 DIST uv_build-0.12.3.tar.gz 414444 BLAKE2B f226c1c2bf0b2af538f66095e20c02ad1933afdee62a07eff5f1135692bab47e286f67e7a8f5882e98c61fbb6bf831a85dd56a2d5af2bee6d62d8857a59e56bc SHA512 90d9af3e1a1ff1d7dda21fa38c0ac2d94536e73697ddabb408fb38e2d381498b2401007af0ab31c39cbf3b632aeca2991b3a66d7108e1c5eb7294b3fba8fe107
 DIST uv_build-0.12.7.tar.gz 418759 BLAKE2B 94aa33b2644f849a686d80d7f7d365ca8433615d93f27209fca5b21747363cd349d11e887d090420102f06a49977ce963b8f19c24a4280bf82a09943ba08885b SHA512 135f845b3ee6d1925f740917f83f94ec1a7e95aab5ed2db0aa70516c712ab0a143a0e427d3c172fac0bb1fabaa9103718bb2a26c31c9a287e3af65ac0175a245
 DIST uv_build-0.12.9.tar.gz 423446 BLAKE2B 8f32f7527633f5853a11a0f798a2aa075f9e96c2b34144f986a639dbd042bac7c5e33853287ef43273352a3ee84da852062c42daead1f188281295b635694177 SHA512 3aa6ea5b4e60218e7cbc3c5ed8ff7fbeeace36eb0d2c75627fb7a0ce7c060e8d6405378e9713f7164319cce55dc96b1a335ccb3032cfc7e9e60e99862295e79e
diff --git a/dev-python/uv-build/uv-build-0.12.14.ebuild b/dev-python/uv-build/uv-build-0.12.14.ebuild
new file mode 100644
index 000000000000..65d94f2051ae
--- /dev/null
+++ b/dev-python/uv-build/uv-build-0.12.14.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2025-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maturin compiles uv-build executable for every impl, we do not want
+# that, so we use another backend.  And since we use another backend,
+# why not dogfood it in the first place?
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="PEP517 uv build backend"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv-build/
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/uv-${PV}
+"
+BDEPEND="
+	test? (
+		app-arch/unzip
+		dev-python/build[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# use the executable from dev-python/uv instead of building
+	# a largely overlapping uv-build executable (at least for now)
+	sed -i -e '/USE_UV_EXECUTABLE/s:False:True:' python/uv_build/__init__.py || die
+
+	# replace the build-system section
+	sed -i -e '/\[build-system\]/,$d' pyproject.toml || die
+	cat >> pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["uv_build<9999"]
+		build-backend = "uv_build"
+		backend-path = ["src"]
+	EOF
+
+	# rename to make uv-build find it
+	mv python src || die
+}
+
+python_test() {
+	"${EPYTHON}" -m build -n || die "Self-build failed with ${EPYTHON}"
+
+	local zip_result=$(
+		unzip -t "dist/uv_build-${PV}-py3-none-any.whl" || die
+	)
+	local zip_expected="\
+Archive:  dist/uv_build-${PV}-py3-none-any.whl
+    testing: uv_build/                OK
+    testing: uv_build/__init__.py     OK
+    testing: uv_build/__main__.py     OK
+    testing: uv_build/py.typed        OK
+    testing: uv_build-${PV}.dist-info/   OK
+    testing: uv_build-${PV}.dist-info/WHEEL   OK
+    testing: uv_build-${PV}.dist-info/METADATA   OK
+    testing: uv_build-${PV}.dist-info/RECORD   OK
+No errors detected in compressed data of dist/uv_build-${PV}-py3-none-any.whl.\
+"
+	if [[ ${zip_result} != ${zip_expected} ]]; then
+		eerror ".zip result:\n${zip_result}"
+		eerror ".zip expected:\n${zip_expected}"
+		die ".whl result mismatch"
+	fi
+
+	local tar_result=$(
+		tar -tf "dist/uv_build-${PV}.tar.gz" || die
+	)
+	local tar_expected="\
+uv_build-${PV}/PKG-INFO
+uv_build-${PV}/pyproject.toml
+uv_build-${PV}/pyproject.toml.orig
+uv_build-${PV}/
+uv_build-${PV}/README.md
+uv_build-${PV}/src
+uv_build-${PV}/src/uv_build
+uv_build-${PV}/src/uv_build/__init__.py
+uv_build-${PV}/src/uv_build/__main__.py
+uv_build-${PV}/src/uv_build/py.typed\
+"
+	if [[ ${tar_result} != ${tar_expected} ]]; then
+		eerror ".tar.gz result:\n${tar_result}"
+		eerror ".tar.gz expected:\n${tar_expected}"
+		die ".tar.gz result mismatch"
+	fi
+}
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 8eb4c697ed56..0fc2a569f30f 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -6,6 +6,8 @@ DIST uv-0.12.12-crates.tar.xz 44156404 BLAKE2B aa6233aef300c43cca0c8cff35e79b0a6
 DIST uv-0.12.12.gh.tar.gz 8768173 BLAKE2B d584d2489f914f20042a90f25920b8a67b11612b58a31b26e170e88511adee074cfa91c661cf8efe88cdd07d466e07b1ddf75ac5f02c60c918bce1178d22bb84 SHA512 9242adfa1f0508db02215766d62d6129043b8cfc6b488ba4d7a3889c334786f58717559625187f38ce9f53060f1a2063b8ea59a71d63c8c7a836bc73a99be6d5
 DIST uv-0.12.13-crates.tar.xz 44176012 BLAKE2B 5a2459d28a794edf2a049c973916c6af95984d7fd706b0c517ad58f0a964fd2fe7dde62e2b4fb7afd725fe9fdd144021713bbff779abdf9ebd9f14487a390cf0 SHA512 8960412783a8028b634f5b535577a97d13159e0d515f18c8092504934d55d3ebb93b8951469f34eddda33fd6e89542add3ea6ef4444e367828783237f2a732da
 DIST uv-0.12.13.gh.tar.gz 8784071 BLAKE2B afb0acdf733efe4937ba5e7a8ca5257e9f3c6651e13adf5b44e96985be9f0abebd2167aec84bf285385b8c984636c0c9ff0f4c6077188088cff27af40334fa78 SHA512 e8a03cde57914007d932c55d017be780a9aaeac62d1b5831a3fd62f8c44299d6c8bc01582eb3e6c06c92b3edfbd519e1ea4d8d95fbb2cd0bdffd85b1cd36a137
+DIST uv-0.12.14-crates.tar.xz 44168832 BLAKE2B ad318ae7073d47eec81b715bb5461993c03de35b99d7b657fc1541ae63a3e3a2e5e9010bd2dbc525fc9b543ef85bdb276552383bdf916164b980c510646f2c74 SHA512 1cb24613d418983e2d7b921fe4766c5dce9d68eede6f1a99a1187657d002446a1b97685b0246d96136c6d3701050d2490830f0f325bfb602620a856b4aa498ac
+DIST uv-0.12.14.gh.tar.gz 8629043 BLAKE2B 2260d63c6061d3dd2bdcb267848e9e6379f2e09a72e34a024f988d27aeb6818b75c1dd34962f1730d5d394722c19394abc356735ed919f9edc0ac680f0fe6f1d SHA512 72354cb5cce51e938aba647cb6fa0956efb5a5d49be1a928f8965a0639d207e142170cefb2f5d5dc9e72943951580ca156e2a12be6b7c08d049c4dc3a7f1d944
 DIST uv-0.12.3-crates.tar.xz 42197452 BLAKE2B 996bb294d37774e0cb5529c34552d20877cd82a3d063b6e4dc1f6feff05a7822a91c44408a970f038d3045312be0edd4c9e8d34f6eebc04d71bd4d2ffa0184ee SHA512 8de33956c5a603fb4aa1bb5ab6db68c537d7523a84f3092057f562b1209bc976b0bc64cc6ed76cbf1b0edb4981b6a41765fa5e2729a487e4e2322052aa08b8a4
 DIST uv-0.12.3.gh.tar.gz 7273161 BLAKE2B 706a2297090b13c6f731d25f55ae8c2225e3b9bd820c61814f512c1e04d98d2e46ce5bfac6ec6ea346dbce1663aea644384b37663b53d64a08a90b48217bdb0d SHA512 a4933b9b9b852dee2485800ad82ee3be111a4a5a437ab32d5064cfd4004e124ba733294a546a097379c74cf1fc234d1da0488aec7725037c7b967ec1aa862a71
 DIST uv-0.12.7-crates.tar.xz 44143088 BLAKE2B 075113e8cbafd99a1c70c4ce53678f2ceb13ce31dc7cafb5773e32ae9dfa14144390380e0149219912a0c4b92e6d3b9d0a0a0016cdd4c69097bf75adf1b8a716 SHA512 f9dbdad7cbddd3238c7cc9fbcbec4e92fc8c8c66bc7247ccc8159bb186223c199e3bd411ad9148750ec1fa258775dcec1e2bb6bc3287fca7aeb6ffa7ba4d6b44
diff --git a/dev-python/uv/uv-0.12.14.ebuild b/dev-python/uv/uv-0.12.14.ebuild
new file mode 100644
index 000000000000..9826f9045941
--- /dev/null
+++ b/dev-python/uv/uv-0.12.14.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2024-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+RUST_MIN_VER="1.96.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=${PV}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://github.com/gentoo-crate-dist/uv/releases/download/${CRATE_PV}/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0
+	CDLA-Permissive-2.0 ISC MIT MIT-0 MPL-2.0 Unicode-3.0
+	Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		dev-lang/python:3.13
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# force thin lto, makes build much faster and less memory hungry
+	# (i.e. makes it possible to actually build uv on 32-bit PPC)
+	sed -i -e '/lto/s:fat:thin:' Cargo.toml || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/zstd-sys-*/ -name '*.c' -delete || die
+}
+
+src_configure() {
+	local myfeatures=(
+		test-git
+		test-pypi
+		test-python
+	)
+
+	cargo_src_configure --no-default-features
+	# otherwise, rustc/llvm runs out of address space
+	use arm && export RUSTFLAGS="${RUSTFLAGS} -Copt-level=0"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	dobin "$(cargo_target_dir)"/{uv,uvx}
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 04b670afebe0..1f293d4da56c 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,6 +1,6 @@
-DIST uvicorn-0.52.1.tar.gz 100571 BLAKE2B 3db0bcc0dab7cfec06b96d714fd561b22aa400fd3df53d8f4e2c8eca47e907aa6cf41445668e1cdb4d29f09f5e8e20393c45eeeec0d0f4cca4772d09e2c17eee SHA512 a6ee1766ab44971c0aa51b9a31654bcea2d885e6cea3ffd4bc67607aed2a18fbe2475cc7e7a05796a51a40904122b5f8eca1cefc70eaabc61ac308161be8b2c6
-DIST uvicorn-0.52.1.tar.gz.provenance 9377 BLAKE2B 334badcd244016c352712863d8afdd8aec93b6d909d18a1dcde5e0919b77cfd6d290a5afc38e1dcd10c2ecc69a07f7dbb34e3f41aced067025a7467b14029e62 SHA512 1d27ae7d57c993bb93908632253533cda966789f67943098237e56b37cf0b4e4b4634f760bec417eda824288c8be67608ed1cc138019af1d3b903420d7ad51fe
 DIST uvicorn-0.52.3.tar.gz 100621 BLAKE2B dc1041554e622bbd43fc9c34b6b9022a859f07ba17f4f432ace2553777fe89f4d3218d7d87b9f30942b6c5f7e0d6e7a5c248217ebb55b884ae6c1eebc4bad9fe SHA512 c4733d59e597134a1221a923802dddf7220a18715b08a56fccec1bc2ed5cd2858c6a05549bb24b94f67b48342ecfe2e9f0093361176f80814145eaa847597e19
 DIST uvicorn-0.52.3.tar.gz.provenance 9802 BLAKE2B d6e9972bb59bdd2e517628a605c90879456a68b2e2394a2ba53186e5af7039d4ba7d33ee20f6204539db78dd6bdc894c00cda47242383cf3d5b510d4f321fd37 SHA512 6a5a87767eea9e3ddd512e8de39679ddbe4317d89d4205ac7b491d1c03a69b64625502d895aa9113f770a053a253ae359752b73628010e85ed874a29c278f3fc
 DIST uvicorn-0.52.4.tar.gz 100627 BLAKE2B 40024b93412deef10f04528293b48d4aff1cc69e5a0f3844e07d942640d9aeabc05dfa77f620eacd52934b16192fbba7d6c59e87197526c5f03f4d967d2c7960 SHA512 3a9e77316c71228748fab1b5190033099a613a0976252b080f4d1c3f3b2cd0722baeff9b99320e60fa708a7dd7c276696727112539df67419c12eba5de7cc856
 DIST uvicorn-0.52.4.tar.gz.provenance 9504 BLAKE2B 74f1722b006f3e8e9694d5c5806236d405cc27ae0f47eceea1bc9b9391b5a6415442f0e512c29df091f8b694ae1c267045a099414af76aa11d413822cb3ff218 SHA512 4b5df0b5b2ab1f7c405c9c9a9bb15f5dafa9ecbbb542c98392d7fbfc877aab55b0bb63fbe135d0c579f1032cc40747b0b6773bd4f6351cfe367a2e71dcf70776
+DIST uvicorn-0.53.0.tar.gz 110881 BLAKE2B 2f453b495350a391127d4eb1eddddf6e11a35c50c8cd3e5b301ecd4d00375283f43f4073eb12aa5375875c43cc13c1aefb0e319b626e9b9f9101de9881a565d5 SHA512 2d05ef27a1f8063ac1182ddaee9e20f3de4cc4e472fd6134ed37db446cae20274a3deff7402e0ae0491ebb1fa73b0f7ab435b7bc2e422c8fa2648c461d4d4bbb
+DIST uvicorn-0.53.0.tar.gz.provenance 9598 BLAKE2B 6ab41cb71a8b982c6d01831b979d05558531919255c47c92460e1429445e70d8107c419db3344bc14cc8ddedf1d8fda4f5f6477f17dfba2cf9d9fe1bc01827cf SHA512 7467113fd5e175a01fb5dda3c20adf4a26737bda8178c1ed8c0f6f338d5c36892dcd56fffa9f389215cbf16e01e71d0faa6da2d8853bdc76f02dd1eaa7059381
diff --git a/dev-python/uvicorn/uvicorn-0.52.1.ebuild b/dev-python/uvicorn/uvicorn-0.53.0.ebuild
index 525fcf20b707..9da45f27f6d1 100644
--- a/dev-python/uvicorn/uvicorn-0.52.1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.53.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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="test-rust"
 
 RDEPEND="
@@ -30,7 +30,7 @@ BDEPEND="
 	test? (
 		dev-python/a2wsgi[${PYTHON_USEDEP}]
 		>=dev-python/httptools-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.28[${PYTHON_USEDEP}]
+		dev-python/httpx2[${PYTHON_USEDEP}]
 		dev-python/python-dotenv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/whenever/Manifest b/dev-python/whenever/Manifest
index 250af4cca3cd..1661789b404b 100644
--- a/dev-python/whenever/Manifest
+++ b/dev-python/whenever/Manifest
@@ -71,8 +71,6 @@ DIST wasm-bindgen-macro-0.2.126.crate 9303 BLAKE2B 024b185a3865445c486f117d4c595
 DIST wasm-bindgen-macro-support-0.2.126.crate 82688 BLAKE2B 60362b957909f2423d49e1c21a04a9ac51cd467173157cf3e6c937c5d45e07bebc50ac8cc80ff89472a60645b5bd01dde4b01c04208a811a281fe3dd3be56bb8 SHA512 76f3e4d6cb39bdf827f47cf6906b1500e9cb02beb0dce60764ddb134b4b48a0ffeb70a89d35b8b491e261ae76544cb422ae55fcc4a9afadec194359c187dfa31
 DIST wasm-bindgen-shared-0.2.126.crate 11287 BLAKE2B 054b0f2632193fb2a62549897f2de029510399df3c1a7d8a1732e4b7f24cfabe30f3a554e365dbe0833197ba01400032bc11b01ba36cb1561b4ee05fed2f7d1d SHA512 705b83b8a90b185c94cb62205786c78ab4dd25611e3c6c22ffa2d82d8aa6a9860223b72cd81a6a18a91785bda7b60b2bcc03b29de652cfa095d1c7e49c04c0f4
 DIST web-sys-0.3.103.crate 675560 BLAKE2B 3518e3ea0d808786c1cc5970adae650dfe2953586afb56089e7fddef67f70028cf729a0fca8afd4c3dd6061df4122b4cf49188b65e5f30ea001bd9a2160a249d SHA512 8413b25228ee21fded9f805233dc4a88a448a39507baf899372c993703eb9d221882d42f9084c77d1b3d0dfce22ffc10b4d75574eedc7ae3fc59fe9440abe0e5
-DIST whenever-0.10.4.tar.gz 437448 BLAKE2B 7909a6d3ab30ad863adc9a1d8405f4624bf0e6b2c37dfbeee044fa650887f3c2ed021fb6b47b4869b86e2ae5f0aa259ef7bd32729ee5e5cc6e1ee8436d861401 SHA512 29edba0509574237cb3c33c4c7a59715ac9bfd136cc5123aba40fa478bcd680e9f5d6cadcfacf2bd5ec52d052741c09a9c01f7e299a004daf9d26202656800b8
-DIST whenever-0.10.4.tar.gz.provenance 9832 BLAKE2B cc700b28b189ccee0128358af30749a1926430079ba113e1a3ec55f6debf202e2862d7d2f2cc0f5e40a9014c33e1a6e47aeb0bf0dbaba1d93fa60266ea2df661 SHA512 998f9b5771f205bf9c3deda9a8fcf3fa6c457e63e78b2a860419b58e14ff6170710b31a50c201182fa529f156de69cf67e879a231057e0b4e64b4682900a9d65
 DIST whenever-0.10.5.tar.gz 437531 BLAKE2B 143d66d6339d9543292455c80786288af41419b84aaca689aa6b6fdd2bb194d68327bfabfcd8bab51acbcf5a719ad2270662d8292eae2849b9e98f60327f7096 SHA512 f420f2252fae3a94566dcfe8d59475ae388a454d57ba98b06d453725f8d76a763c77b27b210ce2e25b739376b00b8b1b38644ddf19404116a5cc236d7f349f3a
 DIST whenever-0.10.5.tar.gz.provenance 9640 BLAKE2B 5df912098ecf980d6ed6e4db03eb9a9a8969dd30e9c8aa54519182f06168bfcc0195a3e1a038ae821196a3b8b72aec58d33a1075cee9151fe2048101ed1d49a8 SHA512 65ad96cfd805c2192887a772ec1e9dca39c01449850e087fd2f0a649cc537667d71934bcc85b8025eabdc286f0285b96997a981c7cbb6ab12ea783e4de093090
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
diff --git a/dev-python/whenever/whenever-0.10.4.ebuild b/dev-python/whenever/whenever-0.10.4.ebuild
deleted file mode 100644
index 91aeba6d1729..000000000000
--- a/dev-python/whenever/whenever-0.10.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2025-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYPI_VERIFY_REPO=https://github.com/ariebovenberg/whenever
-PYTHON_COMPAT=( python3_{13..14} )
-
-CARGO_OPTIONAL=1
-RUST_MIN_VER="1.93.0"
-CRATES="
-	ahash@0.8.12
-	aho-corasick@1.1.4
-	alloca@0.4.0
-	anes@0.1.6
-	anstyle@1.0.14
-	autocfg@1.5.1
-	bumpalo@3.20.3
-	cast@0.3.0
-	cc@1.3.0
-	cfg-if@1.0.4
-	ciborium-io@0.2.2
-	ciborium-ll@0.2.2
-	ciborium@0.2.2
-	clap@4.6.2
-	clap_builder@4.6.2
-	clap_lex@1.1.0
-	criterion-plot@0.8.2
-	criterion@0.8.2
-	crossbeam-deque@0.8.7
-	crossbeam-epoch@0.9.20
-	crossbeam-utils@0.8.22
-	crunchy@0.2.4
-	either@1.16.0
-	find-msvc-tools@0.1.9
-	futures-core@0.3.33
-	futures-task@0.3.33
-	futures-util@0.3.33
-	getrandom@0.3.4
-	half@2.7.1
-	itertools@0.13.0
-	itoa@1.0.18
-	js-sys@0.3.103
-	libc@0.2.186
-	memchr@2.8.3
-	num-traits@0.2.19
-	once_cell@1.21.4
-	oorandom@11.1.5
-	page_size@0.6.0
-	pin-project-lite@0.2.17
-	plotters-backend@0.3.7
-	plotters-svg@0.3.7
-	plotters@0.3.7
-	proc-macro2@1.0.107
-	pyo3-build-config@0.29.0
-	pyo3-ffi@0.29.0
-	quote@1.0.47
-	r-efi@5.3.0
-	rayon-core@1.13.0
-	rayon@1.12.0
-	regex-automata@0.4.16
-	regex-syntax@0.8.11
-	regex@1.13.1
-	rustversion@1.0.23
-	same-file@1.0.6
-	serde@1.0.229
-	serde_core@1.0.229
-	serde_derive@1.0.229
-	serde_json@1.0.150
-	shlex@2.0.1
-	slab@0.4.12
-	syn@2.0.119
-	syn@3.0.0
-	target-lexicon@0.13.5
-	tinytemplate@1.2.1
-	unicode-ident@1.0.24
-	version_check@0.9.5
-	walkdir@2.5.0
-	wasip2@1.0.4+wasi-0.2.12
-	wasm-bindgen-macro-support@0.2.126
-	wasm-bindgen-macro@0.2.126
-	wasm-bindgen-shared@0.2.126
-	wasm-bindgen@0.2.126
-	web-sys@0.3.103
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.11
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-link@0.2.1
-	windows-sys@0.61.2
-	wit-bindgen@0.57.1
-	zerocopy-derive@0.8.54
-	zerocopy@0.8.54
-	zmij@1.0.23
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Modern datetime library for Python"
-HOMEPAGE="
-	https://github.com/ariebovenberg/whenever/
-	https://pypi.org/project/whenever/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
-SLOT="0"
-if [[ ${PV} != *_[ab]* ]]; then
-	KEYWORDS="~amd64"
-fi
-IUSE="+native-extensions"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/time-machine[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=( hypothesis pytest-order )
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=( benchmarks )
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/whenever/_whenever.*.so"
-
-src_unpack() {
-	pypi_src_unpack
-	cargo_src_unpack
-}
-
-src_configure() {
-	if ! use native-extensions; then
-		export WHENEVER_NO_BUILD_RUST_EXT=1
-	fi
-}
-
-python_test() {
-	rm -rf whenever || die
-	epytest
-}
diff --git a/dev-python/whenever/whenever-0.10.5.ebuild b/dev-python/whenever/whenever-0.10.5.ebuild
index 91aeba6d1729..b2ea9226839e 100644
--- a/dev-python/whenever/whenever-0.10.5.ebuild
+++ b/dev-python/whenever/whenever-0.10.5.ebuild
@@ -138,7 +138,8 @@ QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/whenever/_whenever.*.so"
 
 src_unpack() {
 	pypi_src_unpack
-	cargo_src_unpack
+	cargo_crate_unpack
+	cargo_gen_config
 }
 
 src_configure() {
diff --git a/dev-python/xmlsec/xmlsec-1.3.17-r1.ebuild b/dev-python/xmlsec/xmlsec-1.3.17-r1.ebuild
index db70398b265b..3e8ede6909bb 100644
--- a/dev-python/xmlsec/xmlsec-1.3.17-r1.ebuild
+++ b/dev-python/xmlsec/xmlsec-1.3.17-r1.ebuild
@@ -62,3 +62,22 @@ src_configure() {
 		export CPPFLAGS="${CPPFLAGS} -DPYXMLSEC_ENABLE_DEBUG=1"
 	fi
 }
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# black version?
+		tests/test_type_stubs.py::test_xmlsec_constants_stub
+	)
+
+	case ${EPYTHON} in
+		python3.15*)
+			EPYTEST_DESELECT+=(
+				# some GC nonsense
+				tests/test_main.py::TestCallbacks::test_sign_data_from_callbacks
+				tests/test_main.py::TestCallbacks::test_sign_data_not_first_callback
+			)
+			;;
+	esac
+
+	epytest
+}
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index a1d23ef38e7b..d51eb6556120 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,2 +1,3 @@
 DIST xvfbwrapper-0.2.29.tar.gz 12853 BLAKE2B d6d931a9742e29e34bc1506da2121c67eaf3bbcaa61f2c14c61fc2a7baaf4424949f836248917903264a7f64c425e8f20a6fa631a789fbff4a0c071a8d59dd47 SHA512 c546c7db922dc0027450a9526e94102cdcc0ac322c106574fb35ff70315daa6b4c1d1319aa240259fb1574af129227835cd3a0670dccf89b5d81f6e7b9a643c5
 DIST xvfbwrapper-0.2.32.tar.gz 13308 BLAKE2B 2bc2a5d5c681a7ff898c09803b1fd16c8550bbd0871705ac950c0daec64df58525dc249c3d475e28266d0ea3fdb6c0b5d0c681fb9b4bcecca8846dad7db162c1 SHA512 0c4cf35816e325de2688b3781d4a96518d97ac1c2654a5c422ac5787bf6306cfb3af2b57a526823715286c0cba0a0b3b02694c29c14995f5f5ff59a189b2e802
+DIST xvfbwrapper-0.2.33.tar.gz 13488 BLAKE2B c0d8ab22efa27c0d20b6b77499e0f10a260b3ae1f533a714d633c9542439c550deb33d237a9a44efb2a94096702de28e07ae306c1ad238fb468ddb73e4116c8e SHA512 2898cd60db19823fd0cb482402e5dc243fa5188bdc7029e27d9b900251fb8822b9aa7b1a5e8e8649b10986c6f6a2bbaa3457064ad680e6a406283c42c55e779c
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.33.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.33.ebuild
new file mode 100644
index 000000000000..787856574075
--- /dev/null
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.33.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
+HOMEPAGE="
+	https://github.com/cgoldberg/xvfbwrapper/
+	https://pypi.org/project/xvfbwrapper/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-base/xorg-server[xvfb]
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 36d0efef12db..10c7b95f2a92 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,4 +1,2 @@
-DIST zeep-4.3.2.tar.gz 166687 BLAKE2B cc1295ac389bd2195b4989e73c4cec1d159be8d9d63b33ff21a05d2dd52e4f927f08c42443f7608e6533b4df23d74f8f127d8276c07ecb1fbdb26178837cb3cc SHA512 512260a81c22b55b7fec4629b10cda775883f5bdfb40bda8ff8fdd6deff7bfe594cdb0919dac405a4eeff5e19f8a3c5906cb542760773971b2f43e03e3bdb313
-DIST zeep-4.3.2.tar.gz.provenance 9756 BLAKE2B 896d100b9e3c839b5de44288a4ff7a3e14126fa2ba157944463604788e0c1f1e6c3c6818f4150488f5a263b93565c4ed74c3c6c5ef82cb816c424b446852435b SHA512 9257ea2dd8f658c7f9e206cf29ad92aefd1e7a9e55c6534d63d9308c36103d06186f8692443eadb7d2526b5fed338587e8449e37743dd8d81d4a64a22395b7be
 DIST zeep-4.3.3.tar.gz 167372 BLAKE2B ec35c59885df84b3aaa90e8e0d683f8711e781bef31e9e4d25a86e95c52e42f30bd4076804ed57c1773348ae480920d9b1790c8407dc523be69f89315d92546e SHA512 19985e823d4467ad728f97e87cb90812faad56e7ad92480574d28642f166769b30ab32217b6607900f6738b10cca65752059e6913898faa9f5e99ed46103d8ec
 DIST zeep-4.3.3.tar.gz.provenance 10061 BLAKE2B 31eb724b4a81a7692a3d9784ce02c3a08a57c016b3af5a82ecc08e9b560562cfb6f0f33795fad8148544fe5ad4af760255018cd81136a2695b7e20a16d742921 SHA512 d199cb03338078e6f1341412a4160d9dafd6848bfce42228993795bdfc9709f4f32c177a1afd9697803a11cf473a424d3cba4996f71b7265371a8ed803af7bc4
diff --git a/dev-python/zeep/zeep-4.3.2.ebuild b/dev-python/zeep/zeep-4.3.2.ebuild
deleted file mode 100644
index 3602200aa3f7..000000000000
--- a/dev-python/zeep/zeep-4.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/mvantellingen/python-zeep
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="
-	https://docs.python-zeep.org/
-	https://github.com/mvantellingen/python-zeep/
-	https://pypi.org/project/zeep/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="async"
-
-RDEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	async? (
-		>=dev-python/httpx-0.15.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.15.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/xmlsec[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=( pytest-{asyncio,httpx} )
-distutils_enable_tests pytest
diff --git a/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild b/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild
index 686251d2e718..4d2a091e24ad 100644
--- a/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.11.2_p202608131018.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 IUSE="+examples +html +qch"
 REQUIRED_USE="|| ( examples html qch )"
 
diff --git a/dev-qt/qt3d/qt3d-6.11.2.ebuild b/dev-qt/qt3d/qt3d-6.11.2.ebuild
index ba584b915185..63a2f06a194a 100644
--- a/dev-qt/qt3d/qt3d-6.11.2.ebuild
+++ b/dev-qt/qt3d/qt3d-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt5compat/qt5compat-6.11.2.ebuild b/dev-qt/qt5compat/qt5compat-6.11.2.ebuild
index a449ab4e8db1..f8f2789bd012 100644
--- a/dev-qt/qt5compat/qt5compat-6.11.2.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="+gui icu qml"
diff --git a/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild
index f9d710f2e646..bb6e910d69a9 100644
--- a/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.11.2-r2.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 declare -gA QT6_IUSE=(
diff --git a/dev-qt/qtcharts/qtcharts-6.11.2.ebuild b/dev-qt/qtcharts/qtcharts-6.11.2.ebuild
index 4136563be89b..a1665779aed6 100644
--- a/dev-qt/qtcharts/qtcharts-6.11.2.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Chart component library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild
index c64eaa7cf44b..dde47cd89278 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="+bluetooth neard nfc smartcard"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild
index 029fa6b590b0..e0be30ea883d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild
@@ -13,7 +13,7 @@ inherit python-any-r1 qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild b/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild
index 0d99cbdf5f3e..9d69f210c97e 100644
--- a/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild
+++ b/dev-qt/qthttpserver/qthttpserver-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="HTTP server functionality for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 x86"
+	KEYWORDS="~amd64 arm64 ~loong ~ppc64 x86"
 fi
 
 IUSE="+ssl websockets"
diff --git a/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild
index 347ec2fc45b5..68ef985f0cf7 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.11.2.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.11.2.ebuild
index 4093345ff100..e432e8969cf7 100644
--- a/dev-qt/qtlanguageserver/qtlanguageserver-6.11.2.ebuild
+++ b/dev-qt/qtlanguageserver/qtlanguageserver-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the Language Server Protocol for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 arm64"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtlocation/qtlocation-6.11.2.ebuild b/dev-qt/qtlocation/qtlocation-6.11.2.ebuild
index ccacdaaf00c7..9370677cde2b 100644
--- a/dev-qt/qtlocation/qtlocation-6.11.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild
index 8c0bf1e0fdcc..20d01031a427 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild
index e31924aa8c2c..02918d323982 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[gui,network]"
diff --git a/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild
index 7ebedb0937e4..a477ef223e3b 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Physical position determination library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="geoclue nmea +qml"
diff --git a/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild
index 77359a402054..4747ddcacdab 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild
index 394b3826c8cd..41e29f220857 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtscxml/qtscxml-6.11.2.ebuild b/dev-qt/qtscxml/qtscxml-6.11.2.ebuild
index ed22fee44c7f..33b887706150 100644
--- a/dev-qt/qtscxml/qtscxml-6.11.2.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtsensors/qtsensors-6.11.2.ebuild b/dev-qt/qtsensors/qtsensors-6.11.2.ebuild
index 475a107a278e..42d9516fa9f0 100644
--- a/dev-qt/qtsensors/qtsensors-6.11.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Hardware sensor access library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtserialport/qtserialport-6.11.2.ebuild b/dev-qt/qtserialport/qtserialport-6.11.2.ebuild
index 107e9d135791..f19eff389383 100644
--- a/dev-qt/qtserialport/qtserialport-6.11.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Serial port abstraction library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild
index d3233244f119..b89650077047 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtspeech/qtspeech-6.11.2.ebuild b/dev-qt/qtspeech/qtspeech-6.11.2.ebuild
index 2b2f45545c44..7696f5c279c6 100644
--- a/dev-qt/qtspeech/qtspeech-6.11.2.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.11.2.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtsvg/qtsvg-6.11.2.ebuild b/dev-qt/qtsvg/qtsvg-6.11.2.ebuild
index 98f1e1541027..2a4add195a7d 100644
--- a/dev-qt/qtsvg/qtsvg-6.11.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qttools/qttools-6.11.2.ebuild b/dev-qt/qttools/qttools-6.11.2.ebuild
index 83162bff9f11..c1c5809501b3 100644
--- a/dev-qt/qttools/qttools-6.11.2.ebuild
+++ b/dev-qt/qttools/qttools-6.11.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qttranslations/qttranslations-6.11.2.ebuild b/dev-qt/qttranslations/qttranslations-6.11.2.ebuild
index f6d53f0175fd..d9ca5a639756 100644
--- a/dev-qt/qttranslations/qttranslations-6.11.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-6.11.2.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Translation files for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 DEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild
index e8870bad1102..3c68fc79aad2 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="+sound +spell"
diff --git a/dev-qt/qtwayland/qtwayland-6.11.2.ebuild b/dev-qt/qtwayland/qtwayland-6.11.2.ebuild
index 27cd1736af9d..8a397595b814 100644
--- a/dev-qt/qtwayland/qtwayland-6.11.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Toolbox for making Qt based Wayland compositors"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="gnome qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild
index 7b40ef4641c0..ab891832374a 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt WebChannel"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.11.2.ebuild
index 5dec6704b957..f73f681cd915 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 arm64"
 fi
 
 IUSE="
diff --git a/dev-qt/qtwebengine/qtwebengine-6.140.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.140.9999.ebuild
index efbe305ab0b4..6b1d43094bfc 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.140.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.140.9999.ebuild
@@ -208,6 +208,10 @@ src_configure() {
 		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
+		# TODO: enable rust by default to match upstream, inherit rust,
+		# and bdep on dev-util/bindgen (currently fails to link and
+		# needs looking into, may be other issues, delaying for now)
+		-DQT_FEATURE_webengine_rust_build=OFF
 		-DQT_FEATURE_webengine_spellchecker=ON
 		-DQT_FEATURE_webengine_webchannel=ON
 		-DQT_FEATURE_webengine_webrtc=ON
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 7358e2b80bc4..3af59d17e3b7 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -205,6 +205,10 @@ src_configure() {
 		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
+		# TODO: enable rust by default to match upstream, inherit rust,
+		# and bdep on dev-util/bindgen (currently fails to link and
+		# needs looking into, may be other issues, delaying for now)
+		-DQT_FEATURE_webengine_rust_build=OFF
 		-DQT_FEATURE_webengine_spellchecker=ON
 		-DQT_FEATURE_webengine_webchannel=ON
 		-DQT_FEATURE_webengine_webrtc=ON
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild
index c279739faa88..dca132e9899a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebview/qtwebview-6.11.2.ebuild b/dev-qt/qtwebview/qtwebview-6.11.2.ebuild
index 4c09e718b2ba..ecc20a5061e1 100644
--- a/dev-qt/qtwebview/qtwebview-6.11.2.ebuild
+++ b/dev-qt/qtwebview/qtwebview-6.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 arm64"
 fi
 
 RDEPEND="
diff --git a/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild b/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild
index ba7afd91a436..4f9f6d27637f 100644
--- a/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild
+++ b/dev-ruby/puppet-resource_api/puppet-resource_api-2.0.0.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/puppetlabs/puppet-resource_api/archive/refs/tags/v${
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 all_ruby_prepare() {
 	# the gemspec tries to system(git ls-files) but has a meaningful fallback, so just make it not run git.
diff --git a/dev-util/directx-headers/Manifest b/dev-util/directx-headers/Manifest
index 73b6b985bcb8..3d4e2e8ddb74 100644
--- a/dev-util/directx-headers/Manifest
+++ b/dev-util/directx-headers/Manifest
@@ -1,2 +1 @@
-DIST directx-headers-1.618.2.tar.gz 500351 BLAKE2B f827189c428e16a5d6456b27103d455a29850718ca168420bff30beab78948dbc50ba404874d4a96a783f03c8e7a7bfbf3a13b910614e80f7e271773f2ec06fe SHA512 4d75cc0fdedc16b8c8e9361400da69afc728aef70818051239e4519837682aefa30d10fc816595f5f45bf5244c59632d4e29ffd4efe80c3b6f50d756586d3b36
 DIST directx-headers-1.619.1.tar.gz 510025 BLAKE2B 4220b765d425addcc7b02d58bcf3cb130ef808618f277d00c690f21bc8134d01893791948d9a5e08f52f8ec3bc6c44472071bdc162e6550505d67daf33ecd93a SHA512 3c907ca4aa34dd6775321bc71267c041ab87a1d981c09ca53f8974891f4b47d01e35fefd164280da7ad7497e1c827d8bed4797ca1015c44a8aa563fa38055ec0
diff --git a/dev-util/directx-headers/directx-headers-1.618.2.ebuild b/dev-util/directx-headers/directx-headers-1.618.2.ebuild
deleted file mode 100644
index a8d1ac0ccdbc..000000000000
--- a/dev-util/directx-headers/directx-headers-1.618.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=DirectX-Headers
-inherit dot-a meson-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/microsoft/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="DirectX header files and WSL stubs"
-HOMEPAGE="https://github.com/microsoft/DirectX-Headers"
-
-LICENSE="MIT"
-SLOT="0"
-
-multilib_src_configure() {
-	lto-guarantee-fat
-
-	local emesonargs=(
-		-Dbuild-test=false
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	strip-lto-bytecode
-	einstalldocs
-
-}
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.6.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.6.ebuild
index 5bfad2896b4a..46bf8ab43603 100644
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.6.ebuild
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.4.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
 HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
@@ -19,5 +19,25 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND=">=dev-libs/pugixml-1.14"
 DEPEND="${RDEPEND}"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-9999.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-9999.ebuild
index 5bfad2896b4a..46bf8ab43603 100644
--- a/dev-util/hyprwayland-scanner/hyprwayland-scanner-9999.ebuild
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
 HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
@@ -19,5 +19,25 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND=">=dev-libs/pugixml-1.14"
 DEPEND="${RDEPEND}"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/dev-util/mesa_clc/Manifest b/dev-util/mesa_clc/Manifest
index 981260ce724e..137460ba9145 100644
--- a/dev-util/mesa_clc/Manifest
+++ b/dev-util/mesa_clc/Manifest
@@ -1,8 +1,2 @@
-DIST mesa-26.0.8.tar.xz 44001316 BLAKE2B 525d35e0c224631bb8a74b31485625de3d0e9575873ce5298d9ae84e01e445de22e4ee30dacacca6552b2c6584aaeaaf6242c59a696435ddc2e037e046bb6c25 SHA512 3a43648a86c1bc48161a1669733b6c6a9294bf27ffb529f2ce078c2daa3b90b8c53b9cc06312197fb3a0830303d0b326d7535fb15849e6c26fad58009f3a6112
-DIST mesa-26.1.4.tar.xz 77677128 BLAKE2B e7fe5fbb662aea5ef0da73d7450ba693943339ef0731c5e96205e646eb857e674d552398cb44287d573664e471661603600452f427aff1da441d2fed5bd174ec SHA512 39d15574e876005fd1a483d1cb3c801b08297ec73820a89cbf368d0f2a922cc770d0e623e99acc66b71791332cdadc6cc3095f059f713b09128921ff2d0197a8
-DIST mesa-26.1.5.tar.xz 77723976 BLAKE2B 80f874e7f5ab1b6874926e8463a93c0e2c016092f1e5c3375e48178c3ae995ee17988ee07eea28cada5729edc12a5a3cfd7e0338c14f15a2ed029fb1057a09cc SHA512 8b1714e0fe63d3077c0d761245680724537a94db65e17dedb7124c7c861f070a13493a060695e81b2ca9b6889007b52c7b5788dace8fe5d8e2e1ed67efdbbf07
-DIST mesa-26.1.6.tar.xz 77770828 BLAKE2B 1bb16b0982b81518d8a0dcfc9b78c487167b7832e21861d829c055939acca1f5aaf3e51680a1a39680d5ed89cfec233f1beea3261acd171585837f06b1e89937 SHA512 6746b73f5b87e8ff3723eee586b4b5f033dbe6d13cd0309d743b7fa484c350268859ec8ff21aadcbca7a04070cdaa7828146dd28dde4b1935bb879891d687f0b
-DIST mesa-26.1.7.tar.xz 77799016 BLAKE2B 1418efe5171982eca1560891f18a8be8249b00c9305e461fe68f6dc7f02ec8eb093f67f02c602a96c77bbc7434cad8129ecf8def686b2528cda5892340c8d2db SHA512 9acc75c3d6386f90cf761dfa42e72b1c36d399a6905127d18aa3eb84d665502da7c3cebead82fdbca91ad510673ba7e296b5e148602d6db7e79172d6155f3ec5
 DIST mesa-26.1.8.tar.xz 77827888 BLAKE2B 173997a90bbb27d8f6b1e4c349430d063a9264efddf03c9449f93b9e0438fa38948dfbfecddb798cd57818070953b8c525cb3796807101632b1b642c4d6b0361 SHA512 eb3d46ae9aaba70fdd908486cef24041fec9264ddf586eaebbba65ce55e716d306ef9e91be83e742dfaec4dfc94105a5cd3a36b29bf56614febcbcf6c1f8b516
-DIST mesa-26.2.1.tar.xz 68500756 BLAKE2B f5ec3451d18da9336d775259dd0d3f0c73c81d0857ba7da32dd296aba258ad5b8424fb8781582a838375e99710451d2aaeda94def604ad006e5a5a378b44d30a SHA512 d4bc755442c6573a1b75cafad50ec66594fa0ca7599c525f368bdecbd551a970e890ed6b044d9251f84278d27dcaa30649fbf4f4bf0adbaa76e1cc1ba6a1181f
 DIST mesa-26.2.2.tar.xz 68533264 BLAKE2B a9924a7cbac5dbdb4d93ba8499c49a6be51edd8ec5b258f2986a5690b04f6898012389dcc7e07097bad0defed52e9255d3a2c82bb6101a531b17fde82ef69afc SHA512 55b1234c8653dad9b85ba3de7b777a0d957909baf4628f0c00e21d4ba89c004cb687a1dcf8da46ed0a092231dd4f859027509f83ad8c558750845ba470902615
diff --git a/dev-util/mesa_clc/mesa_clc-26.0.8.ebuild b/dev-util/mesa_clc/mesa_clc-26.0.8.ebuild
deleted file mode 100644
index a26ccb191de2..000000000000
--- a/dev-util/mesa_clc/mesa_clc-26.0.8.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit llvm-r2 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-VIDEO_CARDS="asahi panfrost"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-IUSE="${IUSE_VIDEO_CARDS} debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		=llvm-runtimes/libclc-${LLVM_SLOT}*
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=virtual/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tools_enable video_cards_asahi asahi
-	tools_enable video_cards_panfrost panfrost
-
-	tools_list() {
-		local tools="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${tools//$'\n'/,}"
-	}
-
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-		-Dprecomp-compiler=enabled
-		-Dinstall-precomp-compiler=true
-		-Dtools=$(tools_list "${TOOLS[*]}")
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
-	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
-	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of tools to enable
-tools_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		TOOLS+=("$@")
-	fi
-}
diff --git a/dev-util/mesa_clc/mesa_clc-26.1.4.ebuild b/dev-util/mesa_clc/mesa_clc-26.1.4.ebuild
deleted file mode 100644
index 94f8a643e951..000000000000
--- a/dev-util/mesa_clc/mesa_clc-26.1.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit llvm-r2 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-VIDEO_CARDS="asahi panfrost"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-IUSE="${IUSE_VIDEO_CARDS} debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		=llvm-runtimes/libclc-${LLVM_SLOT}*
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=virtual/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tools_enable video_cards_asahi asahi
-	tools_enable video_cards_panfrost panfrost
-
-	tools_list() {
-		local tools="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${tools//$'\n'/,}"
-	}
-
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dallow-broken-lto=true
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-		-Dprecomp-compiler=enabled
-		-Dinstall-precomp-compiler=true
-		-Dtools=$(tools_list "${TOOLS[*]}")
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
-	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
-	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of tools to enable
-tools_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		TOOLS+=("$@")
-	fi
-}
diff --git a/dev-util/mesa_clc/mesa_clc-26.1.5.ebuild b/dev-util/mesa_clc/mesa_clc-26.1.5.ebuild
deleted file mode 100644
index 94f8a643e951..000000000000
--- a/dev-util/mesa_clc/mesa_clc-26.1.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit llvm-r2 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-VIDEO_CARDS="asahi panfrost"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-IUSE="${IUSE_VIDEO_CARDS} debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		=llvm-runtimes/libclc-${LLVM_SLOT}*
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=virtual/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tools_enable video_cards_asahi asahi
-	tools_enable video_cards_panfrost panfrost
-
-	tools_list() {
-		local tools="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${tools//$'\n'/,}"
-	}
-
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dallow-broken-lto=true
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-		-Dprecomp-compiler=enabled
-		-Dinstall-precomp-compiler=true
-		-Dtools=$(tools_list "${TOOLS[*]}")
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
-	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
-	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of tools to enable
-tools_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		TOOLS+=("$@")
-	fi
-}
diff --git a/dev-util/mesa_clc/mesa_clc-26.1.6.ebuild b/dev-util/mesa_clc/mesa_clc-26.1.6.ebuild
deleted file mode 100644
index 18957b0c661c..000000000000
--- a/dev-util/mesa_clc/mesa_clc-26.1.6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit llvm-r2 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-VIDEO_CARDS="asahi panfrost"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-IUSE="${IUSE_VIDEO_CARDS} debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		=llvm-runtimes/libclc-${LLVM_SLOT}*
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=virtual/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tools_enable video_cards_asahi asahi
-	tools_enable video_cards_panfrost panfrost
-
-	tools_list() {
-		local tools="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${tools//$'\n'/,}"
-	}
-
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dallow-broken-lto=true
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-		-Dprecomp-compiler=enabled
-		-Dinstall-precomp-compiler=true
-		-Dtools=$(tools_list "${TOOLS[*]}")
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
-	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
-	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of tools to enable
-tools_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		TOOLS+=("$@")
-	fi
-}
diff --git a/dev-util/mesa_clc/mesa_clc-26.1.7.ebuild b/dev-util/mesa_clc/mesa_clc-26.1.7.ebuild
deleted file mode 100644
index 94f8a643e951..000000000000
--- a/dev-util/mesa_clc/mesa_clc-26.1.7.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit llvm-r2 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-VIDEO_CARDS="asahi panfrost"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-IUSE="${IUSE_VIDEO_CARDS} debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		=llvm-runtimes/libclc-${LLVM_SLOT}*
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=virtual/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tools_enable video_cards_asahi asahi
-	tools_enable video_cards_panfrost panfrost
-
-	tools_list() {
-		local tools="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${tools//$'\n'/,}"
-	}
-
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dallow-broken-lto=true
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-		-Dprecomp-compiler=enabled
-		-Dinstall-precomp-compiler=true
-		-Dtools=$(tools_list "${TOOLS[*]}")
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
-	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
-	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of tools to enable
-tools_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		TOOLS+=("$@")
-	fi
-}
diff --git a/dev-util/mesa_clc/mesa_clc-26.2.1.ebuild b/dev-util/mesa_clc/mesa_clc-26.2.1.ebuild
deleted file mode 100644
index 4b4d408ec3b6..000000000000
--- a/dev-util/mesa_clc/mesa_clc-26.2.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit llvm-r2 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-VIDEO_CARDS="asahi panfrost"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-IUSE="${IUSE_VIDEO_CARDS} debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-		=llvm-runtimes/libclc-${LLVM_SLOT}*
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=virtual/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tools_enable video_cards_asahi asahi
-	tools_enable video_cards_panfrost panfrost
-
-	tools_list() {
-		local tools="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${tools//$'\n'/,}"
-	}
-
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dallow-broken-lto=true
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-		-Dprecomp-compiler=enabled
-		-Dinstall-precomp-compiler=true
-		-Dtools=$(tools_list "${TOOLS[*]}")
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen2
-	use video_cards_asahi && dobin "${BUILD_DIR}"/src/asahi/clc/asahi_clc
-	use video_cards_panfrost && dobin "${BUILD_DIR}"/src/panfrost/clc/panfrost_compile
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of tools to enable
-tools_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		TOOLS+=("$@")
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 8cccf88234fe..86270dbb205d 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,29 +1,21 @@
 DIST SPIRV-LLVM-Translator-cea7c0e5fa6114f2e3ae83a6652bda7a6bccbc2b.tar.gz 1939159 BLAKE2B 800445bac3d1f26e26db2e7dae77f0163bac67af6094a7e6781465bea829e6f15c2423c89d8b0d26f10caeebc93c7e136ef7c2746e763be8a9f1f7b00c247cb2 SHA512 8ffc7011576c8a66c5d4df7cc69288791f9905aa379226a3bba304f9a603275fbe77f80bed1326ac63015b4fd731b8594143be37449b74c50287695b13b7d5d3
-DIST spirv-headers-02c0394e57af6dfdda7f68973df6aa20fc3f5def.tar.gz 571736 BLAKE2B d09500d508e142fa51781cec6322f8fad603f3a70ee70748db135c5d112ed0a10e5f659d37fa0b51db11402a2b90f899f4fa8dda74c0811baca5d6a3418601c4 SHA512 6cb7a0973c6a6f8a491bd59ba2b35d0a0d1d06ee84696e609d42b53728ecd6d40ca0b5fb71a88f883154acec3594668aab4b22a8f8ea25434b17592583ba8f2c
 DIST spirv-headers-04fd3caa1e8267e4d95c806cad901181728e1006.tar.gz 594644 BLAKE2B aea93e501716e73c116fb842211a7e761a1f81f5c98154fc2b3cf17757135157418d5fe01b40f0a3328a670b1823879dbac5076d48b542244b22a3ea8f3cc18f SHA512 90a60f8538b704b9c4e799d044c2e14673d6a42742d17315cd65e2ef7870fb094eb74450bf12a768a539c920d2cb9962fc83e328594ef72507f6b882915eb5ab
 DIST spirv-headers-575b6512579ebde466ed3dfc04e413439d14d95d.tar.gz 570306 BLAKE2B dc9b2d8defe195fe60f6ec92f1f55c52f108fdec32bbe6761e3e70d0906245cfdd92aa69a1e3490b6a3aa661b2870d38749598dbc1047ac6ff84c22b30ebd5f6 SHA512 bbff94d40149d529d4c329f0d73597d8f404202198fd4f35316585915919254e7ead5a1caa928dba9f04591423da6bc33f73a308fc26d95de4bfa6eecb47384c
 DIST spirv-llvm-translator-17.0.18.tar.gz 1683963 BLAKE2B 93520bb57916a5e22f53dbe33b85f6835bfbe4e0fb868f412857e7659477862d5bb4dcc1fd75b5445dbb4f1248d50770173802e166fe45932f7aba110885e12a SHA512 acef3bd4a230425b274fad9f6e12b0a792cfc47f3f89a826b7ad66487345cc25fcb8f39ff252053624a450b0652de691f2ffd20046af073c848fa18ff4936bce
 DIST spirv-llvm-translator-17.0.23.tar.gz 1714332 BLAKE2B 3a7e13b7058dc5fbd56fe7ed8076fa4d3092c679bf63b7cadd67d4eea8edb5457df1c5bc0103a87e792ab35744d3e4abdb6e932b74668d9ce4b0aa1bde077df7 SHA512 c86fcd94600bec8b3b2657e95a0ddfce91818b3938d57ba32b5d3204e007df25f2a7768d83142f1683d11371e513590851115d7b6be721fe14b567ff87ceb501
-DIST spirv-llvm-translator-17.0.25.tar.gz 1723900 BLAKE2B dc52e2574103002fb822225842d7be1eb6f758b8cc1296dcb3679686d47c93b3cc436367f15cf3562d1b2d63d9e6127031db87ede545c9ba79ecec3044ef5cef SHA512 c0e3a731763570bdbef8c0e9462f3d0a250e639d6a641322ab50ad25c6f41a8aea19b1885beec3239a60aa621d1ae8a8a5cdd3b6c63930c0563dd947619fd48c
 DIST spirv-llvm-translator-17.0.27.tar.gz 1733122 BLAKE2B 250d42c5ee18afb677fa76b5b691adfb9136b6d8dd8b8111d91ede493317f78052c75f43edc93d551ff2498831444acfab0f688ae9a1c3c3e08beb0438d2620d SHA512 5a15067bbe4fa4efeb657e6dab77a161ea78d464b86340ed5cf906ffba30fcdce2767e2cba861afd5452a2a33e8e36809ca28528578ddc007248194926ae57f6
 DIST spirv-llvm-translator-18.1.18.tar.gz 1753615 BLAKE2B d1af64ad346b39fb3407638a23971ec517f5e69162765f11e36bae9b696c9709f4d91f81d88dc6b4772dd1d6db9c63c6b7c93dbe7dc1f038d3e71528b95d4fd7 SHA512 5abb90a3f53173af30024f95fee9eac50fcd44f9044665fccf61d99ac72e5300f9e47f11dbf7cc699994e2d68dcc38c6752074c2c57eebd92c29c78c1081a358
 DIST spirv-llvm-translator-18.1.23.tar.gz 1778523 BLAKE2B f672747b08f1214bf2a228a4b41188b710eda5bc78e294df1d399b5a544836fe166ae547c0fe67bb0f2bc04d82fa62a8b5964dc8e9e9361638ce381ca5d61341 SHA512 a8216c6c78d526c2382bdcb16437d8895d881fb7a125e98d5198b448ee58b417033aa144008a10a22c2c1a6d57c7faa290a7f558df6b4787c4ccea2c2fbb9030
-DIST spirv-llvm-translator-18.1.25.tar.gz 1790275 BLAKE2B b4369129bbe55e19a9e7fcc5c715acbfb11b3a48d3071cb0abfc19633fcf5d9f5cd1a4d5fd8f053821c6b6f559f9951def82b671f6b1bb46bb131791be2765d8 SHA512 5ad9130cd7ef855fd9204083c1b1175e433c3bea6735287fb4ba119f52fc71571ecd1de9f93173ed4bf5d44ee609e07f3151566d54935c86c283fb36a83fe47b
 DIST spirv-llvm-translator-18.1.27.tar.gz 1799453 BLAKE2B 72561f246d61e77a723f6ca7b4bd2e3a235317153ad80e3f90e397d672178e89b2ef3695b84cdf061c549bab6d9b6b1a0b208b6ad9bbd87a0c222e0485e6eeaa SHA512 245f3e5ec1d89fb0339293b9d631b5b2f7226c152196b5777ed607d786b685392d0f5e6ee2f5778293e850830bd3f420884bfb4c7d0273032595a83574ec96f6
 DIST spirv-llvm-translator-19.1.13.tar.gz 1798150 BLAKE2B f28e6476f744cd3732784147714f6f65883a2192702777643648e46d2996e6eb35770e187e826b0821dcf50e78b57850dcf4f27a5d88fce3600d354184138148 SHA512 34dc723ae88dfe6e24495e424e31b319debdbe8d8580ce89a8485d8b4ffce16d060def5f1eab5eef2e2cfb9744fd14f7c3e742b308bbec7bb0b4b319edca861b
 DIST spirv-llvm-translator-19.1.18.tar.gz 1820279 BLAKE2B f7e428c9d7e0e9564657ca5c496b73d875c24213c9dcfc2fa2cea284c9405649cca7f5cdee27cfd403752cf96b892a6ab6ccc01ecddfc9a561dd0160f02e7a81 SHA512 27217c6c565f2a0f58e753d18df15adaf6e53ce0ae289a5a067a3ec58cdff72eaff86b801c079c10b5203f3e17061bfb85c091b255ead711fdf1ff9a8185a447
-DIST spirv-llvm-translator-19.1.20.tar.gz 1827922 BLAKE2B bb7e4d5aac009298956eec57743c6e98e0b95e3e598f241d48d5b26fba1465e1c2fcf9845f158d7565cd11c2c6d4901ae6248bb7abb6f11ddbd5ee938912c55c SHA512 834d4bf49444bb9450b01ad97128039991cccc27b93ab6c30f945bd55fdfdbd893ae4cec11d5850564cf0f59b2407f78da21d91a48b2de0ba30235b4131876a8
 DIST spirv-llvm-translator-19.1.22.tar.gz 1838110 BLAKE2B 8ba39a996cc60a2f1a4339f667956349abb0167f0c490eaeeb3268a36edd994da6f7632f8ca851fdb6beeb2e29558d744db6f94db37241436978df42414ddef8 SHA512 f8a18d23c130b1d862c855bb458c327627842226d7cc68c9cb1cc78c1d6d59577ce2d7a759a17611cc9c2eb18d5e867231773daf3bdef6f6a46591c547235db3
 DIST spirv-llvm-translator-20.1.13.tar.gz 1853486 BLAKE2B 1652c1488541a341c952d30f55d6c854975b7d207edce7e30db78534f295286afcaf22c86764f2520ed084fe004e08d4527e41fbd635f9b2a2878bd9d5a7cbc3 SHA512 88e554dcba7b44f46c992a457e6a706c09717efd8fbdb2300d76722804fcbcc8dab6095dac2604ee8fb44af5096310996147e28591640169d0d7854af2202493
-DIST spirv-llvm-translator-20.1.15.tar.gz 1858066 BLAKE2B d427259a6dc016b61d75b0c8de8c0c2c40ba5e370cccbd15eb41eba0702809b544652f849058ad309236b93be2d20802e2da4331a35bd76ecc37b5d44580c6b2 SHA512 a8565f5b73744b7482e796f69197056a7ee70f5fafa21fce856ffb01021e241bdf8c440836b05e50ec7ebe7cb88689a0fbd193c467beba36dcc1491578055f50
 DIST spirv-llvm-translator-20.1.17.tar.gz 1864206 BLAKE2B a4253682d633fbf0b35c335df397ce5a5c71c1a896617a184e2aac438ee909b9c1551f92498875d0453d1fb7d21fea2b4e8c1085e4025865d9d14a97d6a212e1 SHA512 d70b979b7144512ee6a27d00da5eeb9af9947f96e3e5f3fd2eb4c6619794408b921f8c503d62a566b0abd2282307dd1bcda71dfd517bbc80bf1e6ac0ca698d49
 DIST spirv-llvm-translator-20.1.8.tar.gz 1823253 BLAKE2B 940d548c129605c857bfb2c73ef8c67fb57462835f90fab1f5826070517b8048de2ffb2f0ce70a134d1f1c957b4506e9230729b3ec854ae2b4f14063d82ff0b7 SHA512 5fa7b5a7ade94c38faa238a350f80d514d6aabadc63882b8e4e1ac4cd62b8d77aeb46941f8dd9a083ae4705ee4e3dee9eff6ca56a9936eb336827755aaee9f18
 DIST spirv-llvm-translator-21.1.11.tar.gz 1869220 BLAKE2B a2a5a9c59669fe533b3aaf7e87c82a4cfafb75cfa30429da8d2993108c098b9d51224796188ad43205a1052393aefe3667b0ce7e3f8d897cd8470c121bfe61ff SHA512 ec3eeae0a441cf67afd0fcf4cd2091d247444164e4393318cfcc4f824d282c25c5ff533121a1f77bb79014d7f83f70d46977e0dc38944976ef9657d2b322ae02
 DIST spirv-llvm-translator-21.1.3.tar.gz 1848611 BLAKE2B c40b9e4f4b4c3ce951e3b981069216383c82169bc6294b9d52e9c8d80be6dfbc98d4148b22cf61f1c6118f0f253bcef7ec9dc6ba5ef3e29a38145eebd733ebc1 SHA512 e0dc67f213961612439fb757f5678d086fd761559ddd1afa134256b50fd6ea4c56ecc3205066cf9d933e770e0d27d6943a52dea38bd83f941883d31e701d647b
 DIST spirv-llvm-translator-21.1.7.tar.gz 1855026 BLAKE2B 7b23acfba68cbe9b2cf3094a567dc2dd3a750e1dc12591c29c321cf79323a640833b174ed7e7fa3206904a969f00cf6b7e86a2fd05c1c620619ff35fee4ed41b SHA512 30407d7c86732cbec8458d63a251c2d8ff1b2ccf1e2ca529cb3851cdf2a69204a8f10ed4aad0fb111759986ac956a99687550905c4711552d38830bf2127ebe8
-DIST spirv-llvm-translator-21.1.9.tar.gz 1862146 BLAKE2B c54db44033a8e8c658b5ff8c84cbd9ddc659d7677f1920f07983c4e03feb6bbf38d0cd392284de23022bf324d81db88ca21be4bf88ea2048a7deda650681ed51 SHA512 4dc8e6257f3b1c98ac6289b442b870bf6115fa6f1d5ae4b8c906948706a08ee959f8a409a8d0a20c0895330b50d541f761f5ed953902e8c17586356c1c03bdd3
 DIST spirv-llvm-translator-22.1.2.tar.gz 1870249 BLAKE2B 56dd66732727e2d002422392b41e0d7d745f9c3866953178759f862d0155539f6be2b54519fc6be1a694036d198d50c5f778cb709bef3c83d1dbb5416c7020ac SHA512 d224b29029dae66dac430834b927a0683e3e15fb555c2ba83764403b8cdc28bfcccbe8e9ec2e3d1854c9d32b02d0b8282a3d883441c7ce33c1fc5339c0a373f0
-DIST spirv-llvm-translator-22.1.4.tar.gz 1875796 BLAKE2B af731f5ebb3b4082c11e388b038b91933a20650f6dc5f871d9a2fffbee37c15099a20a25fae7eebb77613a0c5eeaf24fbab30394cd5f2eabab150d6fb5a31775 SHA512 7a1275088a2e58040efdd64f00ded27e7f4099e3c8add9528e4bccaae827578534b31c16bd4ab590f6f9f37c5ac4899e8651dc9d66d5c1ec0bc72c3246399f90
 DIST spirv-llvm-translator-22.1.6.tar.gz 1884210 BLAKE2B b20a0bcd6df8f914936f295d36546a4ec50e4baeea0f1c7e268adfa7cf9eb59835b5d2c1b07c3e4a3d5b61f8c79c141fca560ebf025fd23c65bf0c55bad4f273 SHA512 da0326c93a3988c11a32a298e82b07b33978e2d5ae080d65a243a8125017d63824d1d42d759232f7bf138663eba25e57e45b2d4b2e9f77c01f1e21b80353f461
-DIST spirv-llvm-translator-23.1.0.tar.gz 1928907 BLAKE2B 98a749adc36d38b54a28ef26db0321244a9c68e70e367092e2c5dbcb1199825233ce3e6a36c89d898dae24fb77f62da034fcbb8d5e9267731ad0b230d19b562e SHA512 86f76906d62baadce8050d46dcf0ccd8ff74e916edcdf62dcf4e5fa3245d23cff39ec1a1f21e9e853efc4090085040eb95cc86d266978d68a62d5fb9dc2b8766
 DIST spirv-llvm-translator-23.1.1.tar.gz 1928919 BLAKE2B b601d0c40e531eeb10aff3f82483ee003cee231886f23f82252cfde246507f44313644af4fd4a0d8f2cf651189af2f12069693058ac623b5ee9ae9632d5fb530 SHA512 fe2de5bfaffa95d20b81a15a11e6fdf6f7f190eebb4d6991cc36cd4670235d427e764437adbb5e572e5522cdfe8f0281a38e2fa088d9cadfc01f92cc844bba69
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.25.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.25.ebuild
deleted file mode 100644
index 93d11125b04e..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.25.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HASH_SPIRV="02c0394e57af6dfdda7f68973df6aa20fc3f5def"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-		-> spirv-headers-${HASH_SPIRV}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools
-	llvm-core/llvm:${SLOT}=
-"
-# We need to use currently newer spirv-headers, as stable release is too old..
-# DEPEND="${RDEPEND}
-#	>=dev-util/spirv-headers-1.4.350.0
-# "
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-
-	# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555
-	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
-		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.25.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.25.ebuild
deleted file mode 100644
index b6d4ae7e71a7..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.25.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HASH_SPIRV="02c0394e57af6dfdda7f68973df6aa20fc3f5def"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-		-> spirv-headers-${HASH_SPIRV}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
-"
-# We need to use currently newer spirv-headers, as stable release is too old..
-# DEPEND="${RDEPEND}
-#	>=dev-util/spirv-headers-1.4.350.0
-# "
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-
-	# https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/2555
-	sed -i -e 's/%triple/x86_64-unknown-linux-gnu/' test/DebugInfo/X86/*.ll || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
-		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.20.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.20.ebuild
deleted file mode 100644
index 796b4af33fb1..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.20.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HASH_SPIRV="02c0394e57af6dfdda7f68973df6aa20fc3f5def"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-		-> spirv-headers-${HASH_SPIRV}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
-"
-# We need to use currently newer spirv-headers, as stable release is too old..
-# DEPEND="${RDEPEND}
-#	>=dev-util/spirv-headers-1.4.350.0
-# "
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
-		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.15.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.15.ebuild
deleted file mode 100644
index de56058dc4ab..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.15.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HASH_SPIRV="02c0394e57af6dfdda7f68973df6aa20fc3f5def"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-		-> spirv-headers-${HASH_SPIRV}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
-"
-# We need to use currently newer spirv-headers, as stable release is too old..
-# DEPEND="${RDEPEND}
-#	>=dev-util/spirv-headers-1.4.350.0
-# "
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.1.3-option-registered.patch )
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-
-	# do not force a specific LLVM version to find_package(), this only
-	# causes issues and we force a specific path anyway
-	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
-		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.9.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.9.ebuild
deleted file mode 100644
index 8872a9fa5da1..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.9.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HASH_SPIRV="02c0394e57af6dfdda7f68973df6aa20fc3f5def"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-		-> spirv-headers-${HASH_SPIRV}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
-"
-# We need to use currently newer spirv-headers, as stable release is too old..
-# DEPEND="${RDEPEND}
-#	>=dev-util/spirv-headers-1.4.350.0
-# "
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-
-	# do not force a specific LLVM version to find_package(), this only
-	# causes issues and we force a specific path anyway
-	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
-		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.4.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.4.ebuild
deleted file mode 100644
index 8872a9fa5da1..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HASH_SPIRV="02c0394e57af6dfdda7f68973df6aa20fc3f5def"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-		-> spirv-headers-${HASH_SPIRV}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
-"
-# We need to use currently newer spirv-headers, as stable release is too old..
-# DEPEND="${RDEPEND}
-#	>=dev-util/spirv-headers-1.4.350.0
-# "
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-
-	# do not force a specific LLVM version to find_package(), this only
-	# causes issues and we force a specific path anyway
-	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}"
-		# -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-23.1.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-23.1.0.ebuild
deleted file mode 100644
index a9f3241a974d..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-23.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="
-	https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
-IUSE="test"
-RESTRICT="
-	!test? ( test )
-	arm? ( test )
-	arm64? ( test )
-	loong? ( test )
-	riscv? ( test )
-"
-
-RDEPEND="
-	dev-util/spirv-tools[${MULTILIB_USEDEP}]
-	llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-util/spirv-headers-1.4.357.0
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-
-	# do not force a specific LLVM version to find_package(), this only
-	# causes issues and we force a specific path anyway
-	sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${SLOT}"
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index d45d77169344..eaa152a501b6 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,3 +1,2 @@
-DIST wayland-1.24.0.tar.xz 241764 BLAKE2B 7ac6ac1f33cb2cae60e4058478655eeabd4f8f8e0fe07f6b9b386967ed4b31bdaac571dc2b812f3189534e3e53797822ca39f829207e45c24b494f039f82a836 SHA512 60216602cffd1473ae15381f9e9a6f3829e742cac83843ca65360ba78bcff8d9442f15eb6a6d5d29c8f74dd920762ca1605f51658d22a1d3c18e338505b9f974
 DIST wayland-1.25.0.tar.xz 609628 BLAKE2B d763149c9b06b431435e5b81aac32214774a1667bc85386befc2a2fef795c9c2df44e3e1fc9743c79fa5a491e44ea47f067ca92c9f3e31f57a6b999cbe781bf4 SHA512 20ae71ecc8b6d61b3e111171260911469cc7c3470048629db28eb4115415124e5a9392e1d9be84adb324cf1a29e557ae8e033e17c51fbab2fc80d9c6b9aad82c
 DIST wayland-1.26.0.tar.xz 612384 BLAKE2B f5a9179f5e82d564812dfdc0bbca2e4bed6ff9963b9a1ff181489774eb10946a37f5ec004a87354bf1e8ac012553926dcc6e65feb9eacdb9a18cbc034590a325 SHA512 50861b0c40cedec5f31b49ff1e99fc135a299fa4a8e2ff50ff4bac3f42e2f3f7be38271929fd2f6e58d83d5df516f643946ceba7937cc199581487c082c7ec31
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.24.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.24.0.ebuild
deleted file mode 100644
index 2def57d4436c..000000000000
--- a/dev-util/wayland-scanner/wayland-scanner-1.24.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-	S="${WORKDIR}/wayland-${PV}"
-fi
-inherit meson
-
-DESCRIPTION="wayland-scanner tool"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!<dev-libs/wayland-${PV}
-	>=dev-libs/expat-2.1.0-r3
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=false
-		-Ddtd_validation=false
-		-Dlibraries=false
-		-Dscanner=true
-		-Dtests=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig
-}
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 185531490a25..c6415e4f1484 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -518,10 +518,10 @@ cargo_update_crates () {
 	cargo_env "${@}" || die "Failed to update crates"
 }
 
-# @FUNCTION: cargo_src_unpack
+# @FUNCTION: cargo_crate_unpack
 # @DESCRIPTION:
-# Unpacks the package and the cargo registry.
-cargo_src_unpack() {
+# Unpack the *.crate files from ${A}.
+cargo_crate_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	mkdir -p "${ECARGO_VENDOR}" "${S}" || die
@@ -533,9 +533,6 @@ cargo_src_unpack() {
 			*.crate)
 				crates+=( "${archive}" )
 				;;
-			*)
-				unpack "${archive}"
-				;;
 		esac
 	done
 
@@ -572,7 +569,27 @@ cargo_src_unpack() {
 			eqawarn "'pycargoebuild --crate-tarball' to create one."
 		fi
 	fi
+}
+
+# @FUNCTION: cargo_src_unpack
+# @DESCRIPTION:
+# Unpacks the package and the cargo registry.
+cargo_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	mkdir -p "${ECARGO_VENDOR}" "${S}" || die
 
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			*.crate)
+				;;
+			*)
+				unpack "${archive}"
+				;;
+		esac
+	done
+	cargo_crate_unpack
 	cargo_gen_config
 }
 
diff --git a/gui-apps/hypridle/hypridle-0.1.8.ebuild b/gui-apps/hypridle/hypridle-0.1.8.ebuild
index c7f9a3fc0024..38763ea5c521 100644
--- a/gui-apps/hypridle/hypridle-0.1.8.ebuild
+++ b/gui-apps/hypridle/hypridle-0.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland's idle daemon"
 HOMEPAGE="https://github.com/hyprwm/hypridle"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
 	>=dev-libs/hyprlang-0.6.0:=
@@ -32,6 +36,7 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	>=dev-util/hyprwayland-scanner-0.4.4
 	virtual/pkgconfig
 "
@@ -39,3 +44,15 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.1.5-fix-CFLAGS-CXXFLAGS.patch"
 )
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hypridle/hypridle-9999.ebuild b/gui-apps/hypridle/hypridle-9999.ebuild
index 5e86c441ebf2..684471b817ad 100644
--- a/gui-apps/hypridle/hypridle-9999.ebuild
+++ b/gui-apps/hypridle/hypridle-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland's idle daemon"
 HOMEPAGE="https://github.com/hyprwm/hypridle"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
 	>=dev-libs/hyprlang-0.6.0:=
@@ -32,6 +36,7 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	>=dev-util/hyprwayland-scanner-0.4.4
 	virtual/pkgconfig
 "
@@ -39,3 +44,15 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${P}-fix-CFLAGS-CXXFLAGS.patch"
 )
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hyprlock/hyprlock-0.9.6.ebuild b/gui-apps/hyprlock/hyprlock-0.9.6.ebuild
index 53cd7ae4d3b5..3c1902f592f7 100644
--- a/gui-apps/hyprlock/hyprlock-0.9.6.ebuild
+++ b/gui-apps/hyprlock/hyprlock-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland's GPU-accelerated screen locking utility"
 HOMEPAGE="https://github.com/hyprwm/hyprlock"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
 	dev-libs/date
@@ -42,6 +46,7 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
@@ -49,3 +54,15 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.1-fix-CFLAGS-CXXFLAGS.patch"
 )
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hyprlock/hyprlock-9999.ebuild b/gui-apps/hyprlock/hyprlock-9999.ebuild
index 53cd7ae4d3b5..3c1902f592f7 100644
--- a/gui-apps/hyprlock/hyprlock-9999.ebuild
+++ b/gui-apps/hyprlock/hyprlock-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland's GPU-accelerated screen locking utility"
 HOMEPAGE="https://github.com/hyprwm/hyprlock"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
 	dev-libs/date
@@ -42,6 +46,7 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
@@ -49,3 +54,15 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.1-fix-CFLAGS-CXXFLAGS.patch"
 )
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hyprpicker/hyprpicker-0.4.7.ebuild b/gui-apps/hyprpicker/hyprpicker-0.4.7.ebuild
index ac268848a2cf..f8fd78fcdb10 100644
--- a/gui-apps/hyprpicker/hyprpicker-0.4.7.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-0.4.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A wlroots-compatible Wayland color picker that does not suck"
 HOMEPAGE="https://github.com/hyprwm/hyprpicker"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-libs/wayland
 	>=dev-util/hyprwayland-scanner-0.4.2
@@ -30,8 +34,21 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-libs/wayland-protocols
 	dev-util/wayland-scanner
 	media-libs/libglvnd
 	media-libs/libjpeg-turbo
 "
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hyprpicker/hyprpicker-9999.ebuild b/gui-apps/hyprpicker/hyprpicker-9999.ebuild
index ac268848a2cf..f8fd78fcdb10 100644
--- a/gui-apps/hyprpicker/hyprpicker-9999.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A wlroots-compatible Wayland color picker that does not suck"
 HOMEPAGE="https://github.com/hyprwm/hyprpicker"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-libs/wayland
 	>=dev-util/hyprwayland-scanner-0.4.2
@@ -30,8 +34,21 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-libs/wayland-protocols
 	dev-util/wayland-scanner
 	media-libs/libglvnd
 	media-libs/libjpeg-turbo
 "
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hyprshutdown/hyprshutdown-0.1.0.ebuild b/gui-apps/hyprshutdown/hyprshutdown-0.1.0.ebuild
index 8dafc5841e2c..c45745d56922 100644
--- a/gui-apps/hyprshutdown/hyprshutdown-0.1.0.ebuild
+++ b/gui-apps/hyprshutdown/hyprshutdown-0.1.0.ebuild
@@ -22,15 +22,13 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND="
 	dev-cpp/glaze
 	>=gui-libs/hyprutils-0.11.0:=
-	>=gui-libs/hyprtoolkit-0.4.1
+	>=gui-libs/hyprtoolkit-0.4.1:=
 	x11-libs/libdrm
 	x11-libs/pixman
 "
 DEPEND="
 	${RDEPEND}
 "
-BDEPEND="
-"
 
 DOCS=( README.md )
 
diff --git a/gui-apps/hyprshutdown/hyprshutdown-0.1.1.ebuild b/gui-apps/hyprshutdown/hyprshutdown-0.1.1.ebuild
index 8dafc5841e2c..c45745d56922 100644
--- a/gui-apps/hyprshutdown/hyprshutdown-0.1.1.ebuild
+++ b/gui-apps/hyprshutdown/hyprshutdown-0.1.1.ebuild
@@ -22,15 +22,13 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND="
 	dev-cpp/glaze
 	>=gui-libs/hyprutils-0.11.0:=
-	>=gui-libs/hyprtoolkit-0.4.1
+	>=gui-libs/hyprtoolkit-0.4.1:=
 	x11-libs/libdrm
 	x11-libs/pixman
 "
 DEPEND="
 	${RDEPEND}
 "
-BDEPEND="
-"
 
 DOCS=( README.md )
 
diff --git a/gui-apps/hyprshutdown/hyprshutdown-9999.ebuild b/gui-apps/hyprshutdown/hyprshutdown-9999.ebuild
index 8dafc5841e2c..c45745d56922 100644
--- a/gui-apps/hyprshutdown/hyprshutdown-9999.ebuild
+++ b/gui-apps/hyprshutdown/hyprshutdown-9999.ebuild
@@ -22,15 +22,13 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND="
 	dev-cpp/glaze
 	>=gui-libs/hyprutils-0.11.0:=
-	>=gui-libs/hyprtoolkit-0.4.1
+	>=gui-libs/hyprtoolkit-0.4.1:=
 	x11-libs/libdrm
 	x11-libs/pixman
 "
 DEPEND="
 	${RDEPEND}
 "
-BDEPEND="
-"
 
 DOCS=( README.md )
 
diff --git a/gui-apps/hyprsunset/hyprsunset-0.4.0.ebuild b/gui-apps/hyprsunset/hyprsunset-0.4.0.ebuild
index 42c6eeaff7b8..963f5599dd71 100644
--- a/gui-apps/hyprsunset/hyprsunset-0.4.0.ebuild
+++ b/gui-apps/hyprsunset/hyprsunset-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="An application to enable a blue-light filter on Hyprland"
 HOMEPAGE="https://wiki.hypr.land/Hypr-Ecosystem/hyprsunset"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-libs/wayland
 	>=gui-libs/hyprutils-0.2.3:=
@@ -34,5 +38,18 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	virtual/pkgconfig
 "
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/hyprsunset/hyprsunset-9999.ebuild b/gui-apps/hyprsunset/hyprsunset-9999.ebuild
index 42c6eeaff7b8..963f5599dd71 100644
--- a/gui-apps/hyprsunset/hyprsunset-9999.ebuild
+++ b/gui-apps/hyprsunset/hyprsunset-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="An application to enable a blue-light filter on Hyprland"
 HOMEPAGE="https://wiki.hypr.land/Hypr-Ecosystem/hyprsunset"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-libs/wayland
 	>=gui-libs/hyprutils-0.2.3:=
@@ -34,5 +38,18 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	virtual/pkgconfig
 "
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-apps/sddm-gentoo-config/sddm-gentoo-config-0.ebuild b/gui-apps/sddm-gentoo-config/sddm-gentoo-config-0.ebuild
index 583d9cbeacd6..c66e9d1b3c24 100644
--- a/gui-apps/sddm-gentoo-config/sddm-gentoo-config-0.ebuild
+++ b/gui-apps/sddm-gentoo-config/sddm-gentoo-config-0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="kwin systemd weston"
 REQUIRED_USE="?? ( kwin weston )"
 
diff --git a/gui-libs/aquamarine/Manifest b/gui-libs/aquamarine/Manifest
index 957e55eb5de3..b4ebb7bd111a 100644
--- a/gui-libs/aquamarine/Manifest
+++ b/gui-libs/aquamarine/Manifest
@@ -1,4 +1,4 @@
-DIST aquamarine-0.12.0.tar.gz 96368 BLAKE2B b88f27de18815176e0bbfd2092cae8825bc6414ffbb0cfb9899001da77b477b6d308f43300f76d17285a0d052cf9887f9c0c75d2990a45b8383dfcc1ad913854 SHA512 14eea03cba498ed398f90933bebd987e6d3f319f5223efdeb808e194b4237486d2b05334799415930821b0e17d9478709bea8ab4f9d6c8aaf297e95f251b0b84
 DIST aquamarine-0.12.1.tar.gz 96571 BLAKE2B 04dea75c01c8b199111d144bba00c45c7617cb85f1f3783384d5b1369c546f91721705a21ccaab85991b51af0d407f3f5a6c50e23aece219f0536631171c92b6 SHA512 72a17efb823dbe2e2709ff314e6e9221d5091e066cf18b27087fbf51f58ead466c2b9e2a38baf6ec79f7a74ec8c2d80d671dbd5c290839f7ddf51ead3d22eb85
 DIST aquamarine-0.13.0.tar.gz 100353 BLAKE2B b1fee1b79cd17719c533775522d1dab3c902ab262b8a397b2c10ec88bcc3a77f3941a4a85f1224053e20f2980fe473351e900386f69e3622f083650d4aad0eb3 SHA512 b1a483e0a62f254f7e06093ef83c0efd5d23b6bd4af93c0397dada1dddd21e0c54944779ddb7759cc2e1f05bdabfce32f2011cdc1943350fee4d53781862ffdf
 DIST aquamarine-0.14.0.tar.gz 100795 BLAKE2B 96138d5e5866369a8db86430cc3ccae28a2ff5bc301c601f1a6a836f4757c7c804f9b3f0ac54ec6b8d3d66409746f25f25ac48bfa11e0ba0f5ef67a55a3a68ce SHA512 14274d076eb778811f1a13cb9a01ac60dc52dc198f1a0786ab72e11984d467deb067e4f757d0933ae7a6a8116a71d47f084ae9efef1bb863baf5241d384bad5b
+DIST aquamarine-0.15.0.tar.gz 122993 BLAKE2B 1ec03ac805ed07725ff892ee898dab366a9d8a7ab8f8e6dbbe6bd0518ffd95fa984c6f9a8522e350cdb0b5574b243d28a73727ce45d7da8457a167b104b1a1a9 SHA512 b5ca9d973d6cd6bda9a3d54ce3f0c9131ea26dd8064505049275751408ee1769346a0e1d70a58ec6f4adedc8a9c4553d52a03372c6a77984ef26e44a1ac958ea
diff --git a/gui-libs/aquamarine/aquamarine-0.14.0.ebuild b/gui-libs/aquamarine/aquamarine-0.14.0.ebuild
index c118b1502015..a73800191f11 100644
--- a/gui-libs/aquamarine/aquamarine-0.14.0.ebuild
+++ b/gui-libs/aquamarine/aquamarine-0.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Aquamarine is a very light linux rendering backend library"
 HOMEPAGE="https://github.com/hyprwm/aquamarine"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # Upstream states that the simpleWindow test is broken, see bug 936653
 RESTRICT="test"
 RDEPEND="
@@ -44,10 +48,23 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
+
 src_prepare() {
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
diff --git a/gui-libs/aquamarine/aquamarine-0.12.0.ebuild b/gui-libs/aquamarine/aquamarine-0.15.0.ebuild
index 8056eff8b910..a73800191f11 100644
--- a/gui-libs/aquamarine/aquamarine-0.12.0.ebuild
+++ b/gui-libs/aquamarine/aquamarine-0.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Aquamarine is a very light linux rendering backend library"
 HOMEPAGE="https://github.com/hyprwm/aquamarine"
@@ -19,14 +19,17 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # Upstream states that the simpleWindow test is broken, see bug 936653
 RESTRICT="test"
 RDEPEND="
-	>=dev-libs/libinput-1.26.1
+	>=dev-libs/libinput-1.30.0
 	dev-libs/wayland
 	>=dev-util/hyprwayland-scanner-0.4.5
 	>=gui-libs/hyprutils-0.8.4:=
-	<gui-libs/hyprutils-0.14.0:=
 	media-libs/libdisplay-info:=
 	media-libs/libglvnd
 	media-libs/mesa[opengl]
@@ -45,10 +48,23 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
+
 src_prepare() {
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
diff --git a/gui-libs/aquamarine/aquamarine-9999.ebuild b/gui-libs/aquamarine/aquamarine-9999.ebuild
index c118b1502015..a73800191f11 100644
--- a/gui-libs/aquamarine/aquamarine-9999.ebuild
+++ b/gui-libs/aquamarine/aquamarine-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Aquamarine is a very light linux rendering backend library"
 HOMEPAGE="https://github.com/hyprwm/aquamarine"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # Upstream states that the simpleWindow test is broken, see bug 936653
 RESTRICT="test"
 RDEPEND="
@@ -44,10 +48,23 @@ DEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
 
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
+
 src_prepare() {
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
diff --git a/gui-libs/hyprcursor/hyprcursor-0.1.13-r1.ebuild b/gui-libs/hyprcursor/hyprcursor-0.1.13-r1.ebuild
index 2f90a6f72792..46d508f459a6 100644
--- a/gui-libs/hyprcursor/hyprcursor-0.1.13-r1.ebuild
+++ b/gui-libs/hyprcursor/hyprcursor-0.1.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="The hyprland cursor format, library and utilities"
 HOMEPAGE="https://github.com/hyprwm/hyprcursor"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # Disable tests since as per upstream, tests require a theme to be installed
 # See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
 RESTRICT="test"
@@ -30,3 +34,19 @@ RDEPEND="
 	gnome-base/librsvg:2
 	x11-libs/cairo
 "
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprcursor/hyprcursor-9999.ebuild b/gui-libs/hyprcursor/hyprcursor-9999.ebuild
index 2f90a6f72792..46d508f459a6 100644
--- a/gui-libs/hyprcursor/hyprcursor-9999.ebuild
+++ b/gui-libs/hyprcursor/hyprcursor-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="The hyprland cursor format, library and utilities"
 HOMEPAGE="https://github.com/hyprwm/hyprcursor"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # Disable tests since as per upstream, tests require a theme to be installed
 # See also https://github.com/hyprwm/hyprcursor/commit/94361fd8a75178b92c4bb24dcd8c7fac8423acf3
 RESTRICT="test"
@@ -30,3 +34,19 @@ RDEPEND="
 	gnome-base/librsvg:2
 	x11-libs/cairo
 "
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprland-guiutils/hyprland-guiutils-0.2.2.ebuild b/gui-libs/hyprland-guiutils/hyprland-guiutils-0.2.2.ebuild
index 7ec77cdb9ae1..4f67d88b29f0 100644
--- a/gui-libs/hyprland-guiutils/hyprland-guiutils-0.2.2.ebuild
+++ b/gui-libs/hyprland-guiutils/hyprland-guiutils-0.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland GUI utilities, successor to hyprland-qtutils"
 HOMEPAGE="https://github.com/hyprwm/hyprland-guiutils"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	!gui-libs/hyprland-qtutils
 	>=gui-libs/hyprtoolkit-0.4.0:=
@@ -31,3 +35,19 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprland-guiutils/hyprland-guiutils-9999.ebuild b/gui-libs/hyprland-guiutils/hyprland-guiutils-9999.ebuild
index 7ec77cdb9ae1..4f67d88b29f0 100644
--- a/gui-libs/hyprland-guiutils/hyprland-guiutils-9999.ebuild
+++ b/gui-libs/hyprland-guiutils/hyprland-guiutils-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland GUI utilities, successor to hyprland-qtutils"
 HOMEPAGE="https://github.com/hyprwm/hyprland-guiutils"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	!gui-libs/hyprland-qtutils
 	>=gui-libs/hyprtoolkit-0.4.0:=
@@ -31,3 +35,19 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprland-qt-support/hyprland-qt-support-0.1.0-r1.ebuild b/gui-libs/hyprland-qt-support/hyprland-qt-support-0.1.0-r1.ebuild
index 7bbc0698ec5a..4d17c92f9fe6 100644
--- a/gui-libs/hyprland-qt-support/hyprland-qt-support-0.1.0-r1.ebuild
+++ b/gui-libs/hyprland-qt-support/hyprland-qt-support-0.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="QML style provider for hypr* Qt apps"
 HOMEPAGE="https://github.com/hyprwm/hyprland-qt-support"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-qt/qtbase:6
 	dev-qt/qtdeclarative:6
@@ -28,6 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	virtual/pkgconfig
 "
 
@@ -38,3 +43,15 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprland-qt-support/hyprland-qt-support-9999.ebuild b/gui-libs/hyprland-qt-support/hyprland-qt-support-9999.ebuild
index 7bbc0698ec5a..4d17c92f9fe6 100644
--- a/gui-libs/hyprland-qt-support/hyprland-qt-support-9999.ebuild
+++ b/gui-libs/hyprland-qt-support/hyprland-qt-support-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="QML style provider for hypr* Qt apps"
 HOMEPAGE="https://github.com/hyprwm/hyprland-qt-support"
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	dev-qt/qtbase:6
 	dev-qt/qtdeclarative:6
@@ -28,6 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	virtual/pkgconfig
 "
 
@@ -38,3 +43,15 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprtoolkit/Manifest b/gui-libs/hyprtoolkit/Manifest
index d304b414fc37..e6a0266b76cb 100644
--- a/gui-libs/hyprtoolkit/Manifest
+++ b/gui-libs/hyprtoolkit/Manifest
@@ -1,2 +1,3 @@
 DIST hyprtoolkit-0.5.3.gh.tar.gz 574835 BLAKE2B f8ee575b7bf5baeaecfcb0b7d992686a1c3045f98dccc7a7fc289beef8884481daf543cf4af972d30eb7424762255689aaaa63ca1bc2cf41533c4687f3123c37 SHA512 b1d55f0ed2bf40a8e3ea474e6118c4601646dc2c53f8e07798d70bef50daa0822a7a7fff280ed1cd468f69f049879644f2bf84a7d573347c95b82ce018489517
 DIST hyprtoolkit-0.5.4.gh.tar.gz 577766 BLAKE2B 4289ba321382774976cc0f0ff6ff63f13aca7c9d8fdf95f962e61a5207d34e1b54a285aa6affc91eac8fc1d749f5d78f8101dc8ce0b3c9d317f8879d982bfb56 SHA512 aa35ce4afb1c7295a3ca7c8c392bb6a028aa99427f02f3d5802c90563ac23c5bbd474cc8001fb0cc8ea4e8944c7bb4452b2c1ed2d44bc8c63c93a088d3cd91f1
+DIST hyprtoolkit-0.6.0.gh.tar.gz 624044 BLAKE2B 4c2a015214f42a8bb9d233f2fdb1c977a316d4672ac44104c8493af7c8f46ffee47fe71dee633c7d38c46be0e36990955eaefa0adf7ecfb07997d4e92f729a97 SHA512 6e3d86e020c1b094d96e3cda67a3b7bf661d941a9f0a0eba4ecd444d33385d66e5fa01c0972056641c1f31d17644fe63a32921b023999e58adccc82f964da493
diff --git a/gui-libs/hyprtoolkit/hyprtoolkit-0.5.4.ebuild b/gui-libs/hyprtoolkit/hyprtoolkit-0.5.4.ebuild
index d635af2bee8c..6189b712da77 100644
--- a/gui-libs/hyprtoolkit/hyprtoolkit-0.5.4.ebuild
+++ b/gui-libs/hyprtoolkit/hyprtoolkit-0.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A modern C++ Wayland-native GUI toolkit"
 HOMEPAGE="https://github.com/hyprwm/hyprtoolkit"
@@ -23,7 +23,12 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	test? ( dev-cpp/gtest )
 "
 DEPEND="
@@ -51,3 +56,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprtoolkit/hyprtoolkit-0.6.0.ebuild b/gui-libs/hyprtoolkit/hyprtoolkit-0.6.0.ebuild
new file mode 100644
index 000000000000..023b7416840f
--- /dev/null
+++ b/gui-libs/hyprtoolkit/hyprtoolkit-0.6.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A modern C++ Wayland-native GUI toolkit"
+HOMEPAGE="https://github.com/hyprwm/hyprtoolkit"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-${PV}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="
+	>=dev-libs/hyprgraphics-0.4.0:=
+	>=dev-libs/hyprlang-0.6.0:=
+	>=dev-util/hyprwayland-scanner-0.4.5
+	>=gui-libs/aquamarine-0.10.0:=
+	>=gui-libs/hyprutils-0.14.2:=
+	dev-libs/glib:2
+	dev-libs/iniparser
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	media-libs/libglvnd
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprtoolkit/hyprtoolkit-9999.ebuild b/gui-libs/hyprtoolkit/hyprtoolkit-9999.ebuild
index d635af2bee8c..6189b712da77 100644
--- a/gui-libs/hyprtoolkit/hyprtoolkit-9999.ebuild
+++ b/gui-libs/hyprtoolkit/hyprtoolkit-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A modern C++ Wayland-native GUI toolkit"
 HOMEPAGE="https://github.com/hyprwm/hyprtoolkit"
@@ -23,7 +23,12 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	test? ( dev-cpp/gtest )
 "
 DEPEND="
@@ -51,3 +56,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprutils/Manifest b/gui-libs/hyprutils/Manifest
index c3fda218acf7..4b3f6f38e01a 100644
--- a/gui-libs/hyprutils/Manifest
+++ b/gui-libs/hyprutils/Manifest
@@ -1,4 +1,4 @@
 DIST hyprutils-0.12.0.gh.tar.gz 59380 BLAKE2B 5f239cdb4a46e8e23f15ad97fdcf3553c25fe8778a72aebc149243afbf57cd497fa9b2fda703b6b80d6205d48641b078fab12da0d36f09c3146dfa13befd83c9 SHA512 ccea62c5c1ef56ba0d8134281ef4a1b9b0e15acff085f4950e3376c795c6198ed116407f3e0f0de0acca3897e82aa55e2f0cfe9e0b292683d06272bbd432783c
 DIST hyprutils-0.13.1.gh.tar.gz 60796 BLAKE2B f9bd31dce95128121d31a6ca951b05ad1163df311e5791d6307584dfe4a0318d8c63b2d4894c2dd161d79bdb004929fba4d3e350a7f081f22e4539bcd8383402 SHA512 d090c2e30fe20afea6290f63a8ab4f695350cd61ab02e85b32e19fde02a928388883373dd1539135596091cbeaaac2d7cb2738173bb87c4d770584032f5f7b5a
-DIST hyprutils-0.14.0.gh.tar.gz 63150 BLAKE2B e3816c2e5f3ec6dde0085b82caca3c851a0456fccc3e3c5bfe4a2d65c15d73de8f44fd1c36c1f830901f479030602e2a0852c74e31aebd7db132fb0e7d59a191 SHA512 ce66f3af478cfa2d05f999a554db194ca537a6ed117228cfa8b202f2946d4fddb41628089390047514f71bf85187eaf2c71449ee096c87a241a5c0df05a7a889
 DIST hyprutils-0.14.1.gh.tar.gz 67477 BLAKE2B 0b181a503d6f60b49f1febaa3f934a90bc0f2831cf999779b88114d11ae334263f42323659aee1a127f226307bb614c28777a0b311eed7eb958ea8251dc71ac8 SHA512 5223e610e2b886fbc1c1952ef81d031dd0210a48db8dc0deee0411f851c5f2d803d29e57992b03c5c1cc0795c9e55bd9807ed72d75c34c7e62db8a007050b6d3
+DIST hyprutils-0.14.2.gh.tar.gz 81756 BLAKE2B 91df881aaed9f889d87e76cd95ecdb53f330636f432a35b17c9509c416f116d94a0d6ce3f0167ed5a5620faad32c3fdb21aacc82617a6daa429e9a5eb646fdb7 SHA512 eb7f04a92b861377df93321831cf19251a00e36941fcf3effd7c1ac6f4aebbb363bd3bfc22944c755b4aa99f9a4134e950911db251fbdf7bc917b3d2391e8f2f
diff --git a/gui-libs/hyprutils/hyprutils-0.14.1.ebuild b/gui-libs/hyprutils/hyprutils-0.14.1.ebuild
index 042031b1fa80..494ca2c7bd8c 100644
--- a/gui-libs/hyprutils/hyprutils-0.14.1.ebuild
+++ b/gui-libs/hyprutils/hyprutils-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland utilities library used across the ecosystem"
 HOMEPAGE="https://github.com/hyprwm/hyprutils"
@@ -23,7 +23,12 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	test? ( dev-cpp/gtest )
 "
 DEPEND="
@@ -37,3 +42,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprutils/hyprutils-0.14.0.ebuild b/gui-libs/hyprutils/hyprutils-0.14.2.ebuild
index 042031b1fa80..494ca2c7bd8c 100644
--- a/gui-libs/hyprutils/hyprutils-0.14.0.ebuild
+++ b/gui-libs/hyprutils/hyprutils-0.14.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland utilities library used across the ecosystem"
 HOMEPAGE="https://github.com/hyprwm/hyprutils"
@@ -23,7 +23,12 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	test? ( dev-cpp/gtest )
 "
 DEPEND="
@@ -37,3 +42,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprutils/hyprutils-9999.ebuild b/gui-libs/hyprutils/hyprutils-9999.ebuild
index 042031b1fa80..494ca2c7bd8c 100644
--- a/gui-libs/hyprutils/hyprutils-9999.ebuild
+++ b/gui-libs/hyprutils/hyprutils-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Hyprland utilities library used across the ecosystem"
 HOMEPAGE="https://github.com/hyprwm/hyprutils"
@@ -23,7 +23,12 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	test? ( dev-cpp/gtest )
 "
 DEPEND="
@@ -37,3 +42,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprwire/hyprwire-0.3.1.ebuild b/gui-libs/hyprwire/hyprwire-0.3.1.ebuild
index ca9f48ddb0b2..2986e87000a8 100644
--- a/gui-libs/hyprwire/hyprwire-0.3.1.ebuild
+++ b/gui-libs/hyprwire/hyprwire-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A fast and consistent wire protocol for IPC"
 HOMEPAGE="https://github.com/hyprwm/hyprwire"
@@ -22,6 +22,11 @@ LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
+
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	>=gui-libs/hyprutils-0.9.0:=
 	dev-libs/libffi:=
@@ -31,7 +36,9 @@ DEPEND="
 	${RDEPEND}
 	dev-libs/pugixml
 "
-BDEPEND="|| ( >=sys-devel/gcc-15:* >=llvm-core/clang-19:* )"
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -39,3 +46,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/hyprwire/hyprwire-9999.ebuild b/gui-libs/hyprwire/hyprwire-9999.ebuild
index ca9f48ddb0b2..2986e87000a8 100644
--- a/gui-libs/hyprwire/hyprwire-9999.ebuild
+++ b/gui-libs/hyprwire/hyprwire-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A fast and consistent wire protocol for IPC"
 HOMEPAGE="https://github.com/hyprwm/hyprwire"
@@ -22,6 +22,11 @@ LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
 RESTRICT="!test? ( test )"
+
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 RDEPEND="
 	>=gui-libs/hyprutils-0.9.0:=
 	dev-libs/libffi:=
@@ -31,7 +36,9 @@ DEPEND="
 	${RDEPEND}
 	dev-libs/pugixml
 "
-BDEPEND="|| ( >=sys-devel/gcc-15:* >=llvm-core/clang-19:* )"
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -39,3 +46,15 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.4.1.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.4.1.ebuild
index a9fa49430bc5..b467f40e7c23 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.4.1.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.4.1.ebuild
@@ -21,6 +21,10 @@ SLOT="0"
 IUSE="elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 DEPEND="
 	>=dev-cpp/sdbus-c++-2.0.0
 	dev-libs/hyprlang:=
@@ -49,20 +53,18 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
 	>=dev-util/hyprwayland-scanner-0.4.2
 	virtual/pkgconfig
-	|| ( >=sys-devel/gcc-14:* >=llvm-core/clang-17:* )
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 "
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
-		eerror "XDPH needs >=gcc-14 or >=clang-17 to compile."
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile XDPH!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then
-		eerror "XDPH needs >=gcc-14 or >=clang-17 to compile."
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile XDPH!"
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
 	fi
 }
 
diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
index a9fa49430bc5..b467f40e7c23 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
@@ -21,6 +21,10 @@ SLOT="0"
 IUSE="elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 DEPEND="
 	>=dev-cpp/sdbus-c++-2.0.0
 	dev-libs/hyprlang:=
@@ -49,20 +53,18 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
 	>=dev-util/hyprwayland-scanner-0.4.2
 	virtual/pkgconfig
-	|| ( >=sys-devel/gcc-14:* >=llvm-core/clang-17:* )
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 "
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
-		eerror "XDPH needs >=gcc-14 or >=clang-17 to compile."
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile XDPH!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 17 ; then
-		eerror "XDPH needs >=gcc-14 or >=clang-17 to compile."
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile XDPH!"
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
 	fi
 }
 
diff --git a/gui-wm/hyprland/hyprland-0.56.2.ebuild b/gui-wm/hyprland/hyprland-0.56.2.ebuild
index b8a1ddc10a2e..c34663fe8557 100644
--- a/gui-wm/hyprland/hyprland-0.56.2.ebuild
+++ b/gui-wm/hyprland/hyprland-0.56.2.ebuild
@@ -26,6 +26,10 @@ IUSE="+guiutils hyprpm systemd uwsm X +dbus-session"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # hyprpm (hyprland plugin manager) requires the dependencies at runtime
 # so that it can clone, compile and install plugins.
 HYPRPM_RDEPEND="
@@ -80,7 +84,7 @@ DEPEND="
 	>=dev-libs/wayland-protocols-1.49
 "
 BDEPEND="
-	|| ( >=sys-devel/gcc-15:* >=llvm-core/clang-19:* )
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	app-misc/jq
 	dev-build/cmake
 	>=dev-util/hyprwayland-scanner-0.4.5
@@ -96,14 +100,12 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 15 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-15 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 19 ; then
-		eerror "Hyprland requires >=llvm-core/clang-19 to build"
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile Hyprland!"
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
 	fi
 }
 
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 8b8f9d190f4e..915176d4d15e 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -26,6 +26,10 @@ IUSE="+guiutils hyprpm systemd uwsm X +dbus-session rtkit"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 # hyprpm (hyprland plugin manager) requires the dependencies at runtime
 # so that it can clone, compile and install plugins.
 HYPRPM_RDEPEND="
@@ -48,7 +52,7 @@ RDEPEND="
 	>=dev-libs/udis86-1.7.2
 	>=dev-libs/wayland-1.22.91
 	dev-util/glslang:=
-	>=gui-libs/aquamarine-0.9.5:=
+	>=gui-libs/aquamarine-0.15.0:=
 	>=gui-libs/hyprcursor-0.1.9:=
 	>=gui-libs/hyprutils-0.14.0:=
 	>=gui-libs/hyprwire-0.2.1:=
@@ -82,7 +86,7 @@ DEPEND="
 	>=dev-libs/wayland-protocols-1.49
 "
 BDEPEND="
-	|| ( >=sys-devel/gcc-15:* >=llvm-core/clang-19:* )
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	app-misc/jq
 	dev-build/cmake
 	>=dev-util/hyprwayland-scanner-0.4.5
@@ -98,14 +102,12 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 15 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-15 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 19 ; then
-		eerror "Hyprland requires >=llvm-core/clang-19 to build"
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile Hyprland!"
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
 	fi
 }
 
diff --git a/kde-frameworks/attica/attica-6.29.0.ebuild b/kde-frameworks/attica/attica-6.29.0.ebuild
index a67c665001cf..d2c691904a33 100644
--- a/kde-frameworks/attica/attica-6.29.0.ebuild
+++ b/kde-frameworks/attica/attica-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-qt/qtbase-${QTMIN}:6[network]"
diff --git a/kde-frameworks/baloo/baloo-6.29.0.ebuild b/kde-frameworks/baloo/baloo-6.29.0.ebuild
index a6d9f8414ad6..e834e533bbba 100644
--- a/kde-frameworks/baloo/baloo-6.29.0.ebuild
+++ b/kde-frameworks/baloo/baloo-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for searching and managing metadata"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/bluez-qt-6.29.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-6.29.0.ebuild
index 31a157fb4f1a..eb6ad0c90764 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-6.29.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bugs 668196, 924708; they all hang
diff --git a/kde-frameworks/breeze-icons/breeze-icons-6.29.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-6.29.0.ebuild
index 6be1825876c5..e3df23dadf9b 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-6.29.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit cmake frameworks.kde.org python-any-r1 xdg
 DESCRIPTION="Breeze SVG icon theme"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild
index 00317e240219..52e08f84ca98 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.29.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-6.29.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-6.29.0.ebuild
index c12ac8df1be9..193b2d566708 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-6.29.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running Plasma environment
diff --git a/kde-frameworks/karchive/karchive-6.29.0.ebuild b/kde-frameworks/karchive/karchive-6.29.0.ebuild
index 31c8cbe58806..6571ae755b56 100644
--- a/kde-frameworks/karchive/karchive-6.29.0.ebuild
+++ b/kde-frameworks/karchive/karchive-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="crypt +zstd"
 
 DEPEND="
diff --git a/kde-frameworks/kauth/kauth-6.29.0.ebuild b/kde-frameworks/kauth/kauth-6.29.0.ebuild
index 15f60447f3a3..b989afd79290 100644
--- a/kde-frameworks/kauth/kauth-6.29.0.ebuild
+++ b/kde-frameworks/kauth/kauth-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+policykit"
 
 RDEPEND="
diff --git a/kde-frameworks/kbookmarks/kbookmarks-6.29.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-6.29.0.ebuild
index 32d4457bec37..d1867374ddcf 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-6.29.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-6.29.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-6.29.0.ebuild
index b602c4927e5a..6a34e8cee78b 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-6.29.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library for interfacing with calendars"
 
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcmutils/kcmutils-6.29.0.ebuild b/kde-frameworks/kcmutils/kcmutils-6.29.0.ebuild
index 5b735ddbaa65..82ea999b4999 100644
--- a/kde-frameworks/kcmutils/kcmutils-6.29.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to work with KDE System Settings modules"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcodecs/kcodecs-6.29.0.ebuild b/kde-frameworks/kcodecs/kcodecs-6.29.0.ebuild
index c38e0c2b98a8..4b53ff2086db 100644
--- a/kde-frameworks/kcodecs/kcodecs-6.29.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for manipulating strings using various encodings"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-6.29.0.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-6.29.0.ebuild
index a53ece414492..e1669fa6c164 100644
--- a/kde-frameworks/kcolorscheme/kcolorscheme-6.29.0.ebuild
+++ b/kde-frameworks/kcolorscheme/kcolorscheme-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcompletion/kcompletion-6.29.0.ebuild b/kde-frameworks/kcompletion/kcompletion-6.29.0.ebuild
index 66e8fc6bf44d..cce624c5b654 100644
--- a/kde-frameworks/kcompletion/kcompletion-6.29.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kconfig/kconfig-6.29.0.ebuild b/kde-frameworks/kconfig/kconfig-6.29.0.ebuild
index 4c4883f42031..156dd359f7ba 100644
--- a/kde-frameworks/kconfig/kconfig-6.29.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for reading and writing configuration"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="dbus qml"
 REQUIRED_USE="test? ( qml )"
 
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.29.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.29.0.ebuild
index db44d99223aa..b845ba2675b9 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.29.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 CMAKE_SKIP_TESTS=(
diff --git a/kde-frameworks/kcontacts/kcontacts-6.29.0.ebuild b/kde-frameworks/kcontacts/kcontacts-6.29.0.ebuild
index a4d68a540dba..793374ccdd70 100644
--- a/kde-frameworks/kcontacts/kcontacts-6.29.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Address book API based on KDE Frameworks"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-6.29.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-6.29.0.ebuild
index 9d3b12519c72..949bf878ba43 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-6.29.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org xdg
 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="dbus"
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kcrash/kcrash-6.29.0.ebuild b/kde-frameworks/kcrash/kcrash-6.29.0.ebuild
index 36519e271409..f0df9823b520 100644
--- a/kde-frameworks/kcrash/kcrash-6.29.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for intercepting and handling application crashes"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # requires running Plasma environment
diff --git a/kde-frameworks/kdav/kdav-6.29.0.ebuild b/kde-frameworks/kdav/kdav-6.29.0.ebuild
index 40739a7e9392..5bec9ef8a562 100644
--- a/kde-frameworks/kdav/kdav-6.29.0.ebuild
+++ b/kde-frameworks/kdav/kdav-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="DAV protocol implemention with KJobs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running kde environment, bug #977471
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-6.29.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-6.29.0.ebuild
index 5e6a75a2b69c..bea2f2d8efb0 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-6.29.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-frameworks/kdeclarative/kdeclarative-6.29.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-6.29.0.ebuild
index 6d0b6e6f793a..52f054a8099b 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-6.29.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kded/kded-6.29.0.ebuild b/kde-frameworks/kded/kded-6.29.0.ebuild
index 0e9ef306be0f..b54a96c95374 100644
--- a/kde-frameworks/kded/kded-6.29.0.ebuild
+++ b/kde-frameworks/kded/kded-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Central daemon of KDE workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-frameworks/kdesu/kdesu-6.29.0.ebuild b/kde-frameworks/kdesu/kdesu-6.29.0.ebuild
index 3c1479e73ffa..4e154d83855c 100644
--- a/kde-frameworks/kdesu/kdesu-6.29.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to handle super user actions"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/kdnssd-6.29.0.ebuild b/kde-frameworks/kdnssd/kdnssd-6.29.0.ebuild
index 98729539e764..0f8489cb2865 100644
--- a/kde-frameworks/kdnssd/kdnssd-6.29.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="minimal"
 
 DEPEND="
diff --git a/kde-frameworks/kdoctools/kdoctools-6.29.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.29.0.ebuild
index b011a1021df3..46b46afea4b7 100644
--- a/kde-frameworks/kdoctools/kdoctools-6.29.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-6.29.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-6.29.0.ebuild
index 2b4b83f75de3..bb010d853fd3 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-6.29.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org optfeature python-any-r1
 DESCRIPTION="Library for extracting file metadata"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="epub exif ffmpeg mobi pdf taglib"
 
 RESTRICT="test"
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-6.29.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-6.29.0.ebuild
index 3061fc1ead76..673c40994737 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-6.29.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to handle global shortcuts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.29.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.29.0-r1.ebuild
index afaf2e8196b3..f1b58b9a7d14 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-6.29.0-r1.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.29.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org xdg
 DESCRIPTION="Framework providing assorted high-level user interface components"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="dbus wayland X"
 
 # slot op: includes qpa/qplatformnativeinterface.h, private/qguiapplication_p.h
diff --git a/kde-frameworks/kholidays/kholidays-6.29.0.ebuild b/kde-frameworks/kholidays/kholidays-6.29.0.ebuild
index e31ed898a23f..99732cf31cc5 100644
--- a/kde-frameworks/kholidays/kholidays-6.29.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtdeclarative-${QTMIN}:6"
diff --git a/kde-frameworks/ki18n/ki18n-6.29.0.ebuild b/kde-frameworks/ki18n/ki18n-6.29.0.ebuild
index a60bc66a3220..bdf715242c97 100644
--- a/kde-frameworks/ki18n/ki18n-6.29.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org python-single-r1
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.29.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.29.0.ebuild
index d241189aec62..ffecf77cd903 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-6.29.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for icon theming and configuration"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 574770
diff --git a/kde-frameworks/kidletime/kidletime-6.29.0.ebuild b/kde-frameworks/kidletime/kidletime-6.29.0.ebuild
index 8d7b7547e4e3..e974bb4dbae6 100644
--- a/kde-frameworks/kidletime/kidletime-6.29.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for detection and notification of device idle time"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="wayland X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kimageformats/kimageformats-6.29.0.ebuild b/kde-frameworks/kimageformats/kimageformats-6.29.0.ebuild
index a18eadc081b8..dd8cad616bdd 100644
--- a/kde-frameworks/kimageformats/kimageformats-6.29.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="avif eps heif jpeg2k jpegxl openexr raw"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/kio-6.29.0.ebuild b/kde-frameworks/kio/kio-6.29.0.ebuild
index 22bc10c64401..43caa5132a7b 100644
--- a/kde-frameworks/kio/kio-6.29.0.ebuild
+++ b/kde-frameworks/kio/kio-6.29.0.ebuild
@@ -13,7 +13,7 @@ inherit ecm flag-o-matic frameworks.kde.org xdg
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="acl +kwallet wayland X"
 
 # tests hang
diff --git a/kde-frameworks/kirigami/kirigami-6.29.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-6.29.0-r1.ebuild
index 55a6e2b1e8e3..0d9652b67521 100644
--- a/kde-frameworks/kirigami/kirigami-6.29.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-6.29.0-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Lightweight user interface framework for mobile and convergent appl
 HOMEPAGE="https://community.kde.org/Kirigami"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="openmp"
 
 # requires package to already be installed
diff --git a/kde-frameworks/kitemmodels/kitemmodels-6.29.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-6.29.0.ebuild
index c73e66db43c4..494213971ece 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-6.29.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:6
diff --git a/kde-frameworks/kitemviews/kitemviews-6.29.0.ebuild b/kde-frameworks/kitemviews/kitemviews-6.29.0.ebuild
index 39c1ed51a4d1..de500b08f765 100644
--- a/kde-frameworks/kitemviews/kitemviews-6.29.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing additional widgets for item models"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.29.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.29.0.ebuild
index ef41ba877d3c..1da6eb4e0bd9 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-6.29.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-frameworks/kmime/kmime-6.29.0.ebuild b/kde-frameworks/kmime/kmime-6.29.0.ebuild
index 8c7d604a7998..148660b29420 100644
--- a/kde-frameworks/kmime/kmime-6.29.0.ebuild
+++ b/kde-frameworks/kmime/kmime-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library for handling mail messages and newsgroup articles"
 
 LICENSE="LGPL-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 IUSE=""
 
 DEPEND="=kde-frameworks/kcodecs-${KDE_CATV}*:6"
diff --git a/kde-frameworks/knewstuff/knewstuff-6.29.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.29.0.ebuild
index c8cbbd31cc02..bd9bc6288ee1 100644
--- a/kde-frameworks/knewstuff/knewstuff-6.29.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="opds"
 
 DEPEND="
diff --git a/kde-frameworks/knotifications/knotifications-6.29.0.ebuild b/kde-frameworks/knotifications/knotifications-6.29.0.ebuild
index a1c1eb756526..8de9fdddfa99 100644
--- a/kde-frameworks/knotifications/knotifications-6.29.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for notifying the user of an event"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-6.29.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-6.29.0.ebuild
index 3a492d14ae2e..542f7a6bb96e 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-6.29.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for configuring desktop notifications"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kpackage/kpackage-6.29.0.ebuild b/kde-frameworks/kpackage/kpackage-6.29.0.ebuild
index 8f62883f9164..a672a83e806b 100644
--- a/kde-frameworks/kpackage/kpackage-6.29.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to install and load packages of non binary content"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="man"
 
 DEPEND="
diff --git a/kde-frameworks/kparts/kparts-6.29.0.ebuild b/kde-frameworks/kparts/kparts-6.29.0.ebuild
index ddf5f4c4ea75..9fd1ee863672 100644
--- a/kde-frameworks/kparts/kparts-6.29.0.ebuild
+++ b/kde-frameworks/kparts/kparts-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing elaborate user-interface components"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpeople/kpeople-6.29.0.ebuild b/kde-frameworks/kpeople/kpeople-6.29.0.ebuild
index 562bf006aea2..8eb1dbee23a9 100644
--- a/kde-frameworks/kpeople/kpeople-6.29.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-6.29.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kplotting/kplotting-6.29.0.ebuild b/kde-frameworks/kplotting/kplotting-6.29.0.ebuild
index 787136bf0d4c..1f73eac35234 100644
--- a/kde-frameworks/kplotting/kplotting-6.29.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing easy data-plotting functions"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
diff --git a/kde-frameworks/kpty/kpty-6.29.0.ebuild b/kde-frameworks/kpty/kpty-6.29.0.ebuild
index a55e69bee41e..117ae79559cc 100644
--- a/kde-frameworks/kpty/kpty-6.29.0.ebuild
+++ b/kde-frameworks/kpty/kpty-6.29.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kquickcharts/kquickcharts-6.29.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.29.0.ebuild
index cb81edad2c62..49051df1762f 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-6.29.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-6.29.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="QtQuick plugin providing high-performance charts"
 HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/krunner/krunner-6.29.0.ebuild b/kde-frameworks/krunner/krunner-6.29.0.ebuild
index 57441281e52d..0eb594efae0c 100644
--- a/kde-frameworks/krunner/krunner-6.29.0.ebuild
+++ b/kde-frameworks/krunner/krunner-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for providing different actions given a string query"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/ksecretd-services/ksecretd-services-6.29.0.ebuild b/kde-frameworks/ksecretd-services/ksecretd-services-6.29.0.ebuild
index bd04be1ce6f1..675c3c55f736 100644
--- a/kde-frameworks/ksecretd-services/ksecretd-services-6.29.0.ebuild
+++ b/kde-frameworks/ksecretd-services/ksecretd-services-6.29.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="D-Bus service files for ksecretd kwallet runtime component"
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="systemd"
 
 RDEPEND="!<kde-frameworks/kwallet-runtime-6.18.0-r1:6"
diff --git a/kde-frameworks/kservice/kservice-6.29.0.ebuild b/kde-frameworks/kservice/kservice-6.29.0.ebuild
index 8cdc0d549437..40fff9d2f08a 100644
--- a/kde-frameworks/kservice/kservice-6.29.0.ebuild
+++ b/kde-frameworks/kservice/kservice-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Advanced plugin and service introspection"
 
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 # requires running kde environment
diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.29.0.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.29.0.ebuild
index fa3bd7e676df..be86eddd038d 100644
--- a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.29.0.ebuild
+++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Implementation of Status Notifier Items"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Qt6::WidgetsPrivate use
diff --git a/kde-frameworks/ksvg/ksvg-6.29.0.ebuild b/kde-frameworks/ksvg/ksvg-6.29.0.ebuild
index a37e9acdacfd..a6131f4ecdfe 100644
--- a/kde-frameworks/ksvg/ksvg-6.29.0.ebuild
+++ b/kde-frameworks/ksvg/ksvg-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Components for handling SVGs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 969244
diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.29.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.29.0.ebuild
index 98dcdad3d32e..6325314707bf 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-6.29.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing a full text editor component"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+editorconfig"
 
 RESTRICT="test"
diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-6.29.0.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-6.29.0.ebuild
index 3cdfb9119e4f..7c654f8f623f 100644
--- a/kde-frameworks/ktexttemplate/ktexttemplate-6.29.0.ebuild
+++ b/kde-frameworks/ktexttemplate/ktexttemplate-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library to allow separating the structure of documents from data they contain"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-6.29.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-6.29.0.ebuild
index bd824ce02239..ecf5041f28e2 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-6.29.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
 
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-frameworks/kunitconversion/kunitconversion-6.29.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-6.29.0.ebuild
index b69bf2820ea1..619b3bb111dd 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-6.29.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for converting units"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-6.29.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-6.29.0.ebuild
index e31413ac9d51..4706dfdf79d4 100644
--- a/kde-frameworks/kuserfeedback/kuserfeedback-6.29.0.ebuild
+++ b/kde-frameworks/kuserfeedback/kuserfeedback-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc tools"
 
 # FIXME: Qt_6_PRIVATE_API matches UserFeedbackConsole, but where is it coming from?
diff --git a/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild
index 80bae859348d..2e086885cbf9 100644
--- a/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild
+++ b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Framework providing desktop-wide storage for passwords"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/kde/${PATCHSET}.tar.xz"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gpg +man +keyring +legacy-kwallet X"
 
 DEPEND="
diff --git a/kde-frameworks/kwallet/kwallet-6.29.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-6.29.0-r1.ebuild
index 63d35f4064e8..c3a3773b6775 100644
--- a/kde-frameworks/kwallet/kwallet-6.29.0-r1.ebuild
+++ b/kde-frameworks/kwallet/kwallet-6.29.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Interface to KWallet Framework providing desktop-wide storage for p
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/kde/${PATCHSET}.tar.xz"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="minimal"
 
 DEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild
index ffdc25b70c15..1242a9865f50 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Assortment of high-level widgets for common tasks"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtbase-${QTMIN}:6[gui,widgets]"
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-6.29.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-6.29.0.ebuild
index 8006bfdafdd7..747bd9b03ab2 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-6.29.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="wayland X"
 
 RESTRICT="test"
diff --git a/kde-frameworks/kxmlgui/kxmlgui-6.29.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-6.29.0.ebuild
index 6507d60d7bf2..51807e9e3cc6 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-6.29.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: includes QtCore/private/qlocale_p.h
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.29.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.29.0.ebuild
index 25a4b8c5c4a7..16cf5e92c65f 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.29.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="ModemManager bindings for Qt"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running environment
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-6.29.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.29.0.ebuild
index b15c3f96b835..e6d45a6e7dc8 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-6.29.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="NetworkManager bindings for Qt"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="teamd"
 
 DEPEND="
diff --git a/kde-frameworks/prison/prison-6.29.0.ebuild b/kde-frameworks/prison/prison-6.29.0.ebuild
index 831d7f2b7506..2b3c7d479ddb 100644
--- a/kde-frameworks/prison/prison-6.29.0.ebuild
+++ b/kde-frameworks/prison/prison-6.29.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://invent.kde.org/frameworks/prison"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="qml"
 
 RDEPEND="
diff --git a/kde-frameworks/purpose/purpose-6.29.0.ebuild b/kde-frameworks/purpose/purpose-6.29.0.ebuild
index 5fb44817054f..bd787e7ada1f 100644
--- a/kde-frameworks/purpose/purpose-6.29.0.ebuild
+++ b/kde-frameworks/purpose/purpose-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org optfeature xdg
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="bluetooth webengine"
 
 # requires running environment
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.29.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.29.0.ebuild
index fa16fc1a4d6a..946fa01159c6 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.29.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
diff --git a/kde-frameworks/solid/solid-6.29.0.ebuild b/kde-frameworks/solid/solid-6.29.0.ebuild
index 047ef5555bf2..65adaa9fa4f1 100644
--- a/kde-frameworks/solid/solid-6.29.0.ebuild
+++ b/kde-frameworks/solid/solid-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org optfeature
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="ios"
 
 RDEPEND="
diff --git a/kde-frameworks/sonnet/sonnet-6.29.0.ebuild b/kde-frameworks/sonnet/sonnet-6.29.0.ebuild
index 9521f872aad5..9e6a7a2d4d88 100644
--- a/kde-frameworks/sonnet/sonnet-6.29.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="aspell +hunspell qml"
 
 DEPEND="
diff --git a/kde-frameworks/syndication/syndication-6.29.0.ebuild b/kde-frameworks/syndication/syndication-6.29.0.ebuild
index f8529d86e76d..39d4311fa517 100644
--- a/kde-frameworks/syndication/syndication-6.29.0.ebuild
+++ b/kde-frameworks/syndication/syndication-6.29.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.29.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.29.0.ebuild
index de4861c87302..17918b8000e8 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-6.29.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-6.29.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org python-any-r1
 DESCRIPTION="Framework for syntax highlighting"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # examples: dev-qt/qtbase[printsupport,widgets]
diff --git a/kde-frameworks/threadweaver/threadweaver-6.29.0.ebuild b/kde-frameworks/threadweaver/threadweaver-6.29.0.ebuild
index 6e9fc00cfd68..4b9189904a23 100644
--- a/kde-frameworks/threadweaver/threadweaver-6.29.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-6.29.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-qt/qtbase-${QTMIN}:6"
diff --git a/kde-plasma/aurorae/aurorae-6.6.6-r1.ebuild b/kde-plasma/aurorae/aurorae-6.6.6-r1.ebuild
index 0fc32c9e739e..f2a675c979ef 100644
--- a/kde-plasma/aurorae/aurorae-6.6.6-r1.ebuild
+++ b/kde-plasma/aurorae/aurorae-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/aurorae"
 
 LICENSE="GPL-2+ MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,opengl,widgets]
diff --git a/kde-plasma/bluedevil/bluedevil-6.6.6-r1.ebuild b/kde-plasma/bluedevil/bluedevil-6.6.6-r1.ebuild
index d493503c0ba1..40db1531a51b 100644
--- a/kde-plasma/bluedevil/bluedevil-6.6.6-r1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/breeze-grub/breeze-grub-6.6.6-r1.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.6.6-r1.ebuild
index 1f87445e26b2..21ca315e6f21 100644
--- a/kde-plasma/breeze-grub/breeze-grub-6.6.6-r1.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-6.6.6-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-6.6.6-r1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.6.6-r1.ebuild
index 848d3e7fc17f..5230b5325e47 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-6.6.6-r1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-6.6.6-r1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.6.6-r1.ebuild
index 42b21bfc1a66..eda690b5786a 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-6.6.6-r1.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.6.6-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0"
diff --git a/kde-plasma/breeze/breeze-6.6.6-r1.ebuild b/kde-plasma/breeze/breeze-6.6.6-r1.ebuild
index 88ddc11bc03e..57515be7c88e 100644
--- a/kde-plasma/breeze/breeze-6.6.6-r1.ebuild
+++ b/kde-plasma/breeze/breeze-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
diff --git a/kde-plasma/discover/discover-6.6.6-r1.ebuild b/kde-plasma/discover/discover-6.6.6-r1.ebuild
index b37fe96ce9ce..8cd61529437e 100644
--- a/kde-plasma/discover/discover-6.6.6-r1.ebuild
+++ b/kde-plasma/discover/discover-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+firmware flatpak snap telemetry webengine"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/drkonqi-6.6.6-r1.ebuild b/kde-plasma/drkonqi/drkonqi-6.6.6-r1.ebuild
index 0b17f290952e..825b65654543 100644
--- a/kde-plasma/drkonqi/drkonqi-6.6.6-r1.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-6.6.6-r1.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.6.6-r1.ebuild
index 2ac6bf6c016c..4fb6cdc43375 100644
--- a/kde-plasma/flatpak-kcm/flatpak-kcm-6.6.6-r1.ebuild
+++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/flatpak-kcm"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.6.6-r1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.6.6-r1.ebuild
index 9a4560cceb94..064e54e53580 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.6.6-r1.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.6.6-r1.ebuild b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.6.6-r1.ebuild
index 86c901b7bb11..6be81202d40c 100644
--- a/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.6.6-r1.ebuild
+++ b/kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.6.6-r1.ebuild
@@ -9,6 +9,6 @@ inherit ecm-common plasma.kde.org
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.6.6-r1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.6.6-r1.ebuild
index c43809f6c110..1716b50f4f6c 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-6.6.6-r1.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.6.6-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="kdesu X"
 
 # slot op: kstart Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-6.6.6-r1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.6.6-r1.ebuild
index f9add8927ad5..a96fb6550495 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-6.6.6-r1.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-6.6.6-r1.ebuild b/kde-plasma/kdecoration/kdecoration-6.6.6-r1.ebuild
index 488a042d947a..8c2d3903ef93 100644
--- a/kde-plasma/kdecoration/kdecoration-6.6.6-r1.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.6.6-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.6.6-r1.ebuild
index 07338143f1c7..4894f482a781 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.6.6-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+alternate-calendar share webengine"
 
 RESTRICT="test" # bug 727846, +missing selenium-webdriver-at-spi
diff --git a/kde-plasma/kdesu-gui/kdesu-gui-6.6.6-r1.ebuild b/kde-plasma/kdesu-gui/kdesu-gui-6.6.6-r1.ebuild
index 1a7ec6b7fe78..e50e1b04c714 100644
--- a/kde-plasma/kdesu-gui/kdesu-gui-6.6.6-r1.ebuild
+++ b/kde-plasma/kdesu-gui/kdesu-gui-6.6.6-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-plasma/keditfiletype/keditfiletype-6.6.6-r1.ebuild b/kde-plasma/keditfiletype/keditfiletype-6.6.6-r1.ebuild
index 6b715d4198c5..4e707a1a6e55 100644
--- a/kde-plasma/keditfiletype/keditfiletype-6.6.6-r1.ebuild
+++ b/kde-plasma/keditfiletype/keditfiletype-6.6.6-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running Plasma environment
diff --git a/kde-plasma/kgamma/kgamma-6.6.6-r1.ebuild b/kde-plasma/kgamma/kgamma-6.6.6-r1.ebuild
index c89787ce6fd5..5d6936dfb9ce 100644
--- a/kde-plasma/kgamma/kgamma-6.6.6-r1.ebuild
+++ b/kde-plasma/kgamma/kgamma-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kglobalacceld/kglobalacceld-6.6.6-r2.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-6.6.6-r2.ebuild
index b489615f48b6..097e3b5fe88a 100644
--- a/kde-plasma/kglobalacceld/kglobalacceld-6.6.6-r2.ebuild
+++ b/kde-plasma/kglobalacceld/kglobalacceld-6.6.6-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Daemon providing Global Keyboard Shortcut (Accelerator) functionali
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 REQUIRED_USE="test? ( X )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-6.6.6-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.6.6-r1.ebuild
index 31d207c0453f..9ae1d161ad68 100644
--- a/kde-plasma/kinfocenter/kinfocenter-6.6.6-r1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-6.6.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gles2-only usb"
 
 DEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-6.6.6-r1.ebuild b/kde-plasma/kmenuedit/kmenuedit-6.6.6-r1.ebuild
index e931cf513992..4c3456294dca 100644
--- a/kde-plasma/kmenuedit/kmenuedit-6.6.6-r1.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/knighttime/knighttime-6.6.6-r1.ebuild b/kde-plasma/knighttime/knighttime-6.6.6-r1.ebuild
index 3a15f8b108c4..7ae1c9ececb4 100644
--- a/kde-plasma/knighttime/knighttime-6.6.6-r1.ebuild
+++ b/kde-plasma/knighttime/knighttime-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Helpers for scheduling the dark-light cycle"
 
 LICENSE="BSD CC0-1.0 || ( GPL-2 GPL-3 ) || ( LGPL-2.1 LGPL-3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
diff --git a/kde-plasma/kpipewire/kpipewire-6.6.6.1-r1.ebuild b/kde-plasma/kpipewire/kpipewire-6.6.6.1-r1.ebuild
index 1bf61ef90d04..a42f25cfa931 100644
--- a/kde-plasma/kpipewire/kpipewire-6.6.6.1-r1.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-6.6.6.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Components relating to Flatpak pipewire use in Plasma"
 
 LICENSE="LGPL-2.1+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # bug 964943
diff --git a/kde-plasma/krdp/krdp-6.6.6-r1.ebuild b/kde-plasma/krdp/krdp-6.6.6-r1.ebuild
index 2a4281b12855..892ef1f21529 100644
--- a/kde-plasma/krdp/krdp-6.6.6-r1.ebuild
+++ b/kde-plasma/krdp/krdp-6.6.6-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://quantumproductions.info/articles/2023-08/remote-desktop-usin
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="systemd"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kscreen/kscreen-6.6.6-r1.ebuild b/kde-plasma/kscreen/kscreen-6.6.6-r1.ebuild
index b838c427906e..6630a83de5e4 100644
--- a/kde-plasma/kscreen/kscreen-6.6.6-r1.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Uses Qt6GuiPrivate and Qt6WaylandClientPrivate
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.6.6-r1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.6.6-r1.ebuild
index 4cc3be45caa3..16f71693c2ed 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-6.6.6-r1.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running environment w/ RDEPENDs (circular dep w/ plasma-workspace)
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-6.6.6-r1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.6.6-r1.ebuild
index 900899c9cf82..d39df9f3a22a 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-6.6.6-r1.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksystemstats/ksystemstats-6.6.6-r1.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.6.6-r1.ebuild
index 6e8655e858ba..d16bbb4b7d56 100644
--- a/kde-plasma/ksystemstats/ksystemstats-6.6.6-r1.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-6.6.6-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.6.6-r1.ebuild
index 506c88e70a23..bfe6c90e4585 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-6.6.6-r1.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-6.6.6-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland/kwayland-6.6.6-r1.ebuild b/kde-plasma/kwayland/kwayland-6.6.6-r1.ebuild
index 60f2fba33a61..60a807e9f8b3 100644
--- a/kde-plasma/kwayland/kwayland-6.6.6-r1.ebuild
+++ b/kde-plasma/kwayland/kwayland-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
 
 LICENSE="LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwin-x11/kwin-x11-6.6.6-r1.ebuild b/kde-plasma/kwin-x11/kwin-x11-6.6.6-r1.ebuild
index f1e6b652fb4b..daf7d5be6861 100644
--- a/kde-plasma/kwin-x11/kwin-x11-6.6.6-r1.ebuild
+++ b/kde-plasma/kwin-x11/kwin-x11-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Flexible, composited X window manager"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="accessibility gles2-only lock selinux +shortcuts systemd"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwin/kwin-6.6.6-r1.ebuild b/kde-plasma/kwin/kwin-6.6.6-r1.ebuild
index c5d8b23fc969..c28405773fdc 100644
--- a/kde-plasma/kwin/kwin-6.6.6-r1.ebuild
+++ b/kde-plasma/kwin/kwin-6.6.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="accessibility gamepad gles2-only lock screencast selinux +shortcuts systemd"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwrited/kwrited-6.6.6-r1.ebuild b/kde-plasma/kwrited/kwrited-6.6.6-r1.ebuild
index 88f658a9e576..386b10052f3f 100644
--- a/kde-plasma/kwrited/kwrited-6.6.6-r1.ebuild
+++ b/kde-plasma/kwrited/kwrited-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-6.6.6-r1.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.6.6-r1.ebuild
index 264f13de62dd..1d2c7035e845 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-6.6.6-r1.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-she
 
 LICENSE="LGPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: various private QtWaylandClient headers
diff --git a/kde-plasma/libkscreen/libkscreen-6.6.6-r2.ebuild b/kde-plasma/libkscreen/libkscreen-6.6.6-r2.ebuild
index ab1cc7ae19ff..e5ec38659d17 100644
--- a/kde-plasma/libkscreen/libkscreen-6.6.6-r2.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-6.6.6-r2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6/8"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libksysguard/libksysguard-6.6.6-r1.ebuild b/kde-plasma/libksysguard/libksysguard-6.6.6-r1.ebuild
index c42c7c7ed125..ab8e13e987cd 100644
--- a/kde-plasma/libksysguard/libksysguard-6.6.6-r1.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="6/10"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libplasma/libplasma-6.6.6-r1.ebuild b/kde-plasma/libplasma/libplasma-6.6.6-r1.ebuild
index a0d160788610..316db1f7f057 100644
--- a/kde-plasma/libplasma/libplasma-6.6.6-r1.ebuild
+++ b/kde-plasma/libplasma/libplasma-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma library and runtime components based upon KF6 and Qt6"
 
 LICENSE="LGPL-2+"
 SLOT="6/7"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="gles2-only"
 
 RESTRICT="test"
diff --git a/kde-plasma/milou/milou-6.6.6-r1.ebuild b/kde-plasma/milou/milou-6.6.6-r1.ebuild
index 6f8a67637e9d..ead317132e1a 100644
--- a/kde-plasma/milou/milou-6.6.6-r1.ebuild
+++ b/kde-plasma/milou/milou-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.6.6-r1.ebuild b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.6.6-r1.ebuild
index cf9044bb0f50..713fd93196cf 100644
--- a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.6.6-r1.ebuild
+++ b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.6.6-r1.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://invent.kde.org/plasma/ocean-sound-theme"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-6.6.6-r1.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-6.6.6-r1.ebuild
index 6a8da35f01db..cb2f06871d0d 100644
--- a/kde-plasma/oxygen-sounds/oxygen-sounds-6.6.6-r1.ebuild
+++ b/kde-plasma/oxygen-sounds/oxygen-sounds-6.6.6-r1.ebuild
@@ -12,4 +12,4 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/kde-plasma/oxygen/oxygen-6.6.6-r2.ebuild b/kde-plasma/oxygen/oxygen-6.6.6-r2.ebuild
index b50f84f8fc34..d2cc3c11aa08 100644
--- a/kde-plasma/oxygen/oxygen-6.6.6-r2.ebuild
+++ b/kde-plasma/oxygen/oxygen-6.6.6-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.6.6-r1.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.6.6-r1.ebuild
index f7f38d0b45c6..1bcc4abd4637 100644
--- a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for accessing usage data collected by the activities system
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-activities/plasma-activities-6.6.6-r1.ebuild b/kde-plasma/plasma-activities/plasma-activities-6.6.6-r1.ebuild
index f18f8ac38158..eeefe807049d 100644
--- a/kde-plasma/plasma-activities/plasma-activities-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-activities/plasma-activities-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Core components for KDE's Activities System"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="6/7"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.6.6-r1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.6.6-r1.ebuild
index 8298ba26866c..cdace49cc92a 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.6.6-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.6.6-r1.ebuild
index a4a8b8002fd8..cccca5cb11f4 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.6.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
diff --git a/kde-plasma/plasma-disks/plasma-disks-6.6.6-r1.ebuild b/kde-plasma/plasma-disks/plasma-disks-6.6.6-r1.ebuild
index 6541f256f3ef..bdb411bb02ed 100644
--- a/kde-plasma/plasma-disks/plasma-disks-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.6.6-r1.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.6.6-r1.ebuild
index c777e651eaa3..1a3bd1170ad5 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-6.6.6-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="firewalld +ufw"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
diff --git a/kde-plasma/plasma-integration/plasma-integration-6.6.6-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.6.6-r1.ebuild
index 4478a00f8c45..e1ac919b2845 100644
--- a/kde-plasma/plasma-integration/plasma-integration-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-keyboard/plasma-keyboard-6.6.6-r1.ebuild b/kde-plasma/plasma-keyboard/plasma-keyboard-6.6.6-r1.ebuild
index 73acff74db5d..9de61c47a0a0 100644
--- a/kde-plasma/plasma-keyboard/plasma-keyboard-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-keyboard/plasma-keyboard-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Virtual keyboard based on Qt Virtual Keyboard"
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1 LGPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 
 # slot op: Uses Qt6::GuiPrivate for qxkbcommon_p.h
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.6.6-r1.ebuild b/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.6.6-r1.ebuild
index ec6d73f3fe84..e214d93091c3 100644
--- a/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-login-sessions/plasma-login-sessions-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma login sessions"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+wayland X"
 
 REQUIRED_USE="|| ( wayland X )"
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.6.6-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.6.6-r1.ebuild
index 6506344463c2..e70b6fe8e1f0 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.6.6-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="accessibility bluetooth +browser-integration +crash-handler crypt cups
 discover +display-manager +elogind +firewall flatpak grub gtk +kwallet
 +networkmanager ocr oxygen-theme plymouth pulseaudio rdp +sddm sdk +smart
diff --git a/kde-plasma/plasma-nm/plasma-nm-6.6.6-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.6.6-r1.ebuild
index 9a6217eafb05..bc41f29f9d3e 100644
--- a/kde-plasma/plasma-nm/plasma-nm-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="openconnect teamd"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-6.6.6-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.6.6-r1.ebuild
index 5f3a274e27b3..a48ec30e036a 100644
--- a/kde-plasma/plasma-pa/plasma-pa-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.6.6-r1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.6.6-r1.ebuild
index ff26b8ad2069..cc7642773d71 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.6.6-r1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.6.6-r1.ebuild
index 58d3d7f5a058..ca6198cc9ab5 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-6.6.6-r1.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.6.6-r1.ebuild
index af8931f0209c..09faefaf1b97 100644
--- a/kde-plasma/plasma-vault/plasma-vault-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.6.6-r1.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.6.6-r1.ebuild
index b8ce8f90bf3e..18d1462cd235 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Friendly onboarding wizard for Plasma"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.6.6-r1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.6.6-r1.ebuild
index 72da4a592d12..6d15ec2ff985 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.6.6-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.6.6-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.6.6-r1.ebuild
index 4544da7f6d48..e8083af6a77f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="appstream +fontconfig +ksysguard networkmanager +policykit
 screencast +semantic-desktop systemd telemetry +wallpaper-metadata +X"
 
diff --git a/kde-plasma/plasma5support/plasma5support-6.6.6-r1.ebuild b/kde-plasma/plasma5support/plasma5support-6.6.6-r1.ebuild
index 9d5b4cfd6a3b..63bdfa8e1eb9 100644
--- a/kde-plasma/plasma5support/plasma5support-6.6.6-r1.ebuild
+++ b/kde-plasma/plasma5support/plasma5support-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Support components for porting from KF5/Qt5 to KF6/Qt6"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="activities geolocation ksysguard X"
 
 RESTRICT="test" # bug 926347
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.6.6-r1.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.6.6-r1.ebuild
index a0995926dbc3..b0e42262f153 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-6.6.6-r1.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.6.6-r1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.6.6-r1.ebuild
index fcbfc1e17f50..356cb556062a 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.6.6-r1.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-6.6.6-r2.ebuild b/kde-plasma/powerdevil/powerdevil-6.6.6-r2.ebuild
index 3f6d37c6d53f..09b6e61533d2 100644
--- a/kde-plasma/powerdevil/powerdevil-6.6.6-r2.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-6.6.6-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="brightness-control"
 
 RESTRICT="test" # bug 926513
diff --git a/kde-plasma/print-manager/print-manager-6.6.6-r1.ebuild b/kde-plasma/print-manager/print-manager-6.6.6-r1.ebuild
index 276680d66e27..4497af8475f8 100644
--- a/kde-plasma/print-manager/print-manager-6.6.6-r1.ebuild
+++ b/kde-plasma/print-manager/print-manager-6.6.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Manage CUPS print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.6.6-r1.ebuild b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.6.6-r1.ebuild
index 66eb56b75b1a..30febd4532fe 100644
--- a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.6.6-r1.ebuild
+++ b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Breeze inspired QQC2 Style"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) CC0-1.0"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.6.6-r1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.6.6-r1.ebuild
index 0a32659792f4..294a1f56b95a 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-6.6.6-r1.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/spectacle/spectacle-6.6.6-r1.ebuild b/kde-plasma/spectacle/spectacle-6.6.6-r1.ebuild
index 94a53903e17d..f5b5e252f00e 100644
--- a/kde-plasma/spectacle/spectacle-6.6.6-r1.ebuild
+++ b/kde-plasma/spectacle/spectacle-6.6.6-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 )"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="share"
 
 # slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/systemsettings/systemsettings-6.6.6-r1.ebuild b/kde-plasma/systemsettings/systemsettings-6.6.6-r1.ebuild
index 8b239e2d4912..2f282b7daea9 100644
--- a/kde-plasma/systemsettings/systemsettings-6.6.6-r1.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/wacomtablet/wacomtablet-6.6.6-r2.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.6.6-r2.ebuild
index 949e85efc915..b604f392a6e2 100644
--- a/kde-plasma/wacomtablet/wacomtablet-6.6.6-r2.ebuild
+++ b/kde-plasma/wacomtablet/wacomtablet-6.6.6-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/Wacomtablet"
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.6.6-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.6.6-r1.ebuild
index 1e042ceb7e51..c69e9b4a68e5 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.6.6-r1.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.6.6-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # dev-qt/qtbase:= slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 6ff2236fb31a..329e7fa86b55 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,2 +1 @@
-DIST font-util-1.4.1.tar.xz 144320 BLAKE2B 5a7cee52aa58cecc85f5168963038b65d921bc33615e86a833cba5aec007d61bb05fa3b200ed9b192d9ab9291d53065443711f8eac976242b2013cd7b9fc494a SHA512 cec7fc38ba64ca9c81c59a8395da94d71c75e14f19faf6457da0a1a8c3c1cf51bcaab227834f6f5a6d274ba2557555e542dbe2bd88e527c45ea196318bbc38d0
 DIST font-util-1.4.2.tar.xz 152764 BLAKE2B 816c4b593e8be71807a253f19e7f7e40a28bd82f283f7a396937ba12d624eb395b9b7c7bfe3bb39c40755d6b27fb64d79f286bf38e87b3258178b648f1d0c2ba SHA512 3def5f08bcb30ec3e0008f648478ebe1f65127d03e821613de550e95247812751b4ff31383739ad120123b2f69c87d819c18d44d1edee2ca51075a3c031e3a6f
diff --git a/media-fonts/font-util/font-util-1.4.1.ebuild b/media-fonts/font-util/font-util-1.4.1.ebuild
deleted file mode 100644
index 638b1df14579..000000000000
--- a/media-fonts/font-util/font-util-1.4.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2005-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_PACKAGE_NAME="util"
-inherit xorg-3
-
-DESCRIPTION="X.Org font utilities"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-	--with-mapdir="${EPREFIX}"/usr/share/fonts/util
-)
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 2fb6bfe6026b..d8b35d307b68 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,4 +1,3 @@
 DIST asymptote-3.11.src.tgz 27368439 BLAKE2B cf28653ff93a1d22344ec893d35d64eec634537166d6be26b5f6593666d612168b71891b78d28baf4007611747951c4857dba01a870a236cbe7c8ac288642620 SHA512 22f70e4e6808432f20e17f2136f34bf5fd4f4f6f4c5cb52bb837ced69d2ffed2734e121dfb63f51d148260c026a1f9d1bd56a07295659654878950722d6ad2cd
-DIST asymptote-3.12.src.tgz 28607113 BLAKE2B 1019d579b4d141206210b509dd12b97b622892f584f6670b3168adf52e2978d202da54b60b8cf7e4a3425fa6f9730409a304c338cb4a27321387b9d30f9784d6 SHA512 117ada1c0a60c90e7e02fcce8a1005714259104f744e6096b5216d2fcfbade93bc17e7271402e163d3d83f122837ca05d6a18c8b7a8f89c71c81fcf47d7352b8
-DIST asymptote-3.13.src.tgz 28414977 BLAKE2B 7c2f1d69cbbcee0fb5583320c1dc712dd20c66118d1551ea646548a24b13866f5510f7d11ab69968e06f2e8f5d7dd3a3e5eea5753017c2218cbdd4c08cd6a542 SHA512 94a36d5ec2b78e6858dc5b2154d0b91686789b569af74a2f3fb36485e9fd164607721ae1541ba05faaf4c3aff351e31607309f39efa8f38c1d66eb0280a15392
 DIST asymptote-3.14.src.tgz 28362948 BLAKE2B 668152e8bd35b48e0aae3603f0e461ac400a7a6b44bbaea1eabd81bc4f36488999d7e01b56ff202df97d75763067590b41c71c11d3183581d8c2d0056040457c SHA512 17b8ef7120bed3bd59798864b9150d470d5e3094716d3d824b892732efd66255bbaa024ed1d92c861074ef9bc8c4b787ba238ecb455693ad9f2e0936a6f7e8c0
+DIST asymptote-3.15.src.tgz 28378832 BLAKE2B 8968ed24a43640f0385ba1ce32376f4c6986b5cc6c3624976aa75be560c298384bf7362458925a201a019b1f94eb8ec7e6d0741490ff2e386dd6509ace320b4d SHA512 704ef7d5ee15a194b389151a8f71c7e5071af103578f1b3e8ffdc69784929db88a3d2f1a3f5b7fa4d7bee8b8284c63064a24802daeac4aed2779c7e03aab087d
diff --git a/media-gfx/asymptote/asymptote-3.12-r2.ebuild b/media-gfx/asymptote/asymptote-3.12-r2.ebuild
deleted file mode 100644
index 96b388291889..000000000000
--- a/media-gfx/asymptote/asymptote-3.12-r2.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-# latex-package does not support EAPI 9
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/ https://github.com/vectorgraphics/asymptote/"
-SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="context curl doc emacs examples fftw gsl gui +imagemagick latex lsp +opengl python sigsegv svg test vim-syntax"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	net-libs/libtirpc:=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa[X] media-libs/freeglut media-libs/glew:0 media-libs/glm media-libs/glfw )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	fftw? ( >=sci-libs/fftw-3.0.1:= )
-	gsl? ( sci-libs/gsl:= )
-	python? ( ${PYTHON_DEPS} )
-	curl? ( net-misc/curl )
-	lsp? (
-		dev-libs/boost
-		dev-libs/rapidjson
-		dev-libs/utfcpp
-	)
-	gui? (
-		${PYTHON_DEPS}
-		dev-python/pyside[${PYTHON_USEDEP},gui,widgets,svg]
-		dev-python/cson
-		dev-python/numpy
-		>=gnome-base/librsvg-2.40
-	)
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-	)
-	context? ( dev-texlive/texlive-context )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	gui? ( dev-python/pyside[${PYTHON_USEDEP},tools] )
-	doc? (
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${PN}-2.92-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${PN}-2.70-info.patch"
-)
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-	pushd gc > /dev/null || die "pushd gc failed"
-	eautoreconf
-	popd > /dev/null || die
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		--disable-gc-full-debug \
-		--disable-vulkan \
-		--with-latex=/usr/share/texmf-site/tex/latex \
-		--with-context=/usr/share/texmf-site/tex/context \
-		$(use_enable curl) \
-		$(use_enable lsp) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable sigsegv)
-	pushd gc > /dev/null || die "pushd gc failed"
-	econf
-	popd > /dev/null || die
-}
-
-src_compile() {
-	addpredict /proc # for /proc/*/clear_refs
-	default
-
-	emake doc/version.texi
-	cd doc || die
-	emake asy.1
-	einfo "Making info"
-	emake ${PN}.info
-	if use doc; then
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/collections base/shaders base/webgl
-	chmod 755 "${D}"/usr/share/${PN}/shaders/*
-
-	# documentation
-	dodoc README
-	cd doc || die
-	doman asy.1
-	doinfo ${PN}.info
-	if use doc; then
-		dodoc FAQ/asy-faq.ascii
-		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
-	fi
-	cd .. || die
-
-	# asymptote.py
-	if use python; then
-		python_moduleinto ${PN}
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# gui
-	if use gui; then
-		cd GUI || die
-		python_setup
-		sed -e 1d -i xasy.py
-		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
-		cat xasy1 xasy.py > xasy
-		rm xasy1 xasy.py
-		mv xasy xasy.py
-		cd .. || die
-		python_moduleinto ${PN}
-		python_domodule GUI
-		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
-		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		docinto examples
-		dodoc \
-			examples/*.asy \
-			examples/*.views \
-			examples/*.dat \
-			examples/*.bib \
-			examples/*.png \
-			examples/*.pdb1 \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/pixel.pdf \
-			doc/extra/*.asy
-		docinto examples/animations
-		cd examples/animations || die
-		dodoc *.asy *.u3d
-		cd ../.. || die
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins *.sty latexmkrc
-		if use examples; then
-			docinto examples
-			dodoc latexusage.tex externalprc.tex
-			docinto examples/animations
-			dodoc ../examples/animations/*.tex
-		fi
-		cd .. || die
-	fi
-
-	# ConTeXt
-	if use context; then
-		insinto /usr/share/texmf-site/tex/context
-		doins doc/colo-asy.tex
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins base/asy_filetype.vim
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-3.13-r1.ebuild b/media-gfx/asymptote/asymptote-3.15.ebuild
index 596364205330..6583d608f11c 100644
--- a/media-gfx/asymptote/asymptote-3.13-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-3.15.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 # latex-package does not support EAPI 9
 
 PYTHON_COMPAT=( python3_{13..14} )
@@ -68,8 +69,14 @@ PATCHES=(
 
 	# Bug #322473
 	"${FILESDIR}/${PN}-2.70-info.patch"
+
+	"${FILESDIR}/${PN}-tests.patch"
 )
 
+pkg_setup() {
+	python_setup
+}
+
 src_prepare() {
 	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
 		-i configure.ac \
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 4db645f60231..1b657a8d9b71 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,2 +1,3 @@
 DIST intel-gmmlib-22.10.0.tar.gz 886857 BLAKE2B bfb0eb474c5e2b809c85424afdfa8901cb6758a67b1f2e7c545e2d279d8754c0cfbcf1f47e7c78c1fa09578c7199ac46c1e3dba3435fff2b296272e77c3fe6e3 SHA512 63e676291f137880e2b4bd2091c3055a6ec2b0bb62ebd47a96c0a462e8434d1321563c4e2f0d2e40d79383a23ef0bb8ceb0f0f89a8ae94feb409440e43149e6e
 DIST intel-gmmlib-22.10.1.tar.gz 886958 BLAKE2B 340edde2fddd2c265ce0eb5c68eafd0f9d06b0d67d6acf7fb557006d9c394d1c46766699f2ce69e268c31d55dd53610240d59dfaa806f99e09021cd7297fa30b SHA512 d5fc772b6ef91973f398edf5eb01c98eb318f9847e1ef1ba34aeee029abe69ed0884a1be90df81f034ac2faed4515364caecaa5dd6a4cb32414b89b27bfca8aa
+DIST intel-gmmlib-22.10.2.tar.gz 886983 BLAKE2B f8cec023e5351dd8df56a6f0285a98e8259989ded737fdb251df9b8798e8225c40fcd54eb56acdf1925efd72dffb392fe4a9d7a6772f49a5efe203ceeedc97c3 SHA512 577bb4b8ebe8d6e6dcf17b51bade741c0d523b462dfc188384e06d97f74419a27d3480c21f11f605801cb8b14c2d0d20c9d88e71e7da9af48a95590022081da5
diff --git a/media-libs/gmmlib/gmmlib-22.10.2.ebuild b/media-libs/gmmlib/gmmlib-22.10.2.ebuild
new file mode 100644
index 000000000000..434418a30c80
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.10.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-22.7.3_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 72f7c71b09cd..d279a1087e94 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -5,3 +5,4 @@ DIST intel-media-26.2.3.tar.gz 29747122 BLAKE2B 0179b320da8653539245dfbd45e5a8e2
 DIST intel-media-26.2.4.tar.gz 29791842 BLAKE2B 966db45d4651bca1ea15daf2b7aac32d6d0a763841bf86322fb2687b7fd1625579babbb41167bf20f9615d92ec0392666e5023d517436981f14199752d3d012e SHA512 6e01092c06a100279b40ff46afa0c592483edc30e426fe802a79c2fa53b5ba16f952bdb445dfbfbfb7f50ef952727536f08c7eb0b3d06db25521fb9149887494
 DIST intel-media-26.3.1.tar.gz 29801954 BLAKE2B 1f3cb35df448bc55046c0be13b6f37a0906848b56a8ae926bfe78e6ef600488e2a72363a7b7c4057a737e6943657931b18d444800a1b10de83207b72ecd4128c SHA512 8d5f110831c8a5b8812ce170be5af68bec11365df5320738494144e070fa307610d2b0b6225786d9f61f2598dcc08f67cad707f139c7086d80b7dff91b11d375
 DIST intel-media-26.3.2.tar.gz 29809235 BLAKE2B cdb6dddf7d0c08ffaaf7b1fb2023371ec605b196a83eecaf4d2493a3aac6b772a3ee952b0378310c4bdb191c0d4ae3c758494618f10331e2e676a94ed1d48262 SHA512 c1f6c7e53782d2e4759f1d3ae3e1cf97d3e3f4b357a93477b6669f1cb82b0b3909f33c9612411e3f9b4cf735125a9d03e84ae9dc2033c8e18aaa32651b51e74b
+DIST intel-media-26.3.3.tar.gz 29827320 BLAKE2B c525b97ad9aed67b6fd0ae58370d3a44edfaae0c28d565cf67226530cc156a347078d4b74736fc00a48665cbe1a5e515f90c9c6544786b5eb293041ac307c93c SHA512 ff09509e74012cdfb66cf0b8646055591ad2d49a1d7fa6fcecb8c5c0d8e3c44f7504c865183f9f82abfcf62b0a5b0a2bf6c16f4904528559adad3763c30be367
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-26.3.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-26.3.3.ebuild
new file mode 100644
index 000000000000..4ac35d71db1f
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-26.3.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.10.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild
deleted file mode 100644
index b48317557804..000000000000
--- a/media-libs/mesa-amber/mesa-amber-21.3.9-r2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit meson-multilib python-any-r1 linux-info
-
-MY_P="${P/-amber}"
-MY_P="${MY_P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://docs.mesa3d.org/amber.html"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="amber"
-
-RADEON_CARDS="r100 r200 radeon"
-VIDEO_CARDS="${RADEON_CARDS} i915 i965 intel nouveau"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X
-	+zstd"
-RESTRICT="!test? ( test )"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	!media-libs/mesa:amber
-	>=media-libs/mesa-25[${MULTILIB_USEDEP}]
-
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.8:=[${MULTILIB_USEDEP}]
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_nouveau?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-debug/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libGLX_amber.so.0.0.0
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-i915c.patch
-	"${FILESDIR}"/${P}-gcc-15.patch
-)
-
-python_check_deps() {
-	python_has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use video_cards_i965; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #843983
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# Intel code
-	dri_driver_enable video_cards_i915 i915
-	dri_driver_enable video_cards_i965 i965
-	if ! use video_cards_i915 && \
-		! use video_cards_i965; then
-		dri_driver_enable video_cards_intel i915 i965
-	fi
-
-	# Nouveau code
-	dri_driver_enable video_cards_nouveau nouveau
-
-	# ATI code
-	dri_driver_enable video_cards_r100 r100
-	dri_driver_enable video_cards_r200 r200
-	if ! use video_cards_r100 && \
-		! use video_cards_r200; then
-		dri_driver_enable video_cards_radeon r100 r200
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		-Damber=true
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		-Dglvnd=true
-		-Dosmesa=false
-		-Dllvm=disabled
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	# These are provided by media-libs/mesa:0
-	local files=(
-		"${ED}"/usr/lib*/libgbm.so*
-		"${ED}"/usr/include
-		"${ED}"/usr/lib*/pkgconfig
-		"${ED}"/usr/share/drirc.d/00-mesa-defaults.conf
-	)
-	rm -r "${files[@]}" || die
-
-	# Move i915_dri.so -> i915c_dri.so to not conflict with media-libs/mesa:0.
-	for dridir in "${ED}"/usr/lib*/dri; do
-		if [[ -e ${dridir}/i915_dri.so ]]; then
-			mv ${dridir}/i915{,c}_dri.so || die
-		fi
-	done
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild
deleted file mode 100644
index 0104f34ff5a4..000000000000
--- a/media-libs/mesa-amber/mesa-amber-21.3.9-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit meson-multilib python-any-r1 linux-info
-
-MY_P="${P/-amber}"
-MY_P="${MY_P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://docs.mesa3d.org/amber.html"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="amber"
-
-RADEON_CARDS="r100 r200 radeon"
-VIDEO_CARDS="${RADEON_CARDS} i915 i965 intel nouveau"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X
-	+zstd"
-RESTRICT="!test? ( test )"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	!media-libs/mesa:amber
-	>=media-libs/mesa-25[${MULTILIB_USEDEP}]
-
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.8:=[${MULTILIB_USEDEP}]
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_nouveau?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-debug/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libGLX_amber.so.0.0.0
-	usr/lib/libglapi_amber.so.0.0.0
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-i915c.patch
-	"${FILESDIR}"/${P}-gcc-15.patch
-	"${FILESDIR}"/${P}-libnames.patch
-)
-
-python_check_deps() {
-	python_has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use video_cards_i965; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #843983
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# Intel code
-	dri_driver_enable video_cards_i915 i915
-	dri_driver_enable video_cards_i965 i965
-	if ! use video_cards_i915 && \
-		! use video_cards_i965; then
-		dri_driver_enable video_cards_intel i915 i965
-	fi
-
-	# Nouveau code
-	dri_driver_enable video_cards_nouveau nouveau
-
-	# ATI code
-	dri_driver_enable video_cards_r100 r100
-	dri_driver_enable video_cards_r200 r200
-	if ! use video_cards_r100 && \
-		! use video_cards_r200; then
-		dri_driver_enable video_cards_radeon r100 r200
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		-Damber=true
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		-Dglvnd=true
-		-Dosmesa=false
-		-Dllvm=disabled
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	# These are provided by media-libs/mesa:0
-	local files=(
-		"${ED}"/usr/include
-		"${ED}"/usr/lib*/pkgconfig
-		"${ED}"/usr/share/drirc.d/00-mesa-defaults.conf
-	)
-	rm -r "${files[@]}" || die
-
-	# Move i915_dri.so -> i915c_dri.so to not conflict with media-libs/mesa:0.
-	for dridir in "${ED}"/usr/lib*/dri; do
-		if [[ -e ${dridir}/i915_dri.so ]]; then
-			mv ${dridir}/i915{,c}_dri.so || die
-		fi
-	done
-
-	# Move the glvnd file after the one provided by mesa, to have lower priority
-	mv "${ED}"/usr/share/glvnd/egl_vendor.d/50_amber.json \
-		"${ED}"/usr/share/glvnd/egl_vendor.d/55_amber.json || die
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ada8a5ca4d59..f679a365ea1c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,4 @@
-DIST mesa-26.0.8.tar.xz 44001316 BLAKE2B 525d35e0c224631bb8a74b31485625de3d0e9575873ce5298d9ae84e01e445de22e4ee30dacacca6552b2c6584aaeaaf6242c59a696435ddc2e037e046bb6c25 SHA512 3a43648a86c1bc48161a1669733b6c6a9294bf27ffb529f2ce078c2daa3b90b8c53b9cc06312197fb3a0830303d0b326d7535fb15849e6c26fad58009f3a6112
-DIST mesa-26.1.4.tar.xz 77677128 BLAKE2B e7fe5fbb662aea5ef0da73d7450ba693943339ef0731c5e96205e646eb857e674d552398cb44287d573664e471661603600452f427aff1da441d2fed5bd174ec SHA512 39d15574e876005fd1a483d1cb3c801b08297ec73820a89cbf368d0f2a922cc770d0e623e99acc66b71791332cdadc6cc3095f059f713b09128921ff2d0197a8
-DIST mesa-26.1.5.tar.xz 77723976 BLAKE2B 80f874e7f5ab1b6874926e8463a93c0e2c016092f1e5c3375e48178c3ae995ee17988ee07eea28cada5729edc12a5a3cfd7e0338c14f15a2ed029fb1057a09cc SHA512 8b1714e0fe63d3077c0d761245680724537a94db65e17dedb7124c7c861f070a13493a060695e81b2ca9b6889007b52c7b5788dace8fe5d8e2e1ed67efdbbf07
-DIST mesa-26.1.6.tar.xz 77770828 BLAKE2B 1bb16b0982b81518d8a0dcfc9b78c487167b7832e21861d829c055939acca1f5aaf3e51680a1a39680d5ed89cfec233f1beea3261acd171585837f06b1e89937 SHA512 6746b73f5b87e8ff3723eee586b4b5f033dbe6d13cd0309d743b7fa484c350268859ec8ff21aadcbca7a04070cdaa7828146dd28dde4b1935bb879891d687f0b
-DIST mesa-26.1.7.tar.xz 77799016 BLAKE2B 1418efe5171982eca1560891f18a8be8249b00c9305e461fe68f6dc7f02ec8eb093f67f02c602a96c77bbc7434cad8129ecf8def686b2528cda5892340c8d2db SHA512 9acc75c3d6386f90cf761dfa42e72b1c36d399a6905127d18aa3eb84d665502da7c3cebead82fdbca91ad510673ba7e296b5e148602d6db7e79172d6155f3ec5
 DIST mesa-26.1.8.tar.xz 77827888 BLAKE2B 173997a90bbb27d8f6b1e4c349430d063a9264efddf03c9449f93b9e0438fa38948dfbfecddb798cd57818070953b8c525cb3796807101632b1b642c4d6b0361 SHA512 eb3d46ae9aaba70fdd908486cef24041fec9264ddf586eaebbba65ce55e716d306ef9e91be83e742dfaec4dfc94105a5cd3a36b29bf56614febcbcf6c1f8b516
-DIST mesa-26.2.1.tar.xz 68500756 BLAKE2B f5ec3451d18da9336d775259dd0d3f0c73c81d0857ba7da32dd296aba258ad5b8424fb8781582a838375e99710451d2aaeda94def604ad006e5a5a378b44d30a SHA512 d4bc755442c6573a1b75cafad50ec66594fa0ca7599c525f368bdecbd551a970e890ed6b044d9251f84278d27dcaa30649fbf4f4bf0adbaa76e1cc1ba6a1181f
 DIST mesa-26.2.2.tar.xz 68533264 BLAKE2B a9924a7cbac5dbdb4d93ba8499c49a6be51edd8ec5b258f2986a5690b04f6898012389dcc7e07097bad0defed52e9255d3a2c82bb6101a531b17fde82ef69afc SHA512 55b1234c8653dad9b85ba3de7b777a0d957909baf4628f0c00e21d4ba89c004cb687a1dcf8da46ed0a092231dd4f859027509f83ad8c558750845ba470902615
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
diff --git a/media-libs/mesa/files/26.2.2-missing-algorithm-include-PR44233.patch b/media-libs/mesa/files/26.2.2-missing-algorithm-include-PR44233.patch
new file mode 100644
index 000000000000..2e10bf2eccde
--- /dev/null
+++ b/media-libs/mesa/files/26.2.2-missing-algorithm-include-PR44233.patch
@@ -0,0 +1,32 @@
+From 449f0a85795a07d1e1ae07e4d9a434628a0b5ac4 Mon Sep 17 00:00:00 2001
+From: Kostadin Shishmanov <kostadinshishmanov@protonmail.com>
+Date: Fri, 4 Sep 2026 13:23:17 +0300
+Subject: [PATCH] aco: add missing <algorithm> include
+
+aco_util.h uses std::move_backward but doesn't include <algorithm>
+which causes a build failure with libc++ 23 since it's dropping such
+transitive includes.
+
+Cc: mesa-stable
+Signed-off-by: Kostadin Shishmanov <kostadinshishmanov@protonmail.com>
+Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/44233>
+---
+ src/amd/compiler/aco_util.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h
+index 82d754f155aa..9f20e80a5545 100644
+--- a/src/amd/compiler/aco_util.h
++++ b/src/amd/compiler/aco_util.h
+@@ -12,6 +12,7 @@
+ #include "util/macros.h"
+ #include "util/u_math.h"
+ 
++#include <algorithm>
+ #include <array>
+ #include <cassert>
+ #include <cstddef>
+-- 
+GitLab
+
diff --git a/media-libs/mesa/mesa-26.0.8.ebuild b/media-libs/mesa/mesa-26.0.8.ebuild
deleted file mode 100644
index f1377e5ada6c..000000000000
--- a/media-libs/mesa/mesa-26.0.8.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-CRATES="
-	paste@1.0.14
-	proc-macro2@1.0.86
-	quote@1.0.35
-	rustc-hash@2.1.1
-	syn@2.0.87
-	unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-VIDEO_CARDS="
-	asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-	panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug +llvm
-	lm-sensors opencl +opengl +proprietary-codecs
-	sysprof test unwind vaapi valgrind vulkan
-	wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_i915? ( llvm )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.9:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-runtimes/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-runtimes/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	video_cards_i915? (
-		${LIBDRM_DEPSTRING}[video_cards_intel]
-	)
-	video_cards_radeonsi? (
-		${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	vulkan? (
-		media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=
-	)
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.618.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-
-CLC_DEPSTRING="
-	~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-	llvm-runtimes/libclc[spirv(-)]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=dev-util/bindgen-0.71.1
-		${RUST_DEPEND}
-	)
-	>=dev-build/meson-1.7.0
-	app-alternatives/yacc
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_asahi? ( ${CLC_DEPSTRING} )
-	video_cards_intel? ( ${CLC_DEPSTRING} )
-	video_cards_panfrost? ( ${CLC_DEPSTRING} )
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.71.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-			${CLC_DEPSTRING}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_asahi &&
-		   ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_imagination &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain asahi, d3d12, freedreno, imagination, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_asahi asahi
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_i915 i915
-	gallium_enable video_cards_intel crocus iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_asahi asahi
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_imagination imagination
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_nvk nouveau
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		emesonargs+=(-Dvulkan-layers=anti-lag,device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_intel ||
-	   use video_cards_nvk ||
-	   use video_cards_panfrost; then
-	   emesonargs+=(-Dmesa-clc=system)
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_panfrost; then
-	    emesonargs+=(-Dprecomp-compiler=system)
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_feature unwind libunwind)
-		$(meson_feature vulkan display-info)
-		$(meson_feature zstd)
-		$(meson_use llvm amd-use-llvm)
-		$(meson_use sysprof)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-26.1.4.ebuild b/media-libs/mesa/mesa-26.1.4.ebuild
deleted file mode 100644
index 74b74e8a6c86..000000000000
--- a/media-libs/mesa/mesa-26.1.4.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-CRATES="
-	paste@1.0.14
-	proc-macro2@1.0.86
-	quote@1.0.35
-	rustc-hash@2.1.1
-	syn@2.0.87
-	unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-VIDEO_CARDS="
-	asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-	panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug +llvm
-	lm-sensors opencl +opengl +proprietary-codecs
-	sysprof test unwind vaapi valgrind vulkan
-	wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_i915? ( llvm )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.9:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-runtimes/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-runtimes/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	video_cards_i915? (
-		${LIBDRM_DEPSTRING}[video_cards_intel]
-	)
-	video_cards_radeonsi? (
-		${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	vulkan? (
-		media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=
-	)
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.619.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-
-CLC_DEPSTRING="
-	~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-	llvm-runtimes/libclc[spirv(-)]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=dev-util/bindgen-0.71.1
-		${RUST_DEPEND}
-	)
-	>=dev-build/meson-1.7.0
-	app-alternatives/yacc
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_asahi? ( ${CLC_DEPSTRING} )
-	video_cards_intel? ( ${CLC_DEPSTRING} )
-	video_cards_panfrost? ( ${CLC_DEPSTRING} )
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.71.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-			${CLC_DEPSTRING}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_asahi &&
-		   ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_imagination &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain asahi, d3d12, freedreno, imagination, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_asahi asahi
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_i915 i915
-	gallium_enable video_cards_intel crocus iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_asahi asahi
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_imagination imagination
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_nvk nouveau
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		emesonargs+=(-Dvulkan-layers=anti-lag,device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_intel ||
-	   use video_cards_nvk ||
-	   use video_cards_panfrost; then
-	   emesonargs+=(-Dmesa-clc=system)
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_panfrost; then
-	    emesonargs+=(-Dprecomp-compiler=system)
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_feature unwind libunwind)
-		$(meson_feature vulkan display-info)
-		$(meson_feature zstd)
-		$(meson_use llvm amd-use-llvm)
-		$(meson_use sysprof)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-		-Dallow-broken-lto=true
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-26.1.5.ebuild b/media-libs/mesa/mesa-26.1.5.ebuild
deleted file mode 100644
index 74b74e8a6c86..000000000000
--- a/media-libs/mesa/mesa-26.1.5.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-CRATES="
-	paste@1.0.14
-	proc-macro2@1.0.86
-	quote@1.0.35
-	rustc-hash@2.1.1
-	syn@2.0.87
-	unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-VIDEO_CARDS="
-	asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-	panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug +llvm
-	lm-sensors opencl +opengl +proprietary-codecs
-	sysprof test unwind vaapi valgrind vulkan
-	wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_i915? ( llvm )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.9:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-runtimes/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-runtimes/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	video_cards_i915? (
-		${LIBDRM_DEPSTRING}[video_cards_intel]
-	)
-	video_cards_radeonsi? (
-		${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	vulkan? (
-		media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=
-	)
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.619.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-
-CLC_DEPSTRING="
-	~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-	llvm-runtimes/libclc[spirv(-)]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=dev-util/bindgen-0.71.1
-		${RUST_DEPEND}
-	)
-	>=dev-build/meson-1.7.0
-	app-alternatives/yacc
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_asahi? ( ${CLC_DEPSTRING} )
-	video_cards_intel? ( ${CLC_DEPSTRING} )
-	video_cards_panfrost? ( ${CLC_DEPSTRING} )
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.71.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-			${CLC_DEPSTRING}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_asahi &&
-		   ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_imagination &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain asahi, d3d12, freedreno, imagination, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_asahi asahi
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_i915 i915
-	gallium_enable video_cards_intel crocus iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_asahi asahi
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_imagination imagination
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_nvk nouveau
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		emesonargs+=(-Dvulkan-layers=anti-lag,device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_intel ||
-	   use video_cards_nvk ||
-	   use video_cards_panfrost; then
-	   emesonargs+=(-Dmesa-clc=system)
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_panfrost; then
-	    emesonargs+=(-Dprecomp-compiler=system)
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_feature unwind libunwind)
-		$(meson_feature vulkan display-info)
-		$(meson_feature zstd)
-		$(meson_use llvm amd-use-llvm)
-		$(meson_use sysprof)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-		-Dallow-broken-lto=true
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-26.1.6.ebuild b/media-libs/mesa/mesa-26.1.6.ebuild
deleted file mode 100644
index 64a5b1708f2d..000000000000
--- a/media-libs/mesa/mesa-26.1.6.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-CRATES="
-	paste@1.0.14
-	proc-macro2@1.0.86
-	quote@1.0.35
-	rustc-hash@2.1.1
-	syn@2.0.87
-	unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-VIDEO_CARDS="
-	asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-	panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug +llvm
-	lm-sensors opencl +opengl +proprietary-codecs
-	sysprof test unwind vaapi valgrind vulkan
-	wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_i915? ( llvm )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.9:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-runtimes/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-runtimes/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	video_cards_i915? (
-		${LIBDRM_DEPSTRING}[video_cards_intel]
-	)
-	video_cards_radeonsi? (
-		${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	vulkan? (
-		media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=
-	)
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.619.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-
-CLC_DEPSTRING="
-	~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-	llvm-runtimes/libclc[spirv(-)]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=dev-util/bindgen-0.71.1
-		${RUST_DEPEND}
-	)
-	>=dev-build/meson-1.7.0
-	app-alternatives/yacc
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_asahi? ( ${CLC_DEPSTRING} )
-	video_cards_intel? ( ${CLC_DEPSTRING} )
-	video_cards_panfrost? ( ${CLC_DEPSTRING} )
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.71.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-			${CLC_DEPSTRING}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_asahi &&
-		   ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_imagination &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain asahi, d3d12, freedreno, imagination, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_asahi asahi
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_i915 i915
-	gallium_enable video_cards_intel crocus iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_asahi asahi
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_imagination imagination
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_nvk nouveau
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		emesonargs+=(-Dvulkan-layers=anti-lag,device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_intel ||
-	   use video_cards_nvk ||
-	   use video_cards_panfrost; then
-	   emesonargs+=(-Dmesa-clc=system)
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_panfrost; then
-	    emesonargs+=(-Dprecomp-compiler=system)
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_feature unwind libunwind)
-		$(meson_feature vulkan display-info)
-		$(meson_feature zstd)
-		$(meson_use llvm amd-use-llvm)
-		$(meson_use sysprof)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-		-Dallow-broken-lto=true
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-26.1.7.ebuild b/media-libs/mesa/mesa-26.1.7.ebuild
deleted file mode 100644
index 74b74e8a6c86..000000000000
--- a/media-libs/mesa/mesa-26.1.7.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic llvm-r2 meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-CRATES="
-	paste@1.0.14
-	proc-macro2@1.0.86
-	quote@1.0.35
-	rustc-hash@2.1.1
-	syn@2.0.87
-	unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.82.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-VIDEO_CARDS="
-	asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-	panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug +llvm
-	lm-sensors opencl +opengl +proprietary-codecs
-	sysprof test unwind vaapi valgrind vulkan
-	wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_i915? ( llvm )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
-RDEPEND="
-	${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.9:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-runtimes/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-runtimes/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	video_cards_i915? (
-		${LIBDRM_DEPSTRING}[video_cards_intel]
-	)
-	video_cards_radeonsi? (
-		${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	vulkan? (
-		media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=
-	)
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.619.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-
-CLC_DEPSTRING="
-	~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-	llvm-runtimes/libclc[spirv(-)]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=dev-util/bindgen-0.71.1
-		${RUST_DEPEND}
-	)
-	>=dev-build/meson-1.7.0
-	app-alternatives/yacc
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_asahi? ( ${CLC_DEPSTRING} )
-	video_cards_intel? ( ${CLC_DEPSTRING} )
-	video_cards_panfrost? ( ${CLC_DEPSTRING} )
-	vulkan? (
-		dev-util/glslang
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.71.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-			${CLC_DEPSTRING}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	# We need this because we cannot tell meson to use DISTDIR yet
-	pushd "${DISTDIR}" >/dev/null || die
-	mkdir -p "${S}"/subprojects/packagecache || die
-	local i
-	for i in *.crate; do
-		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
-	done
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_asahi &&
-		   ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_imagination &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain asahi, d3d12, freedreno, imagination, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_asahi asahi
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_i915 i915
-	gallium_enable video_cards_intel crocus iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_asahi asahi
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_imagination imagination
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_nvk nouveau
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		emesonargs+=(-Dvulkan-layers=anti-lag,device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_intel ||
-	   use video_cards_nvk ||
-	   use video_cards_panfrost; then
-	   emesonargs+=(-Dmesa-clc=system)
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_panfrost; then
-	    emesonargs+=(-Dprecomp-compiler=system)
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_feature unwind libunwind)
-		$(meson_feature vulkan display-info)
-		$(meson_feature zstd)
-		$(meson_use llvm amd-use-llvm)
-		$(meson_use sysprof)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-		-Dallow-broken-lto=true
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-26.2.1.ebuild b/media-libs/mesa/mesa-26.2.1.ebuild
deleted file mode 100644
index 51b130171aea..000000000000
--- a/media-libs/mesa/mesa-26.2.1.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..22} )
-LLVM_OPTIONAL=1
-CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic linux-info llvm-r2 meson-multilib python-any-r1 toolchain-funcs
-
-MY_P="${P/_/-}"
-
-CRATES="
-	paste@1.0.14
-	proc-macro2@1.0.86
-	quote@1.0.35
-	rustc-hash@2.1.1
-	syn@2.0.87
-	unicode-ident@1.0.12
-"
-
-RUST_MIN_VER="1.85.0"
-RUST_MULTILIB=1
-RUST_OPTIONAL=1
-
-inherit cargo
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://archive.mesa3d.org/${MY_P}.tar.xz
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
-fi
-
-# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
-# but there are "stale" distfiles on the mirrors with the wrong names.
-# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
-SRC_URI+="
-	opencl? ( ${CARGO_CRATE_URIS} )
-	!opencl? ( video_cards_nvk? ( ${CARGO_CRATE_URIS} ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-
-VIDEO_CARDS="
-	asahi d3d12 freedreno i915 imagination intel lavapipe lima nouveau nvk
-	panfrost r300 r600 radeon radeonsi v3d vc4 virgl vivante vmware zink"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug +llvm
-	lm-sensors opencl +opengl +proprietary-codecs
-	sysprof test unwind vaapi valgrind vulkan
-	wayland +X +zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	llvm? ( ${LLVM_REQUIRED_USE} )
-	video_cards_i915? ( llvm )
-	video_cards_lavapipe? ( llvm vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_zink? ( vulkan opengl )
-	video_cards_nvk? ( vulkan video_cards_nouveau )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.133"
-RDEPEND="
-	${LIBDRM_DEPSTRING}[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-1.3.231.0[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=virtual/zlib-1.2.9:=[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		$(llvm_gen_dep "
-			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-			opencl? (
-				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
-				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
-				=llvm-runtimes/libclc-\${LLVM_SLOT}*[spirv(-)]
-			)
-		")
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-		>=virtual/opencl-3
-		llvm-runtimes/libclc[spirv(-)]
-		virtual/libelf:0=
-	)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	video_cards_i915? (
-		${LIBDRM_DEPSTRING}[video_cards_intel]
-	)
-	video_cards_nvk? (
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_radeonsi? (
-		${LIBDRM_DEPSTRING}[video_cards_amdgpu]
-		virtual/libelf:0=[${MULTILIB_USEDEP}]
-	)
-	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	vulkan? (
-		media-libs/libdisplay-info:=[${MULTILIB_USEDEP}]
-		virtual/libudev:=
-	)
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-49.0[${MULTILIB_USEDEP}] )
-	video_cards_d3d12? ( >=dev-util/directx-headers-1.619.1[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-debug/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.41 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-
-CLC_DEPSTRING="
-	~dev-util/mesa_clc-${PV}[video_cards_asahi?,video_cards_panfrost?]
-	llvm-runtimes/libclc[spirv(-)]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=dev-util/bindgen-0.71.1
-		${RUST_DEPEND}
-	)
-	>=dev-build/meson-1.7.0
-	app-alternatives/yacc
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	video_cards_asahi? ( ${CLC_DEPSTRING} )
-	video_cards_intel? ( ${CLC_DEPSTRING} )
-	video_cards_panfrost? ( ${CLC_DEPSTRING} )
-	vulkan? (
-		dev-util/glslang
-		video_cards_imagination? ( ${CLC_DEPSTRING} )
-		video_cards_nvk? (
-			>=dev-util/bindgen-0.71.1
-			>=dev-util/cbindgen-0.26.0
-			${RUST_DEPEND}
-			${CLC_DEPSTRING}
-		)
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libgallium-*.so
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.xz
-	fi
-
-	if use opencl || use video_cards_nvk; then
-		# We need this because we cannot tell meson to use DISTDIR yet
-		mkdir -p "${S}"/subprojects/packagecache || die
-		local i
-		for i in ${CRATES}; do
-			i=${i/@/-}
-			ln -s "${DISTDIR}/${i}.crate" \
-				"${S}/subprojects/packagecache/${i}.tar.gz" || die
-		done
-	fi
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use test; then
-		tc-check-openmp
-	fi
-
-	if use vulkan; then
-		if ! use video_cards_asahi &&
-		   ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_imagination &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_lavapipe &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_nvk &&
-		   ! use video_cards_panfrost &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain asahi, d3d12, freedreno, imagination, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
-		fi
-	fi
-
-	# VA
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_virgl; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use test; then
-		tc-check-openmp
-	fi
-
-	# warning message for bug 459306
-	if use llvm && has_version llvm-core/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	use llvm && llvm-r2_pkg_setup
-	python-any-r1_pkg_setup
-
-	if use opencl || (use vulkan && use video_cards_nvk); then
-		rust_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die # bug #830728
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
-	filter-lto
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_d3d12 ||
-	   use video_cards_nouveau ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_virgl; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	gallium_enable !llvm softpipe
-	gallium_enable llvm llvmpipe
-	gallium_enable video_cards_asahi asahi
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_i915 i915
-	gallium_enable video_cards_intel crocus iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable video_cards_zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 &&
-	   ! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
-		emesonargs+=(
-			$(meson_native_true gallium-rusticl)
-			-Drust_std=2021
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_asahi asahi
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_imagination imagination
-		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_lavapipe swrast
-		vulkan_enable video_cards_nvk nouveau
-		vulkan_enable video_cards_panfrost panfrost
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-		vulkan_enable video_cards_vc4 broadcom
-		vulkan_enable video_cards_virgl virtio
-		emesonargs+=(-Dvulkan-layers=anti-lag,device-select,overlay)
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	if use opengl && use X; then
-		emesonargs+=(-Dglx=dri)
-	else
-		emesonargs+=(-Dglx=disabled)
-	fi
-
-	if [[ "${ABI}" == amd64 ]]; then
-		emesonargs+=($(meson_feature video_cards_intel intel-rt))
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_intel ||
-	   use video_cards_nvk ||
-	   use video_cards_panfrost ||
-	   { use vulkan && use video_cards_imagination; }; then
-	   emesonargs+=(-Dmesa-clc=system)
-	fi
-
-	if use video_cards_asahi ||
-	   use video_cards_panfrost; then
-	    emesonargs+=(-Dprecomp-compiler=system)
-	fi
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dexpat=enabled
-		$(meson_use opengl)
-		$(meson_feature opengl gbm)
-		$(meson_feature opengl gles1)
-		$(meson_feature opengl gles2)
-		$(meson_feature opengl glvnd)
-		$(meson_feature opengl egl)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_feature unwind libunwind)
-		$(meson_feature vulkan display-info)
-		$(meson_feature zstd)
-		$(meson_use llvm amd-use-llvm)
-		$(meson_use sysprof)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		-Db_ndebug=$(usex debug false true)
-		-Dallow-broken-lto=true
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-26.2.2.ebuild b/media-libs/mesa/mesa-26.2.2.ebuild
index 51b130171aea..98ebf95a2ddb 100644
--- a/media-libs/mesa/mesa-26.2.2.ebuild
+++ b/media-libs/mesa/mesa-26.2.2.ebuild
@@ -190,6 +190,10 @@ x86? (
 	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-missing-algorithm-include-PR44233.patch
+)
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 0f3caef4fded..1e9e289887bc 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,3 +1 @@
-DIST waffle-v1.8.1.tar.bz2 309259 BLAKE2B bfc4cd9043df854e34ab0ee0edd7d231fbc2253e41de8eb3bb702428a2b22569a407dc595a4c13a1a5e7cac2686dfe8b4ec26397e3dbed1a433de31fd3616b4f SHA512 c0e47047776de9cc20791974dec0944c769d766e5fe4f4e66a25a0d5900f3a756d95b4df434ff2e595079659d79d95398f6f411e4b8cc969cace7b2c3532b79f
-DIST waffle-v1.8.2.tar.bz2 309343 BLAKE2B b28a0f3a8f9b38422bf0407b16c49db5860f7db179daae2f35dcc18ab4d7bf2975a1687e14ad428435d99bec376780435443cfffbd741e0e3a41894aa6a106a6 SHA512 78f57bd87b83e02e389f98ecdddaf65cb3f68409c6b93ea3545f312ae683088474bc9294da04dbcafbcbcc5f6745f368882e4bc635f27c008014d9459f502a9f
 DIST waffle-v1.8.3.tar.bz2 309655 BLAKE2B 549eaf78c3cb84ba22432730cc66303f21a1293ad5f92f1b1ac6535c0235f7eee2bec9aeb39240e387761c75649808d8cedbd06f82698235c3e7ccf9ffb36d68 SHA512 a6b7d5e4e98e35582a655f8a3b687200b3c7ddb724dec6e14fa3e64b56c3f238986f09397b06bd0fc958facd7cee534c6758dec69670c600368d57ccf69f9431
diff --git a/media-libs/waffle/files/waffle-1.8.1-glibc-2.43.patch b/media-libs/waffle/files/waffle-1.8.1-glibc-2.43.patch
deleted file mode 100644
index 3cc89bb145e1..000000000000
--- a/media-libs/waffle/files/waffle-1.8.1-glibc-2.43.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/969473
-https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/158
-
-From 6b3c46483844faba4dfe7dd90dc2b0cd06e67158 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 10 Nov 2025 19:20:22 -0800
-Subject: [PATCH] c11/threads: fix build on c23
-
-C23/glibc is now including once_init in stdlib.h
-
-https://patchwork.sourceware.org/project/glibc/patch/78061085-f04a-0c45-107b-5a8a15521083@redhat.com/#213088
-
-Conditionally check if glibc already provided c23 definition via stdlib.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- third_party/threads/threads.h       | 3 ++-
- third_party/threads/threads_posix.c | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/threads/threads.h b/third_party/threads/threads.h
-index b4db50c..cdc7bea 100644
---- a/third_party/threads/threads.h
-+++ b/third_party/threads/threads.h
-@@ -102,8 +102,9 @@ typedef pthread_cond_t  cnd_t;
- typedef pthread_t       thrd_t;
- typedef pthread_key_t   tss_t;
- typedef pthread_mutex_t mtx_t;
-+#ifndef __once_flag_defined
- typedef pthread_once_t  once_flag;
--
-+#endif
- #else
- #error Not supported on this platform.
- #endif
-diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c
-index bc50825..d93013b 100644
---- a/third_party/threads/threads_posix.c
-+++ b/third_party/threads/threads_posix.c
-@@ -75,11 +75,12 @@ static void *impl_thrd_routine(void *p)
- 
- /*--------------- 7.25.2 Initialization functions ---------------*/
- // 7.25.2.1
-+#ifndef __once_flag_defined
- void call_once(once_flag *flag, void (*func)(void))
- {
-     pthread_once(flag, func);
- }
--
-+#endif
- 
- /*------------- 7.25.3 Condition variable functions -------------*/
- // 7.25.3.1
--- 
-GitLab
diff --git a/media-libs/waffle/waffle-1.8.1.ebuild b/media-libs/waffle/waffle-1.8.1.ebuild
deleted file mode 100644
index 73136c59679d..000000000000
--- a/media-libs/waffle/waffle-1.8.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib multilib virtualx ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc test wayland X"
-RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under sandbox
-
-RDEPEND="
-	>=media-libs/mesa-23[${MULTILIB_USEDEP}]
-	>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	X? ( >=x11-base/xcb-proto-1.8-r3 )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	dev-util/wayland-scanner
-"
-#	test? (
-#		wayland? ( dev-libs/weston[headless] )
-#	)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/wflinfo$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-glibc-2.43.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		-Dgbm=enabled
-		-Dsurfaceless_egl=enabled
-
-		$(meson_use test build-tests)
-		$(meson_native_true build-manpages)
-		-Dbuild-htmldocs=false
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use wayland; then
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-6
-	fi
-
-	export MESA_SHADER_CACHE_DISABLE=true
-	virtx meson_src_test
-
-	if use wayland; then
-		kill ${compositor}
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	rm -r \
-		"${ED}"/usr/share/doc/${P} \
-		"${ED}"/usr/share/doc/waffle1/release-notes || die
-	mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
-	if ! use doc; then
-		rm -rf \
-			"${ED}"/usr/share/man/man{3,7} || die
-	fi
-}
diff --git a/media-libs/waffle/waffle-1.8.2.ebuild b/media-libs/waffle/waffle-1.8.2.ebuild
deleted file mode 100644
index 644b35597d53..000000000000
--- a/media-libs/waffle/waffle-1.8.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib multilib virtualx ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc test wayland X"
-RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under sandbox
-
-RDEPEND="
-	>=media-libs/mesa-23[${MULTILIB_USEDEP}]
-	>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	wayland? ( dev-libs/wayland-protocols )
-	X? ( >=x11-base/xcb-proto-1.8-r3 )
-	test? ( dev-util/cmocka )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	dev-util/wayland-scanner
-"
-#	test? (
-#		wayland? ( dev-libs/weston[headless] )
-#	)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		-Dgbm=enabled
-		-Dsurfaceless_egl=enabled
-
-		$(meson_use test build-tests)
-		$(meson_native_true build-manpages)
-		-Dbuild-htmldocs=false
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	addwrite /dev/dri/
-
-	if use wayland; then
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-6
-	fi
-
-	export MESA_SHADER_CACHE_DISABLE=true
-	virtx meson_src_test
-
-	if use wayland; then
-		kill ${compositor}
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	rm -r \
-		"${ED}"/usr/share/doc/${P} \
-		"${ED}"/usr/share/doc/waffle1/release-notes || die
-	mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
-	if ! use doc; then
-		rm -rf \
-			"${ED}"/usr/share/man/man{3,7} || die
-	fi
-}
diff --git a/media-sound/quodlibet/quodlibet-4.7.1-r2.ebuild b/media-sound/quodlibet/quodlibet-4.7.1-r2.ebuild
index 68c535db7c94..46f21a5be120 100644
--- a/media-sound/quodlibet/quodlibet-4.7.1-r2.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.7.1-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="+dbus gstreamer +udev"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 867526b87662..51118428ed72 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -454,6 +454,7 @@ multilib_src_configure() {
 		# disabled primarily due to being unpackaged
 		--disable-decklink
 		--disable-libaribcaption
+		--disable-libastcenc
 		--disable-libdavs2
 		--disable-libklvanc
 		--disable-liblcevc-dec
diff --git a/net-analyzer/wireshark/wireshark-4.6.8.ebuild b/net-analyzer/wireshark/wireshark-4.6.8.ebuild
index 5cc4b90baf0d..4212e9f16a52 100644
--- a/net-analyzer/wireshark/wireshark-4.6.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.6.8.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index ca8090050c91..6cb9d5bfd142 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -2,4 +2,5 @@ DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd5
 DIST ppp-2.5.1.tar.gz 991639 BLAKE2B e3ece873ea25bde5ddffd0da168ffe6ba890693f20fb9f1d6a48f365331abdb4cf517fd0b3004d26a0c778ad4d750e39e38486544e2771b23223469db13c239c SHA512 57b3bbf918c302dbc621f56b706efa1b35b2fc45b71c3a309c1cfee22c28fcf98d7f8965fbeba9260c124f2afb9e297885007256ee05469adca73fad032902b9
 DIST ppp-2.5.2.tar.gz 973132 BLAKE2B 5a79bfaf23c2f1cba7b2c4e8f27e6033aa7ee6e119b4d96dfd2870f91524052fe9ed16149e5f76cf93370159f491af828b4103eb04bd4f5dbbecca4a08af9d0d SHA512 2c49d411818632a750f52b187c0ee421e9fcc1530c717abacce61e76aa8b296ce09fb142bc202696c0e0ac5570dd12ee649267921b756b6572ae514ce961d1e6
 DIST ppp-2.5.3.tar.gz 995939 BLAKE2B fe915978f1332c18dc370b5d79d07c55afd006d576168c16034ac368afe138d3e0a41d7a9a05fdc2868b1e30bbd0510aadbf7e9a595c77cacaeb739c9289051c SHA512 4de2af44d56d8629db37a7aa71ea1973020bacd4fe6b8e56b69b4b825445437cf9d5e2caee13e0af09d26b89954a8e08560581f3c5611edb119ea63fc10d2255
+DIST ppp-2.5.4.tar.gz 1013028 BLAKE2B 4b70250f73811a343c87087cac7555f6d7b550c5bce6bf71af7fa585f12437c62d2525f669f6e3306e02adc9f180c0508554e4f04abec4227ff7d181e39f0618 SHA512 078075fc4f9fab07d44fab626d87def8f73c76a50d2bd52e7f84ad874a4bf6e9530d5f59fc77a20857f0049f58f84c3f6af0a17ccc60e0ffe6a34ddaf90159f4
 DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836
diff --git a/net-dialup/ppp/ppp-2.5.4.ebuild b/net-dialup/ppp/ppp-2.5.4.ebuild
new file mode 100644
index 000000000000..6334c5facbbd
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info pam tmpfiles
+
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://github.com/ppp-project/ppp.git"
+else
+	SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+IUSE="activefilter atm pam selinux systemd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-ppp )
+"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+pkg_setup() {
+	local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+	local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+	local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline"
+	ERROR_PPP_ASYNC+=" (optional, but highly recommended)"
+	local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline"
+	WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)"
+	if use activefilter ; then
+		CONFIG_CHECK+=" ~PPP_FILTER"
+		local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+	fi
+	CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+	local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+	local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+	local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+	CONFIG_CHECK+=" ~PPPOE ~PACKET"
+	local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
+	local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
+	if use atm ; then
+		CONFIG_CHECK+=" ~PPPOATM"
+		local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Set the right paths in radiusclient.conf
+	sed -e "s:/usr/local/etc:/etc:" \
+		-e "s:/usr/local/sbin:/usr/sbin:" \
+		-i pppd/plugins/radius/etc/radiusclient.conf || die
+	# Set config dir to /etc/ppp/radius
+	sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+		pppd/plugins/radius/{*.8,*.c,*.h} \
+		pppd/plugins/radius/etc/* || die
+
+	[[ "${PV}" = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/943931
+	append-cflags -std=gnu17
+
+	local args=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		$(use_enable systemd)
+		$(use_with atm)
+		$(use_with pam)
+		$(use_with activefilter pcap)
+		--enable-cbcp
+		--enable-multilink
+	)
+	econf "${args[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	if use pam; then
+		pamd_mimic_system ppp auth account session
+	fi
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+	dosym pon.1 /usr/share/man/man1/poff.1
+	dosym pon.1 /usr/share/man/man1/plog.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodoc -r scripts
+
+	newtmpfiles "${FILESDIR}/pppd.tmpfiles-r1" pppd.conf
+
+	insinto /etc/ppp/radius
+	doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+}
+
+pkg_postinst() {
+	tmpfiles_process pppd.conf
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 79536c973a28..f05d21e43546 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,3 +5,4 @@ DIST samba-4.23.9.tar.gz 43340009 BLAKE2B 106fd5170015a1175bdd8221ece532f6b18dd7
 DIST samba-4.24.4.tar.gz 43431734 BLAKE2B 7d8406ed473f88a009628b64e070611dbac2b70da3d49857f5add1a8066dac93c762d6947fe3f3ed12b316e4041f0af42fa897a842ab1110dd629146848d0f5f SHA512 3f6b8a99491d82fcb90115288e547b330afd452f7ed15f288085644a0ea9ccbd45645c5a75f2d5db6d2d888ff280e87ec252b48e0c064a0ca33cac39f24f123d
 DIST samba-4.24.5.tar.gz 43445051 BLAKE2B 4796e3ae5e70c1d11d9326566677f0909423c5aad140309bfd9b3f8a3dedefe49660d0a0d502a681726ed7a961779587c33c9da29ecf69664b00a2ca958e64af SHA512 dadaee50c61cc8076bd5f4e6e3a8be13b6aa6aeff33991277c7f5398ba9dea32e8d966c0206dec9cad240b935768b707f9c9dd6b60c3db433dcf8ddb30134088
 DIST samba-4.24.6.tar.gz 43449390 BLAKE2B cd28c61285624de1e45f6f55684adae3df42ca3579106412f4ed58889ebf0ee7e8bb1b7501878910eafebf1884d019f23b3da75b71850cdca8da751f70423e0a SHA512 fb4e4602c0a36ab26ce04457e0ae259eda6f00411468f91227d234385b545e230103c1053820b17193e8f5a1967dc3bf637777e946c72ecbe1f2e82901af737f
+DIST samba-4.24.7.tar.gz 43450847 BLAKE2B 79f5093db219798081eddadf1c81c0337d97563bbd3f9047f14538c557c61b6d58dd57d97bde957a7d84f61f1fbe547cd85a4f6f1e4bff6fe4b86d0772223501 SHA512 f895baf3c06d0d0371052ae48f44ebc9f953441a8d6fbb6eab223bf1b892dab7be429733d46fa2cbd1088b1cefee601cc99ca97f41b985c47b9846c300af8cce
diff --git a/net-fs/samba/samba-4.24.7.ebuild b/net-fs/samba/samba-4.24.7.ebuild
new file mode 100644
index 000000000000..7347c1196ca9
--- /dev/null
+++ b/net-fs/samba/samba-4.24.7.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info optfeature systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} == *_rc* ]]; then
+	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0/2.11.0"
+IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind lmdb pam profiling-data python quota"
+IUSE+=" +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5"
+IUSE+=" systemd test unwind winbind zeroconf"
+
+# ldap needs ads (bug #941578)
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( json python !system-mitkrb5 winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ldap? ( ads )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+TALLOC_VERSION="2.4.4"
+TDB_VERSION="1.4.15"
+TEVENT_VERSION="0.17.1"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+	>=net-libs/ngtcp2-1.12.0[gnutls,${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	!sys-libs/ldb
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	virtual/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep '
+		addc? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+			net-dns/bind[gssapi]
+		)
+		ads? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+			net-dns/bind[gssapi]
+		)
+	')
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
+	systemd? ( sys-apps/systemd:= )
+	unwind? (
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	net-libs/rpcsvc-proto
+	spotlight? ( dev-libs/glib )
+	test? (
+		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+		$(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.18.4-pam.patch
+	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
+)
+
+CONFDIR="${FILESDIR}/4.4"
+WAF_BINARY="${S}/buildtools/bin/waf"
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	# Unbundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# Unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# Ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	# bug #943942
+	append-cflags -std=gnu17
+
+	# WAF
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	# bug #874633
+	if use llvm-libunwind ; then
+		mkdir -p "${T}"/${ABI}/pkgconfig || die
+
+		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
+
+		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
+		exec_prefix=\${prefix}
+		libdir=/usr/$(get_libdir)
+		includedir=\${prefix}/include
+
+		Name: libunwind-generic
+		Description: libunwind generic library
+		Version: 1.70
+		Libs: -L\${libdir} -lunwind
+		Cflags: -I\${includedir}
+		EOF
+	fi
+
+	bundled_libs="libquic,${bundled_libs}"
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with unwind libunwind)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
+		$(use_with ads)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		--private-libraries='!ldb'
+		$(usex lmdb '' --without-ldb-lmdb)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version) # bug 914898
+
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "Test failed"
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
+	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
+
+	# Remove empty runtime dirs created by build system (bug #892341)
+	find "${ED}"/{run,var} -type d -empty -delete || die
+
+	if multilib_is_native_abi ; then
+		# Install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# Create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# Install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (bug #603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+
+		use python && python_optimize
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if use addc || use ads ; then
+		optfeature "Hide passwords from command line when using samba-tool or samba-gpupdate" dev-python/setproctitle
+	fi
+}
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 5e1f851b67bf..6e74d8b2cb4e 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -2,5 +2,9 @@ DIST mattermost-desktop-5.13.7-linux-arm64.tar.gz 114225590 BLAKE2B 065716683938
 DIST mattermost-desktop-5.13.7-linux-x64.tar.gz 114233839 BLAKE2B fe16c9325a73f6fc8a9005073ca354831b215c081091d72797fe16a88858203aa17708e3f971e906abe0ceb69ba3b2e7529b77694f885d1235606d14c6ad95d2 SHA512 c9dbca37c6165ef8b4865e10e37d664c48eea2efd9d93c8d8eeb1f21262b04ea56efef0d0362f88170cddcb4572bbc9fa20d55307306301ca5ef517f509c8c09
 DIST mattermost-desktop-6.2.3-linux-arm64.tar.gz 124414591 BLAKE2B ad159986d51c4638ab8de8c0c99fdadedf38feae8e80086bc5a7644787e2e6a65181f69b42229c0f0ed77d7cf35712af84fc530f9b5424a4108116db80a81ba0 SHA512 54ec391d4254a7e05613f70eea99523affada138b4c017fc4036b84562f6268c94aaf08915ccb8d3a8bfa62ecb7193614aed7e96a4d95e081ed8cd5b76bd4460
 DIST mattermost-desktop-6.2.3-linux-x64.tar.gz 126117958 BLAKE2B 5dc12d6902a5dd6e32edb6097d2ae60fb37611053d99e1131a5f467abcb41a375efd0266dddcac367873ded3e4829f9d1a74dba17f229f644ba314ee84836b41 SHA512 e208034b0d7681a02bb79a0af98a87043d7c29b601b4ac61baef010806140e389a691af073dd2f4a5074b9d55e90dd6af20b98ae6f46ccf32903f38ff8cbf871
+DIST mattermost-desktop-6.2.4-rc.1-linux-arm64.tar.gz 124416472 BLAKE2B 00b38265ccd6ecae2afd692855a4b2af7414bed0081ba70b114c5bb59040403b5aa83bfc6839205f4ed4b2d4f0407da44033ea3cd8e479186e15f7bfeb08c964 SHA512 3d1bad56a5768ce6593bbdb72b2d8ca94f8cb7224fdf54b3ed7530319f15db833ad8ef4b94253c19ddd829241882c23a20ed864c6920c76484a8f1e3c75d7de3
+DIST mattermost-desktop-6.2.4-rc.1-linux-x64.tar.gz 126119114 BLAKE2B 1254ac2d73f9c769f8f35d0c2289705ee8b36147b039d039e5a6944261d6de8a768a6c0f4796f6affd9a8e0839cc82af4d1ec6ff4bb0e568e85c0050b3b5a66a SHA512 4fc46014c4a6406032af359fa308ea43dd3b92e62d18b35bddf0a96af34f5698b62cb733ccacb064ea3ca8c3cd585c67625300d1e6ac90a8b253edc69314ff4f
 DIST mattermost-desktop-6.3.0-linux-arm64.tar.gz 126597799 BLAKE2B bea3998b4dd03a4b64d78b7928d3a0d2ef54b683cbb6b3f706c85f6d4c1babd372d7bf86689b38add27c3f1b89e865c69a4b7962c46f3d6344e61c663e037cbf SHA512 abca09b0a81a3c4cc9a7890cded1200b516a0363dc7311a0dc01604445bfa3070b6c34fa589fc4106d027e884a22667e7b0a25086173af826292b99137f3b093
 DIST mattermost-desktop-6.3.0-linux-x64.tar.gz 127749162 BLAKE2B deae31a79a7a5577a2f35c6cf3501c1ca881947dafea57186bfcd5f977d5b0790df21e9fd83c721cc2ac1b2328adcc973d0715a19abede1e12ea140ec560ad5d SHA512 69c7697e05df6ebbdf096ac8bfe05409b9d897ee6dd52b1e2264abfcfb24a13e3634e2116d746173691619cf218c81e4e1ce6891bd0ce5e0783f04b01f630abc
+DIST mattermost-desktop-6.3.1-rc.1-linux-arm64.tar.gz 126598157 BLAKE2B 9135cf1daedbefbe0da96c9f3c684e7861055f2e93827338c96bf0645c101d7ffb12973d47b5cbb2c15ac797b76993f01ec4957c548cab5093d42d46074851cf SHA512 be252c3b1e2ec2f51070a094473d60b5e723cce7928ce651c281d304f2a07a133118b74c2d8c9aca2cc983adc81600ddde90fe5ab0fd2166b99bfd6a4a9b10de
+DIST mattermost-desktop-6.3.1-rc.1-linux-x64.tar.gz 127749778 BLAKE2B f8bd32fe63239b076860ae4ed4827598aff4dc353967be5ba526387f14f9eb2fdf6ea64c2fac947c828e7e3bcec4251c28d597c537b8a6211883df84eb9a8e3d SHA512 68e08b6cfb17cee0d6c4a468e3871bfaf01692e4c9adf5b36559dfb4e32f6247e3726bee15d4c960237acd8b9be8c45bf46db43268f6f946c766adcfe572103f
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-6.2.4_rc1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-6.2.4_rc1.ebuild
new file mode 100644
index 000000000000..c656ff8a65e8
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-6.2.4_rc1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-*}"
+MY_PV="${PV/_rc/-rc.}"
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://mattermost.com/"
+
+SRC_URI="
+	amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz )
+	arm64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+if [[ ${PV} != *rc* ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2[X]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+"
+
+BDEPEND="
+	dev-util/debugedit
+"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/chrome_crashpad_handler
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+	opt/mattermost-desktop/libGLESv2.so
+	opt/mattermost-desktop/libEGL.so
+	opt/mattermost-desktop/libvk_swiftshader.so
+	opt/mattermost-desktop/libvulkan.so.1
+	opt/mattermost-desktop/resources/*
+"
+
+DOCS=(
+	NOTICE.txt
+)
+
+src_prepare() {
+	default
+
+	# file collision with FEATURES=splitdebug, see bug #961437
+	tc-export OBJCOPY
+	find . -type f ! -name '*$(*)*' -print0 | while IFS= read -r -d '' file; do
+		if file "${file}" | grep -qE "ELF (32|64)-bit"; then
+			${OBJCOPY} --remove-section .note.gnu.build-id "${file}" || die
+			debugedit -b "${EPREFIX}/opt/${MY_PN}" -d "/usr/lib/debug" -i "${file}" || die
+		fi
+	done
+}
+
+src_install() {
+	if use amd64; then
+		cd mattermost-desktop-${MY_PV}-linux-x64 || die
+	elif use arm64; then
+		cd mattermost-desktop-${MY_PV}-linux-arm64 || die
+	fi
+	newicon app_icon.png ${MY_PN}.png
+
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins -r resources/*.asar*
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so *.so.* "${MY_PN}" chrome_crashpad_handler
+
+	dosym -r "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	make_desktop_entry --eapi9 mattermost-desktop \
+		-a "--enable-features=WaylandWindowDecorations --ozone-platform-hint=auto %U" \
+		-d Mattermost.Desktop \
+		-n Mattermost \
+		-i mattermost-desktop \
+		-c "Network;InstantMessaging;" \
+		-e "MimeType=x-scheme-handler/mattermost;" -e "StartupWMClass=Mattermost.Desktop"
+
+	einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-6.3.1_rc1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-6.3.1_rc1.ebuild
new file mode 100644
index 000000000000..d52900b0ff49
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-6.3.1_rc1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-*}"
+MY_PV="${PV/_rc/-rc.}"
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://mattermost.com/"
+
+SRC_URI="
+	amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz )
+	arm64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+if [[ ${PV} != *rc* ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2[X]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+"
+
+BDEPEND="
+	dev-util/debugedit
+"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/chrome_crashpad_handler
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+	opt/mattermost-desktop/libGLESv2.so
+	opt/mattermost-desktop/libEGL.so
+	opt/mattermost-desktop/libvk_swiftshader.so
+	opt/mattermost-desktop/libvulkan.so.1
+	opt/mattermost-desktop/resources/*
+"
+
+DOCS=(
+	NOTICE.txt
+)
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		find . '(' -name koffi-linux-arm64 -o -name musl_x64 ')' -exec rm -r {} + || die
+	elif use arm64; then
+		find . '(' -name koffi-linux-x64 -o -name musl_arm64 ')' -exec rm -r {} + || die
+	fi
+
+	# file collision with FEATURES=splitdebug, see bug #961437
+	tc-export OBJCOPY
+	find . -type f ! -name '*$(*)*' -print0 | while IFS= read -r -d '' file; do
+		if file "${file}" | grep -qE "ELF (32|64)-bit"; then
+			${OBJCOPY} --remove-section .note.gnu.build-id "${file}" || die
+			debugedit -b "${EPREFIX}/opt/${MY_PN}" -d "/usr/lib/debug" -i "${file}" || die
+		fi
+	done
+}
+
+src_install() {
+	if use amd64; then
+		cd mattermost-desktop-${MY_PV}-linux-x64 || die
+	elif use arm64; then
+		cd mattermost-desktop-${MY_PV}-linux-arm64 || die
+	fi
+	newicon app_icon.png ${MY_PN}.png
+
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins -r resources/*.asar*
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so *.so.* "${MY_PN}" chrome_crashpad_handler
+
+	dosym -r "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	make_desktop_entry --eapi9 mattermost-desktop \
+		-a "--enable-features=WaylandWindowDecorations --ozone-platform-hint=auto %U" \
+		-d Mattermost.Desktop \
+		-n Mattermost \
+		-i mattermost-desktop \
+		-c "Network;InstantMessaging;" \
+		-e "MimeType=x-scheme-handler/mattermost;" -e "StartupWMClass=Mattermost.Desktop"
+
+	einstalldocs
+}
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index 913d206a36c3..036432efa44e 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,3 +1,2 @@
-DIST b4-0.14.3.tar.gz 270681 BLAKE2B 50b9e52524d399e2b76bb07f841ecd46b8a889bc3196afc1cbdafc5a2a9a0dd50947b4485a7625be514d314a63e0852977e99361bf6e0517a39b74a8971b5a0b SHA512 d4822cf8faba995273e283229d2bb4a7a7eed79d88496d90d723ecd22737a7d8b2e29ad0832f8e613150499e650793aa848310729f8c28c8ff216635879f45ea
 DIST b4-0.15.2.tar.gz 1036682 BLAKE2B 0bc56f664cbdba73f12f5c3ea29f905e463484740bc06bfd348449f12cf7774ed8cc01534af4d26b3854c05d30292400186638864d4e3b9cae867f4a88ebef37 SHA512 783e984a1def64a46da8411edefc716b8722b3ee9935119598cd82a1d0d582e559ea8e765300e5c1abfe285508c9e6cd482037499c92aa8044a23f41ebf534ee
 DIST b4-0.16.0.tar.gz 1493532 BLAKE2B aa6b2240d83b54297ad6ed6a9fe9d3ba7d792098edb20d4cf7fc3ee6b6b9a032673966d2aa4733e7659a966027834933e6b726ab08059ff43ff3b6048fc3b51b SHA512 2d0171c0cee9a8630bf331ee7485e2f2938ef519c3482d806da05f336a72a10570770dc4ee4c58283e00799fa1dacd05767dfa7c05f17f50aeb817acf9b1c395
diff --git a/net-mail/b4/b4-0.14.3.ebuild b/net-mail/b4/b4-0.14.3.ebuild
deleted file mode 100644
index d143b512fbbe..000000000000
--- a/net-mail/b4/b4-0.14.3.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-inherit distutils-r1
-
-DESCRIPTION="Utility for fetching patchsets from public-inbox"
-HOMEPAGE="https://pypi.org/project/b4/"
-# pypi lacks tests
-SRC_URI="https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/dkimpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
-	>=dev-python/patatt-0.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-	>=dev-vcs/git-filter-repo-2.47[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/net-misc/anydesk/anydesk-8.0.4.ebuild b/net-misc/anydesk/anydesk-8.0.4-r1.ebuild
index 2b7b045e127e..5f411f550f0f 100644
--- a/net-misc/anydesk/anydesk-8.0.4.ebuild
+++ b/net-misc/anydesk/anydesk-8.0.4-r1.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="-* ~amd64 ~arm64"
 RDEPEND="
 	app-accessibility/at-spi2-core:2
 	dev-libs/glib:2
+	dev-libs/wayland
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	media-libs/harfbuzz
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 27555bdd2e53..7f222f5dc651 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -5,7 +5,9 @@ DIST astregister-x86_64-20260331 4584160 BLAKE2B 3f1f1a9767ecc77d95bdc22bfcb7856
 DIST codec_g729a-20.0_3.1.10-x86_32.tar.gz 476843 BLAKE2B 8d014823184f17c158de9720bc903f841f290f1171344bc7a54ad7cf40627b7fcac697e642c35feef4e6eccff58b7fc85775e5d5a31c518b35a3b6c7bf258b19 SHA512 81d7d0921c9f17b31d9d3a3dd7e81844ee17bc9afd58418c2add40409c3eda932330e93411f32b5af67a42877f6abfba5d9b599812cc0655b2cc9851f1257c3c
 DIST codec_g729a-20.0_3.1.10-x86_64.tar.gz 476178 BLAKE2B f27787c17929deecf048c0b79f38bd3630375d1e09afe142052ff7b4f9ef3d5577a09b11a11aa551ae6d82f44cf40931550fa5612ec132befa3c9e3776b7dd58 SHA512 91df558f4c88af703bde270d0e360ebba074ab5ff917f163f8a525b7fa0e4a2e7480884effafb1253d6a67a72e640d1cdaba75c10c24283655136d8a356dec56
 DIST codec_g729a-20.0_3.1.11-x86_64.tar.gz 935324 BLAKE2B 236136c1e6d76784e36c7acafe7ac5e6843c941371f818d5a6529c5b5033315f93ff0d20a60a440f4c56f1850ac157d6f7af6fafbea26a3be5dff11c0827e4bb SHA512 026b84cc174a325cc19682b85e8d25d820dbb6b63b902ee4bac03ceb6997c502dabd743f39c2517775e8377e32f2376c202e1b0c49147fedd89ccfd5ba2955b9
-DIST codec_g729a-21.0_3.1.10-x86_64.tar.gz 490480 BLAKE2B 71e3d68fdf5180fbef0e1f1f026ef24b91fb876c54bb35706dda4cc243b8a6997ffb16b888cdc2019d996c8192ffc3be8c2cd3f76033017e3c744a61230e3bd9 SHA512 2be1bb6334dbf7c327729cdecb7f303c942a7d02ac5e3180c0234f490ba9e1660c4d9e8ec3033dec9c996ee26dc1bdced39f9d53bc7a4a0dd16c5e9a6e8ff0e0
+DIST codec_g729a-20.0_3.1.12-x86_64.tar.gz 937485 BLAKE2B 97aac43f69ed48aa8a29c43a3bedb3b1e5282cc517a9a7f6572a6495310410343fce9e6d81472e9876c976e2682e3e57f60988ea73c9b941fe5d31202712c90e SHA512 49ee24126eb9bc702ae1ff9de8915ea00284b5df786ed12c9304b4a45c03971d86c72a6d717539710d838b9955125ef75c6720384bd851364e20e81d163ba4a6
 DIST codec_g729a-21.0_3.1.11-x86_64.tar.gz 935305 BLAKE2B 939b4a952207a3e4bedf789a2241d584741ed21a8dced92ec0c7f968427b5da1aa24607037f33a56377ff5168e6d22de248e9e25be65eba9e76d7e5e50a34a6d SHA512 b134f4c892770ea102583f94e00cab826013130ef0e658e06d04e7ca899d8e7eae16e9d274690cb906f1f5596fcd6eef8eb48008e7f637b13b6efa0a1a7ac23f
-DIST codec_g729a-22.0_3.1.10-x86_64.tar.gz 490553 BLAKE2B 2a7fb76604e0d5bafdc2a671994667d13cae73df553ab8e406949d1fb7007d6eb85c1cadeedd64201912fec670ce19d9c5bfb5a9d4fc23bbb242194f2e1107a7 SHA512 de9169ed3710972d3ed4a4656e874c6f37dd741794db52b392dd0d8b64d833f39cb58129daed8ec0d3af3c53ad7659a655ac0540332de05d241263de7a7d3c54
+DIST codec_g729a-21.0_3.1.12-x86_64.tar.gz 937457 BLAKE2B 5eab562b0930bbc6db458ca0e7429b0b8efec54af5feed132601e144f615bad779226a3f95b0fbcf17ee5a84adfb5f2fdb57c6c22ea19270e727244ee83fca7e SHA512 5abe98ea7f9bfb34324efa44bdb71db093ac4d3e76e9a1ae784c34a29b667770b4a6e06120130eb8f77d58b4b6059d5732829844156e91b7c123a93df024c7dd
 DIST codec_g729a-22.0_3.1.11-x86_64.tar.gz 935266 BLAKE2B 72ce4792f0c7d8ef9dc161be5379fd729dc282ab2b94d2a46f350ebc1fc9635ffc13b2add4d99c84218cd2709a558112523289b2e09a63834872537e94fe1a54 SHA512 0e3d12c1e84bc6840bc2f31592f2a56af8c881d7358a71c8567cf6a4e3fb535afeac05009da348699eabdccaec38ebdac1260b1d564c9e54967dc8b79c6b4796
+DIST codec_g729a-22.0_3.1.12-x86_64.tar.gz 937441 BLAKE2B d3442226e3f21389faae0dc0e56949d736af0c8219b799d11f04c996f38ab4c3d48ba7d0fdc44fd1688d5eed6e1d0fb84c5863a924904022f43c1e88ceecd07a SHA512 4b80a83aefa4d527a56f6977b0a4caceba9436e764c375a66630bb028a9b4d95b69933be913bfedbb72d3be19dc54675a05b7bc0e5283f9e8f0ea4d99f3c1523
+DIST codec_g729a-23.0_3.1.12-x86_64.tar.gz 937442 BLAKE2B 0e1a77f43849b1e30fe9ed28a38b40033248e853937eaf12eae513adb95d80448f7601deefa74f4d6c9f599f9af7c3c5ea92235f86b00096cf2927609caa04a5 SHA512 44d55189018b8fb12b725413764798e1c95777babaf8960cf6eb019a1315e187d2cb99869864c52e02dd348cbda429026b110f80eedba58c22dfd6d9ec7ccbc6
diff --git a/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10-r2.ebuild b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10-r2.ebuild
index e698c313d405..15e77114df44 100644
--- a/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10-r2.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10-r2.ebuild
@@ -35,8 +35,8 @@ pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_PREBUILT="${QA_FLAGS_IGNORED}
-		/usr/sbin/asthostid
-		/usr/sbin/astregister"
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
 }
 
 src_unpack() {
diff --git a/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.11-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.11-r1.ebuild
index f055ae31bda5..dc63f245c55a 100644
--- a/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.11-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.11-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
@@ -31,8 +31,8 @@ pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_PREBUILT="${QA_FLAGS_IGNORED}
-		/usr/sbin/asthostid
-		/usr/sbin/astregister"
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
 }
 
 src_unpack() {
diff --git a/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.10-r2.ebuild b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.12.ebuild
index f055ae31bda5..2b769a3f5dbd 100644
--- a/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.10-r2.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.12.ebuild
@@ -31,8 +31,8 @@ pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_PREBUILT="${QA_FLAGS_IGNORED}
-		/usr/sbin/asthostid
-		/usr/sbin/astregister"
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
 }
 
 src_unpack() {
diff --git a/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.11-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.11-r1.ebuild
index f055ae31bda5..2b769a3f5dbd 100644
--- a/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.11-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.11-r1.ebuild
@@ -31,8 +31,8 @@ pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_PREBUILT="${QA_FLAGS_IGNORED}
-		/usr/sbin/asthostid
-		/usr/sbin/astregister"
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
 }
 
 src_unpack() {
diff --git a/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.10-r2.ebuild b/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.12.ebuild
index f055ae31bda5..2b769a3f5dbd 100644
--- a/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.10-r2.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-21.0.3.1.12.ebuild
@@ -31,8 +31,8 @@ pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_PREBUILT="${QA_FLAGS_IGNORED}
-		/usr/sbin/asthostid
-		/usr/sbin/astregister"
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
 }
 
 src_unpack() {
diff --git a/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.11-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.11-r1.ebuild
index f055ae31bda5..2b769a3f5dbd 100644
--- a/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.11-r1.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.11-r1.ebuild
@@ -31,8 +31,8 @@ pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
 	QA_PREBUILT="${QA_FLAGS_IGNORED}
-		/usr/sbin/asthostid
-		/usr/sbin/astregister"
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
 }
 
 src_unpack() {
diff --git a/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.12.ebuild b/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.12.ebuild
new file mode 100644
index 000000000000..2b769a3f5dbd
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-22.0.3.1.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="https://www.asterisk.org/products/add-ons/g729-codec/"
+
+AST_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_rs 2 _)"
+
+MY_TOOLS_VERSION=20260331
+
+# Keep the binary suffix to re-use already downloaded files.
+SRC_URI="amd64? (
+	https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz
+	https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64-${MY_TOOLS_VERSION}
+	https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64-${MY_TOOLS_VERSION}
+)"
+
+S="${WORKDIR}"
+
+LICENSE="Digium"
+SLOT="0/${AST_PV}"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
+	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
+	QA_PREBUILT="${QA_FLAGS_IGNORED}
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
+}
+
+src_unpack() {
+	local dfile
+
+	for dfile in ${A}; do
+		[[ "${dfile}" = *.tar.gz ]] && unpack "${dfile}"
+		cp "${DISTDIR}/${dfile}" "${WORKDIR}/" || die "Error copying ${dfile} to ${WORKDIR}"
+	done
+}
+
+src_install() {
+	local binsuffix=x86_64
+
+	newsbin astregister-${binsuffix}-${MY_TOOLS_VERSION} astregister-${MY_TOOLS_VERSION}
+	dosym astregister-${MY_TOOLS_VERSION} /usr/sbin/astregister
+
+	newsbin asthostid-${binsuffix}-${MY_TOOLS_VERSION} asthostid-${MY_TOOLS_VERSION}
+	dosym asthostid-${MY_TOOLS_VERSION} /usr/sbin/asthostid
+
+	dodoc codec_g729a-${MY_PV}-${binsuffix}/README
+	insinto usr/$(get_libdir)/asterisk/modules/
+	doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so"
+}
+
+pkg_postinst() {
+	einfo "Please note that Digium's register utility has been installed as astregister"
+}
diff --git a/net-misc/asterisk-g729/asterisk-g729-23.0.3.1.12.ebuild b/net-misc/asterisk-g729/asterisk-g729-23.0.3.1.12.ebuild
new file mode 100644
index 000000000000..2b769a3f5dbd
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-23.0.3.1.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="https://www.asterisk.org/products/add-ons/g729-codec/"
+
+AST_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_rs 2 _)"
+
+MY_TOOLS_VERSION=20260331
+
+# Keep the binary suffix to re-use already downloaded files.
+SRC_URI="amd64? (
+	https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz
+	https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64-${MY_TOOLS_VERSION}
+	https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64-${MY_TOOLS_VERSION}
+)"
+
+S="${WORKDIR}"
+
+LICENSE="Digium"
+SLOT="0/${AST_PV}"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
+	QA_TEXTRELS="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
+	QA_PREBUILT="${QA_FLAGS_IGNORED}
+		/usr/sbin/asthostid-${MY_TOOLS_VERSION}
+		/usr/sbin/astregister-${MY_TOOLS_VERSION}"
+}
+
+src_unpack() {
+	local dfile
+
+	for dfile in ${A}; do
+		[[ "${dfile}" = *.tar.gz ]] && unpack "${dfile}"
+		cp "${DISTDIR}/${dfile}" "${WORKDIR}/" || die "Error copying ${dfile} to ${WORKDIR}"
+	done
+}
+
+src_install() {
+	local binsuffix=x86_64
+
+	newsbin astregister-${binsuffix}-${MY_TOOLS_VERSION} astregister-${MY_TOOLS_VERSION}
+	dosym astregister-${MY_TOOLS_VERSION} /usr/sbin/astregister
+
+	newsbin asthostid-${binsuffix}-${MY_TOOLS_VERSION} asthostid-${MY_TOOLS_VERSION}
+	dosym asthostid-${MY_TOOLS_VERSION} /usr/sbin/asthostid
+
+	dodoc codec_g729a-${MY_PV}-${binsuffix}/README
+	insinto usr/$(get_libdir)/asterisk/modules/
+	doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so"
+}
+
+pkg_postinst() {
+	einfo "Please note that Digium's register utility has been installed as astregister"
+}
diff --git a/net-misc/asterisk-opus/Manifest b/net-misc/asterisk-opus/Manifest
index 97b7db7cab46..9689f1509bb5 100644
--- a/net-misc/asterisk-opus/Manifest
+++ b/net-misc/asterisk-opus/Manifest
@@ -2,3 +2,4 @@ DIST codec_opus-20.0_1.3.0-x86_32.tar.gz 394431 BLAKE2B 438fd122718e6efe45eaba0b
 DIST codec_opus-20.0_1.3.0-x86_64.tar.gz 388429 BLAKE2B 535438df19edbf5e639e2427e46c05c4537b9955f3b02f94b21d674061e831f6097018fb1861b3f27081cdac4ae42a1dc9f8659e717a91be76c244cf9effaec3 SHA512 d98402be9cb12a9fefee427b4641e4e11873e04fe275d060ef8c272d4830a4c2227cac94963bb1bf19450487e5c6c381171328383192309c4f05250d6d759da2
 DIST codec_opus-21.0_1.3.0-x86_64.tar.gz 415215 BLAKE2B 9c4fad40cccf5cfea3f3d7b0c8820a75ddb29a0fca9f2f4f9badfb904efc4fd2a40a4c7afd581d5d1eb6a52f0744ec9cecce0fdf9ef058d69ba0d3f123abafda SHA512 d92198c66045c4b0ec605f077a96c2da09cab1bfcee08191af6cab15c10e1dea50e94d23e66ce96e2dd49b35b4204a8da86e3a356e519e8191ab16d84998ee48
 DIST codec_opus-22.0_1.3.0-x86_64.tar.gz 415729 BLAKE2B b75e444629edb5a669d7a2041652108ec682d07aa583e9d8d3fe81202a80ae1a4834a84bbe3460ca6095d0c827c4a8dd90128ec38099336c86b7955152046d4e SHA512 2e7d3e00f13daa53717951dcc09778ccf898a385e9aa56183c7b101912c2bd155776aaed6644dd9318c721516791347160667d24d039885b4f6dfc7eff97f444
+DIST codec_opus-23.0_1.3.0-x86_64.tar.gz 415439 BLAKE2B 504d7bd7349f011cb8d955663917d2297ca1d332aa90fff37b721f6246dac03f45ad1f66e6ff97c6319991fd6975a526b3c67c33c63f54f61f5922f8c23bc91d SHA512 0d91633423199753d886c9e28e7446380cf2dee0aa7f0b2f4ec54af0e60f76538ec395a730b16c87440be67019bb3f23f6def78b5725a15645034ae80d0d3a77
diff --git a/net-misc/asterisk-opus/asterisk-opus-23.0.1.3.0.ebuild b/net-misc/asterisk-opus/asterisk-opus-23.0.1.3.0.ebuild
new file mode 100644
index 000000000000..9be81cf8b1da
--- /dev/null
+++ b/net-misc/asterisk-opus/asterisk-opus-23.0.1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="9"
+
+DESCRIPTION="OPUS codec and supporting files for asterisk"
+HOMEPAGE="https://docs.asterisk.org/Configuration/Codec-Opus/"
+
+AST_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_rs 2 _)"
+
+SRC_URI="https://downloads.digium.com/pub/telephony/codec_opus/asterisk-${AST_PV}/x86-64/codec_opus-${MY_PV}-x86_64.tar.gz"
+
+S="${WORKDIR}"
+
+LICENSE="Digium"
+SLOT="0/${AST_PV}"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=net-misc/asterisk-${PV%%.*}*"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_opus.so"
+	QA_PREBUILT="${QA_FLAGS_IGNORED}"
+}
+
+src_install() {
+	local arch=x86_64
+
+	dodoc codec_opus-${MY_PV}-${arch}/README
+	insinto /usr/$(get_libdir)/asterisk/modules/
+	doins "codec_opus-${MY_PV}-${arch}/codec_opus.so"
+
+	insinto /var/lib/asterisk/documentation/thirdparty
+	doins "codec_opus-${MY_PV}-${arch}/codec_opus_config-en_US.xml"
+}
diff --git a/net-misc/bgpq4/Manifest b/net-misc/bgpq4/Manifest
index d42f8189e35b..fdf654164611 100644
--- a/net-misc/bgpq4/Manifest
+++ b/net-misc/bgpq4/Manifest
@@ -1,2 +1,2 @@
 DIST bgpq4-1.15.tar.gz 61084 BLAKE2B 80c2630e83e2ae188c656ec4c7f35a8f44d5044c320ba083b0d8cc9efde73d211856d610cd6eea615617536268746d40c9c10d1e9faef8cf044e0372ca093a56 SHA512 61e7621baf0de9dc2375393affe5bcbe0a7494ce3edded90c05e60975c359b9b1322fb8a2ade5c91b720cecef363c293fb16fe426f29074d558148c4d68924a5
-DIST bgpq4-1.8.tar.gz 55947 BLAKE2B 2aea8eddc33881b2e5734a805e290ed8e0a24aa41dfc65d6cd0d4221b4ff95f9477d80754eb3ae92e71843e4539653143748eca61f8f0a561932c5fff28a799e SHA512 c2bb9a6cc4f2ee361a3193c2637bc62432cc82f0182368d56d90112e50ffb7b1a28868568ee551ceda658dbdeed809dff30c820e50f9b5cf430cca01ac55cf99
+DIST bgpq4-1.16.tar.gz 61067 BLAKE2B 86271632d0e55f3fde68663515b8f071141ea35b803d9a769700e896faf3d509daa4bbee4614cada9a15a89335960797f2f91ca690fd5d4ace272d587e5df38c SHA512 57cb2e1cafada488c85ba8f8103f9bee66ab339ee9c9d5571d240080f44d794b40e75a6bfddcdb096a61d54d7f814b0f5f7ac34aa92ba6ec0b989285dc9c9422
diff --git a/net-misc/bgpq4/bgpq4-1.8.ebuild b/net-misc/bgpq4/bgpq4-1.16.ebuild
index f8e8353f66b3..d09423119cd8 100644
--- a/net-misc/bgpq4/bgpq4-1.8.ebuild
+++ b/net-misc/bgpq4/bgpq4-1.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=9
 
 inherit autotools
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 src_prepare() {
 	default
diff --git a/perl-core/File-Temp/File-Temp-0.231.200.ebuild b/perl-core/File-Temp/File-Temp-0.231.200.ebuild
index 65c37df31f0b..1168d6effb88 100644
--- a/perl-core/File-Temp/File-Temp-0.231.200.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.231.200.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
 
 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=""
 
 PATCHES=(
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 6bebfab8cd7d..6cf5c3a109d3 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,3 +1,3 @@
 DIST gpxsee-16.11.tar.gz 6481773 BLAKE2B 99975fe8f7480df80002aa8cb3ed1db3e0cf3a2834b7bea91fd5353a72d5c4ee62db8c151c0aba70c48b917bd37e5b795c191058d586d4099f611ddf0cae9ad3 SHA512 adca2ec3570ddc10195621b64d85aef3d75305b59a225a2faf8e813e3450cfc6323ee936f70f179b86d8e6253a98f17af9fc11bcc2a0083cfc17e448a647ff7c
-DIST gpxsee-16.13.tar.gz 6471609 BLAKE2B 64bbea8278a0b7a546bc582e9e0e5e50c1edc6c51609ec7af4f389be12b9a7a5e537a8dcd0ad4de808c14e3f4de5a45b4fe9a5133a3f8ad43af1cef082bc787a SHA512 478904ca6b938abcad8b4db6c8019d0463df352f07ef4e730badb44b7089efc820e4c87d06dc320d5f5b976ef8139a7718b9666c42a71999ac8a64994bc6e48d
 DIST gpxsee-16.14.tar.gz 6472075 BLAKE2B 5a974d5917a752fc75621f26fd77f2e5a7b900b7eee5fc53383316a00a4672a38f0c3b222279db6b2e200bb18ec7bb716dca9fd1f8424f08085dda715ef3c70d SHA512 bb033d5b99fa26ab0d80eb0ef59452500cfb442ce513169660810cc9194993802225d4d6274ad3762eaea33cd273eed873076d824536068d7efbdce340ae24e0
+DIST gpxsee-16.15.tar.gz 6472925 BLAKE2B 593ca8f5a5b726dccdc48c75bd9fd753a8344c93f88bf3047c68e694dedd7686e7fd5f0757c0d9360e573b9788db883b4966a0ecf7341f1c4d60c53d6367b779 SHA512 6633fdbd687b1dfb2bba605e519e85ea35cbd4fa7c1411730d97c7e502cadc8b0775c462727e58648c1072a21f986f4068826e555e663dbf9c6dc74f046e24fe
diff --git a/sci-geosciences/gpxsee/gpxsee-16.13.ebuild b/sci-geosciences/gpxsee/gpxsee-16.15.ebuild
index 4deee4c76d11..4deee4c76d11 100644
--- a/sci-geosciences/gpxsee/gpxsee-16.13.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-16.15.ebuild
diff --git a/sci-libs/gdal/gdal-3.13.2.ebuild b/sci-libs/gdal/gdal-3.13.2.ebuild
index a09accb85816..047d37f715af 100644
--- a/sci-libs/gdal/gdal-3.13.2.ebuild
+++ b/sci-libs/gdal/gdal-3.13.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/39" # subslot is libgdal.so.<SONAME> (and GDAL_SOVERSION in gdal.cmake)
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="
 	archive armadillo avif blosc cryptopp +curl cpu_flags_arm_neon cpu_flags_x86_avx
 	cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/sci-libs/nfft/files/nfft-3.5.3-dash.patch b/sci-libs/nfft/files/nfft-3.5.3-dash.patch
new file mode 100644
index 000000000000..ab1113bcae82
--- /dev/null
+++ b/sci-libs/nfft/files/nfft-3.5.3-dash.patch
@@ -0,0 +1,12 @@
+--- a/m4/ax_lib_fftw3.m4	2026-09-15 09:01:23.181964635 +0200
++++ b/m4/ax_lib_fftw3.m4	2026-09-15 09:04:28.721957025 +0200
+@@ -80,7 +80,8 @@
+       fftw3_lib_flag=""
+       fftw3_LIBS=""
+     else
+-      fftw3_libname="${!fftw3_libvar:2}"
++      eval "fftw3_lib_flag=\$${fftw3_libvar}"
++      fftw3_libname="${fftw3_lib_flag#??}"
+       fftw3_lib_flag="-l${fftw3_libname}"
+       fftw3_LIBS="${fftw3_lib_flag} -lm"
+     fi
diff --git a/sci-libs/nfft/nfft-3.5.3.ebuild b/sci-libs/nfft/nfft-3.5.3-r1.ebuild
index 09111690b637..0bbfa7dc27a3 100644
--- a/sci-libs/nfft/nfft-3.5.3.ebuild
+++ b/sci-libs/nfft/nfft-3.5.3-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
@@ -12,14 +12,17 @@ SRC_URI="https://github.com/NFFT/nfft/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc openmp"
+IUSE="doc openmp test"
 
 RDEPEND="sci-libs/fftw:3.0=[threads,openmp?]"
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/cunit )"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc15.patch"
 	"${FILESDIR}/${P}-rtc.patch"
+	"${FILESDIR}/${P}-dash.patch"
 )
 
 pkg_pretend() {
@@ -41,6 +44,10 @@ src_configure() {
 		$(use_enable openmp)
 }
 
+src_test() {
+	emake check CFLAGS="${CFLAGS} -Wno-error=incompatible-pointer-types"
+}
+
 src_install() {
 	default
 
diff --git a/sys-auth/hyprpolkitagent/Manifest b/sys-auth/hyprpolkitagent/Manifest
index 19cbaa4b6c33..7709afa87382 100644
--- a/sys-auth/hyprpolkitagent/Manifest
+++ b/sys-auth/hyprpolkitagent/Manifest
@@ -1 +1,2 @@
 DIST hyprpolkitagent-0.1.3.tar.gz 32857 BLAKE2B 962601321e7e44f9619f13ce777e5d4fc22541b527b9f1e54954a2ce98fc683f95467c4c8407ed08fdf25b909bf264547190eaaac5e1bd4d9445bc27b768a16a SHA512 2120a6ba6e9658f258c5fcea559477278f9e264182f58ebaa9d29584c2e4b7d69bb064989d3703a1b190b5cb9fe8bb26d1aa4497a7fe36ff2270054ae228f017
+DIST hyprpolkitagent-0.2.0.tar.gz 110232 BLAKE2B 438518ad6ff83ba78768e1a8e0f034a5db5e76fa7c5e21b7bd2e1744d1f5dea34c7a83fab13252555eb199a5e479a6a9ceb29e510417aa626db4da1b9d6564d2 SHA512 8e0afe08805098fb0e01d082f7a4e83fc3d841abc891ee43c446ae010f97daac27f55d42617d6dc4de797f0e7fec1d1da6cb8b79f441c5024208dbd7e5d89eda
diff --git a/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.3-r1.ebuild b/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.3-r1.ebuild
index 5e1c50819907..ea0c938c09a2 100644
--- a/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.3-r1.ebuild
+++ b/sys-auth/hyprpolkitagent/hyprpolkitagent-0.1.3-r1.ebuild
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 DEPEND="
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtdeclarative:6
@@ -33,19 +37,18 @@ RDEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	virtual/pkgconfig
 "
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
-		eerror "Hyprpolkitagent requires >=sys-devel/gcc-14 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
-		eerror "Hyprpolkitagent requires >=llvm-core/clang-18 to build"
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile Hyprland!"
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
 	fi
 }
diff --git a/sys-auth/hyprpolkitagent/hyprpolkitagent-0.2.0.ebuild b/sys-auth/hyprpolkitagent/hyprpolkitagent-0.2.0.ebuild
new file mode 100644
index 000000000000..9d313ae99a21
--- /dev/null
+++ b/sys-auth/hyprpolkitagent/hyprpolkitagent-0.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Polkit authentication agent for Hyprland, written in Qt/QML"
+HOMEPAGE="https://wiki.hypr.land/Hypr-Ecosystem/hyprpolkitagent/"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
+DEPEND="
+	>=gui-libs/hyprtoolkit-0.6.0
+	gui-libs/hyprutils:=
+	sys-auth/polkit
+"
+
+BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
+	fi
+}
diff --git a/sys-auth/hyprpolkitagent/hyprpolkitagent-9999.ebuild b/sys-auth/hyprpolkitagent/hyprpolkitagent-9999.ebuild
index 5e1c50819907..ea0c938c09a2 100644
--- a/sys-auth/hyprpolkitagent/hyprpolkitagent-9999.ebuild
+++ b/sys-auth/hyprpolkitagent/hyprpolkitagent-9999.ebuild
@@ -19,6 +19,10 @@ fi
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
 
+# Minimum required gcc and clang versions.
+_MIN_GCC_VER=15
+_MIN_CLANG_VER=19
+
 DEPEND="
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtdeclarative:6
@@ -33,19 +37,18 @@ RDEPEND="
 "
 
 BDEPEND="
+	|| ( >=sys-devel/gcc-${_MIN_GCC_VER}:* >=llvm-core/clang-${_MIN_CLANG_VER}:* )
 	virtual/pkgconfig
 "
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
-		eerror "Hyprpolkitagent requires >=sys-devel/gcc-14 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
-		eerror "Hyprpolkitagent requires >=llvm-core/clang-18 to build"
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile Hyprland!"
+	if tc-is-gcc && ver_test $(gcc-version) -lt ${_MIN_GCC_VER} ; then
+		eerror "Compiler is sys-devel/gcc-$(gcc-version), requires >=sys-devel/gcc-${_MIN_GCC_VER}."
+		die "Active compiler is too old for this package."
+	elif tc-is-clang && ver_test $(clang-version) -lt ${_MIN_CLANG_VER} ; then
+		eerror "Compiler is llvm-core/clang-$(clang-version), requires >=llvm-core/clang-${_MIN_CLANG_VER}."
+		die "Active compiler is too old for this package."
 	fi
 }
diff --git a/sys-cluster/ceph/ceph-20.2.1-r5.ebuild b/sys-cluster/ceph/ceph-20.2.1-r5.ebuild
new file mode 100644
index 000000000000..c1e192489bad
--- /dev/null
+++ b/sys-cluster/ceph/ceph-20.2.1-r5.ebuild
@@ -0,0 +1,510 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please be careful not to bump to development versions or RCs.
+# If decide to package these, please don't keyword them.
+# Stable releases are x.2.z.
+# https://docs.ceph.com/en/latest/releases/general/#understanding-the-release-cycle
+
+CMAKE_REMOVE_MODULES_LIST=( FindBoost )
+CMAKE_WARN_UNUSED_CLI=no # false positives unless all USE flags are on
+PYTHON_COMPAT=( python3_{13..14} )
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single multiprocessing \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-20.2.0-libarrow-20.0.0.patch.xz"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="
+	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jaeger
+	kafka kerberos ldap lttng +mgr nvmeof +parquet pmdk rabbitmq +radosgw
+	rbd-rwl rbd-ssd rdma rgw-lua selinux +ssl spdk +sqlite +system-boost
+	systemd +tcmalloc test +uring xfs zbd
+"
+
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+	rgw-lua? ( radosgw )
+	nvmeof? ( spdk )
+"
+
+# tests need root access, and network access
+RESTRICT="test !test? ( test )"
+
+# Note: Patch fromn Fedora, ceph-20.2.0-libarrow-20.0.0.patch.xz, is not compatible with recent changes
+# in dev-libs/apache-arrow-24.0.0, in particular, https://github.com/apache/arrow/pull/49492 . Limit
+# to below that version until Fedora respins the patch.
+DEPEND="
+	${LUA_DEPS}
+	${PYTHON_DEPS}
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	>=app-arch/snappy-1.1.9-r1:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-cpp/gflags:=
+	dev-db/lmdb:=
+	dev-lang/jsonnet:=
+	dev-libs/libaio:=
+	<dev-libs/libfmt-11.1.5:=
+	dev-libs/libnl:3=
+	dev-libs/libevent:=
+	dev-libs/libutf8proc:=
+	dev-libs/nss:=
+	dev-libs/openssl:=
+	<dev-libs/rocksdb-7.9.3:=
+	dev-libs/thrift:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-vcs/git
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-libs/libcap-ng:=
+	sys-libs/libnbd
+	sys-libs/ncurses:0=
+	virtual/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace:0/1 )
+	fuse? ( sys-fs/fuse:3= )
+	jaeger? (
+		dev-cpp/nlohmann_json:=
+		<dev-cpp/opentelemetry-cpp-1.10:=[jaeger,prometheus]
+	)
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	nvmeof? ( net-libs/grpc:= )
+	parquet? ( <dev-libs/apache-arrow-24.0.0:=[parquet] )
+	pmdk? (
+		>=dev-libs/pmdk-1.10.0:=
+		sys-block/ndctl:=
+	)
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	rdma? ( sys-cluster/rdma-core:= )
+	spdk? ( dev-util/cunit )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] )
+	tcmalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/yasm )
+	app-alternatives/cpio
+	dev-debug/valgrind
+	>=dev-build/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/gperf
+	dev-util/ragel
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/util-linux
+	sys-apps/which
+	app-alternatives/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	jaeger? (
+		app-alternatives/yacc
+		app-alternatives/lex
+	)
+	test? (
+		dev-util/cunit
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[lvm]
+	app-alternatives/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		dev-python/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+	selinux? ( sec-policy/selinux-ceph )
+"
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch"
+	"${FILESDIR}/ceph-17.2.0-findre2.patch"
+	"${FILESDIR}/ceph-17.2.0-osd_class_dir.patch"
+	# https://bugs.gentoo.org/866165
+	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
+	# https://bugs.gentoo.org/868891
+	"${FILESDIR}/ceph-18.2.0-cyclic-deps.patch"
+	# https://bugs.gentoo.org/907739
+	"${FILESDIR}/ceph-18.2.0-cython3.patch"
+	# https://bugs.gentoo.org/936889
+	"${FILESDIR}/ceph-18.2.4-liburing.patch"
+	"${FILESDIR}/ceph-18.2.4-spdk.patch"
+	"${FILESDIR}/ceph-19.2.1-isa-l.patch"
+	"${FILESDIR}/ceph-19.2.2-QATAPP-Fix-clang-16-compiling-issue.patch"
+	"${FILESDIR}/ceph-19.2.2-add-option-to-build-agains-system-opentelemetry.patch"
+	"${FILESDIR}/ceph-19.2.2-common-add-dependency-on-legacy-option-headers.patch"
+	"${FILESDIR}/ceph-19.2.2-rbd-make-enums-statically-castable.patch"
+	"${FILESDIR}/ceph-19.2.2-rgw-remove-FMT_STRING-to-fix-clang-20-build-failure.patch"
+	# https://bugs.gentoo.org/960812
+	"${FILESDIR}/ceph-19.2.2-silent-unused-variable-warning.patch"
+	"${FILESDIR}/ceph-19.2.2-src-mgr-make-enum-statically-castable.patch"
+	"${FILESDIR}/ceph-20.1.0-nvmeof.patch"
+	"${FILESDIR}/ceph-20.1.1-always-lua.patch" # bug 934599
+	"${FILESDIR}/ceph-20.1.1-boost-url-linking.patch"
+	# https://bugs.gentoo.org/969039
+	"${FILESDIR}"/ceph-20.1.1-boost-1.89-{1,2,3}.patch
+	"${WORKDIR}/ceph-20.2.0-libarrow-20.0.0.patch"
+	"${FILESDIR}/ceph-20.2.1-boost-1.90-intrusive_ptr_fixes.patch"
+	"${FILESDIR}/ceph-20.2.1-rgw_error_handler.patch"
+	"${FILESDIR}/ceph-20.1.1-libcxx-exp-features.patch"
+	"${FILESDIR}/ceph-20.2.1-clang++-libcxx.patch"
+	"${FILESDIR}/ceph-20.2.1-qatzip-werror.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	lua_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	if use system-boost; then
+		rm -r src/boost || die # ensure use system boost, reduce QA spam
+	fi
+
+	# ensure system-libs, reduce QA spam (FIXME: fails w/o zstd subdir)
+	rm -r src/{arrow,c-ares,jaegertracing/opentelemetry-cpp,rocksdb,utf8proc} || die
+
+	cmake_src_prepare
+
+	if ! use systemd; then
+		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
+			| xargs --null sed \
+			-e '/^from ceph_volume.systemd import systemctl/ d' \
+			-i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
+		-i src/CMakeLists.txt || die
+
+	if use spdk; then
+		# https://bugs.gentoo.org/871942
+		sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die
+		# unittests fail to build (??!?)
+		sed -i -e 's/CONFIG_UNIT_TESTS=y/CONFIG_UNIT_TESTS=n/' src/spdk/CONFIG || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local mycmakeargs=(
+		# Don't break installed bundled libraries (bug #942680)
+		-DBUILD_SHARED_LIBS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
+		-DWITH_CEPHFS:BOOL=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
+		-DWITH_DPDK:BOOL=$(usex dpdk)
+		-DWITH_SPDK:BOOL=$(usex spdk)
+		-DWITH_FUSE:BOOL=$(usex fuse)
+		-DWITH_LTTNG:BOOL=$(usex lttng)
+		-DWITH_GSSAPI:BOOL=$(usex kerberos)
+		-DWITH_GRAFANA:BOOL=$(usex grafana)
+		-DWITH_MGR:BOOL=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
+		-DWITH_OPENLDAP:BOOL=$(usex ldap)
+		-DWITH_PYTHON3:STRING=3
+		-DWITH_RADOSGW:BOOL=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
+		-DWITH_SYSTEMD:BOOL=$(usex systemd)
+		-DWITH_TESTS:BOOL=$(usex test)
+		-DWITH_LIBURING:BOOL=$(usex uring)
+		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
+		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
+		-DWITH_XFS:BOOL=$(usex xfs)
+		-DWITH_ZBD:BOOL=$(usex zbd)
+		-DENABLE_SHARED:BOOL=ON
+		-DALLOCATOR:STRING=$(usex tcmalloc tcmalloc libc)
+		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')")
+		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
+		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
+		-DWITH_SYSTEM_ZSTD:BOOL=ON
+		-DWITH_RDMA:BOOL=$(usex rdma)
+		-DWITH_SYSTEM_UTF8PROC:BOOL=ON
+		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
+		-DWITH_SYSTEM_FMT=ON
+		-Wno-dev
+		-DCEPHADM_BUNDLED_DEPENDENCIES=none
+		-DWITH_NVMEOF_GATEWAY_MONITOR_CLIENT:BOOL=$(usex nvmeof)
+		-DWITH_SYSTEM_ARROW:BOOL=ON
+	)
+
+	# this breaks when re-configuring for python impl
+	if [[ ${EBUILD_PHASE} == configure ]]; then
+		mycmakeargs+=(
+			-DWITH_JAEGER:BOOL=$(usex jaeger)
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet)
+		)
+		if use jaeger; then
+			mycmakeargs+=( -DWITH_SYSTEM_OPENTELEMETRY:BOOL=ON )
+		fi
+	else
+		mycmakeargs+=(
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
+			-DWITH_JAEGER:BOOL=OFF
+			# don't want to warn about unused CLI when reconfiguring for python
+			-DCMAKE_WARN_UNUSED_CLI:BOOL=OFF
+		)
+	fi
+
+	# conditionally used cmake args
+	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
+	use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) )
+
+	if use amd64 || use x86; then
+		local flag
+		for flag in "${CPU_FLAGS_X86[@]}"; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=(
+						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					)
+				;;
+				*) mycmakeargs+=(
+						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					);;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	# https://bugs.gentoo.org/927066
+	filter-lto
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+src_compile() {
+	export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs)
+	cmake_build all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	cmake_build src/pybind/CMakeFiles/cython_modules
+	cmake_build cephadm
+}
+
+src_install() {
+	python_foreach_impl python_install
+
+	python_setup
+	cmake_src_install
+
+	python_optimize
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	local bundled_init="${ED}/etc/init.d/ceph"
+	[[ -f "${bundled_init}" ]] && {
+		rm "${bundled_init}" || die
+	}
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r14" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sudoers.d
+	doins sudoers.d/*
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	DESTDIR="${ED}" cmake_build src/pybind/install
+	DESTDIR="${ED}" cmake_build src/cephadm/install
+
+	python_optimize
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/ceph-20.2.4-r1.ebuild b/sys-cluster/ceph/ceph-20.2.4-r1.ebuild
new file mode 100644
index 000000000000..d0292bd68382
--- /dev/null
+++ b/sys-cluster/ceph/ceph-20.2.4-r1.ebuild
@@ -0,0 +1,512 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please be careful not to bump to development versions or RCs.
+# If decide to package these, please don't keyword them.
+# Stable releases are x.2.z.
+# https://docs.ceph.com/en/latest/releases/general/#understanding-the-release-cycle
+
+CMAKE_REMOVE_MODULES_LIST=( FindBoost )
+CMAKE_WARN_UNUSED_CLI=no # false positives unless all USE flags are on
+PYTHON_COMPAT=( python3_{13..14} )
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single multiprocessing \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-20.2.0-libarrow-20.0.0.patch.xz"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="
+	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jaeger
+	kafka kerberos ldap lttng +mgr nvmeof +parquet pmdk rabbitmq +radosgw
+	rbd-rwl rbd-ssd rdma rgw-lua selinux +ssl spdk +sqlite +system-boost
+	systemd +tcmalloc test +uring xfs zbd
+"
+
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+	rgw-lua? ( radosgw )
+	nvmeof? ( spdk )
+"
+
+# tests need root access, and network access
+RESTRICT="test !test? ( test )"
+
+# Note: Patch fromn Fedora, ceph-20.2.0-libarrow-20.0.0.patch.xz, is not compatible with recent changes
+# in dev-libs/apache-arrow-24.0.0, in particular, https://github.com/apache/arrow/pull/49492 . Limit
+# to below that version until Fedora respins the patch.
+DEPEND="
+	${LUA_DEPS}
+	${PYTHON_DEPS}
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	>=app-arch/snappy-1.1.9-r1:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-cpp/gflags:=
+	dev-db/lmdb:=
+	dev-lang/jsonnet:=
+	dev-libs/libaio:=
+	<dev-libs/libfmt-11.1.5:=
+	dev-libs/libnl:3=
+	dev-libs/libevent:=
+	dev-libs/libutf8proc:=
+	dev-libs/nss:=
+	dev-libs/openssl:=
+	<dev-libs/rocksdb-7.9.3:=
+	dev-libs/thrift:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-vcs/git
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-libs/libcap-ng:=
+	sys-libs/libnbd
+	sys-libs/ncurses:0=
+	virtual/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace:0/1 )
+	fuse? ( sys-fs/fuse:3= )
+	jaeger? (
+		dev-cpp/nlohmann_json:=
+		<dev-cpp/opentelemetry-cpp-1.10:=[jaeger,prometheus]
+	)
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	nvmeof? ( net-libs/grpc:= )
+	parquet? ( <dev-libs/apache-arrow-24.0.0:=[parquet] )
+	pmdk? (
+		>=dev-libs/pmdk-1.10.0:=
+		sys-block/ndctl:=
+	)
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	rdma? ( sys-cluster/rdma-core:= )
+	spdk? ( dev-util/cunit )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] )
+	tcmalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/yasm )
+	app-alternatives/cpio
+	dev-debug/valgrind
+	>=dev-build/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/gperf
+	dev-util/ragel
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/util-linux
+	sys-apps/which
+	app-alternatives/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	jaeger? (
+		app-alternatives/yacc
+		app-alternatives/lex
+	)
+	test? (
+		dev-util/cunit
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[lvm]
+	app-alternatives/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		dev-python/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+	selinux? ( sec-policy/selinux-ceph )
+"
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch"
+	"${FILESDIR}/ceph-17.2.0-findre2.patch"
+	"${FILESDIR}/ceph-17.2.0-osd_class_dir.patch"
+	# https://bugs.gentoo.org/866165
+	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
+	# https://bugs.gentoo.org/868891
+	"${FILESDIR}/ceph-18.2.0-cyclic-deps.patch"
+	# https://bugs.gentoo.org/907739
+	"${FILESDIR}/ceph-18.2.0-cython3.patch"
+	# https://bugs.gentoo.org/936889
+	"${FILESDIR}/ceph-18.2.4-liburing.patch"
+	"${FILESDIR}/ceph-18.2.4-spdk.patch"
+	"${FILESDIR}/ceph-19.2.1-isa-l.patch"
+	"${FILESDIR}/ceph-19.2.2-QATAPP-Fix-clang-16-compiling-issue.patch"
+	"${FILESDIR}/ceph-19.2.2-add-option-to-build-agains-system-opentelemetry.patch"
+	"${FILESDIR}/ceph-19.2.2-common-add-dependency-on-legacy-option-headers.patch"
+	"${FILESDIR}/ceph-19.2.2-rbd-make-enums-statically-castable.patch"
+	"${FILESDIR}/ceph-19.2.2-rgw-remove-FMT_STRING-to-fix-clang-20-build-failure.patch"
+	# https://bugs.gentoo.org/960812
+	"${FILESDIR}/ceph-19.2.2-silent-unused-variable-warning.patch"
+	"${FILESDIR}/ceph-19.2.2-src-mgr-make-enum-statically-castable.patch"
+	"${FILESDIR}/ceph-20.1.0-nvmeof.patch"
+	"${FILESDIR}/ceph-20.1.1-always-lua.patch" # bug 934599
+	"${FILESDIR}/ceph-20.1.1-boost-url-linking.patch"
+	# https://bugs.gentoo.org/969039
+	"${FILESDIR}"/ceph-20.2.4-boost-1.89-1.patch
+	"${FILESDIR}"/ceph-20.1.1-boost-1.89-{2,3}.patch
+	"${WORKDIR}/ceph-20.2.0-libarrow-20.0.0.patch"
+	"${FILESDIR}/ceph-20.2.1-boost-1.90-intrusive_ptr_fixes.patch"
+	"${FILESDIR}/ceph-20.2.1-rgw_error_handler.patch"
+	"${FILESDIR}/ceph-20.1.1-libcxx-exp-features.patch"
+	"${FILESDIR}/ceph-20.2.1-clang++-libcxx.patch"
+	"${FILESDIR}/ceph-20.2.4-clang++-libcxx.patch"
+	"${FILESDIR}/ceph-20.2.1-qatzip-werror.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	lua_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	if use system-boost; then
+		rm -r src/boost || die # ensure use system boost, reduce QA spam
+	fi
+
+	# ensure system-libs, reduce QA spam (FIXME: fails w/o zstd subdir)
+	rm -r src/{arrow,c-ares,jaegertracing/opentelemetry-cpp,rocksdb,utf8proc} || die
+
+	cmake_src_prepare
+
+	if ! use systemd; then
+		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
+			| xargs --null sed \
+			-e '/^from ceph_volume.systemd import systemctl/ d' \
+			-i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
+		-i src/CMakeLists.txt || die
+
+	if use spdk; then
+		# https://bugs.gentoo.org/871942
+		sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die
+		# unittests fail to build (??!?)
+		sed -i -e 's/CONFIG_UNIT_TESTS=y/CONFIG_UNIT_TESTS=n/' src/spdk/CONFIG || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local mycmakeargs=(
+		# Don't break installed bundled libraries (bug #942680)
+		-DBUILD_SHARED_LIBS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
+		-DWITH_CEPHFS:BOOL=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
+		-DWITH_DPDK:BOOL=$(usex dpdk)
+		-DWITH_SPDK:BOOL=$(usex spdk)
+		-DWITH_FUSE:BOOL=$(usex fuse)
+		-DWITH_LTTNG:BOOL=$(usex lttng)
+		-DWITH_GSSAPI:BOOL=$(usex kerberos)
+		-DWITH_GRAFANA:BOOL=$(usex grafana)
+		-DWITH_MGR:BOOL=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
+		-DWITH_OPENLDAP:BOOL=$(usex ldap)
+		-DWITH_PYTHON3:STRING=3
+		-DWITH_RADOSGW:BOOL=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
+		-DWITH_SYSTEMD:BOOL=$(usex systemd)
+		-DWITH_TESTS:BOOL=$(usex test)
+		-DWITH_LIBURING:BOOL=$(usex uring)
+		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
+		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
+		-DWITH_XFS:BOOL=$(usex xfs)
+		-DWITH_ZBD:BOOL=$(usex zbd)
+		-DENABLE_SHARED:BOOL=ON
+		-DALLOCATOR:STRING=$(usex tcmalloc tcmalloc libc)
+		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')")
+		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
+		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
+		-DWITH_SYSTEM_ZSTD:BOOL=ON
+		-DWITH_RDMA:BOOL=$(usex rdma)
+		-DWITH_SYSTEM_UTF8PROC:BOOL=ON
+		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
+		-DWITH_SYSTEM_FMT=ON
+		-Wno-dev
+		-DCEPHADM_BUNDLED_DEPENDENCIES=none
+		-DWITH_NVMEOF_GATEWAY_MONITOR_CLIENT:BOOL=$(usex nvmeof)
+		-DWITH_SYSTEM_ARROW:BOOL=ON
+	)
+
+	# this breaks when re-configuring for python impl
+	if [[ ${EBUILD_PHASE} == configure ]]; then
+		mycmakeargs+=(
+			-DWITH_JAEGER:BOOL=$(usex jaeger)
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet)
+		)
+		if use jaeger; then
+			mycmakeargs+=( -DWITH_SYSTEM_OPENTELEMETRY:BOOL=ON )
+		fi
+	else
+		mycmakeargs+=(
+			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
+			-DWITH_JAEGER:BOOL=OFF
+			# don't want to warn about unused CLI when reconfiguring for python
+			-DCMAKE_WARN_UNUSED_CLI:BOOL=OFF
+		)
+	fi
+
+	# conditionally used cmake args
+	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
+	use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) )
+
+	if use amd64 || use x86; then
+		local flag
+		for flag in "${CPU_FLAGS_X86[@]}"; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=(
+						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					)
+				;;
+				*) mycmakeargs+=(
+						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
+					);;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	# https://bugs.gentoo.org/927066
+	filter-lto
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+src_compile() {
+	export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs)
+	cmake_build all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	cmake_build src/pybind/CMakeFiles/cython_modules
+	cmake_build cephadm
+}
+
+src_install() {
+	python_foreach_impl python_install
+
+	python_setup
+	cmake_src_install
+
+	python_optimize
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	local bundled_init="${ED}/etc/init.d/ceph"
+	[[ -f "${bundled_init}" ]] && {
+		rm "${bundled_init}" || die
+	}
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r14" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sudoers.d
+	doins sudoers.d/*
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	DESTDIR="${ED}" cmake_build src/pybind/install
+	DESTDIR="${ED}" cmake_build src/cephadm/install
+
+	python_optimize
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/ceph/files/ceph-20.1.1-libcxx-exp-features.patch b/sys-cluster/ceph/files/ceph-20.1.1-libcxx-exp-features.patch
new file mode 100644
index 000000000000..28cacd28cb66
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-20.1.1-libcxx-exp-features.patch
@@ -0,0 +1,31 @@
+From: Felix W. (65278) <felix@zeynix.de> 
+Date: Fri, 11 Sep 2026 15:30:00 +0200
+Subject: [PATCH] cmake: add clang/libcxx experimental features for object_io_exerciser
+
+object_io_exerciser uses std::execution, which is an experimental
+feature in libcxx. This patch adds -fexperimental-library should
+the symbol std::execution::seq not exist if you're using clang.
+This possibly breaks on win32, but I have no way of testing.
+
+Index: ceph-20.2.4/src/common/io_exerciser/CMakeLists.txt
+===================================================================
+--- ceph-20.2.4.orig/src/common/io_exerciser/CMakeLists.txt
++++ ceph-20.2.4/src/common/io_exerciser/CMakeLists.txt
+@@ -26,3 +26,17 @@ if(TBB_FOUND)
+   message(STATUS "Linking to TBB for implementations of <execution>.")
+   target_link_libraries(object_io_exerciser TBB::tbb)
+ endif(TBB_FOUND)
++
++
++# libcxx std::execution is experimental. If compiling with clang++
++# and the symbol std::execution::seq does not exist, we set 
++# -fexperimental-library to set _LIBCPP_HAS_EXPERIMENTAL_PSTL:
++# https://github.com/llvm/llvm-project/blob/llvmorg-22.1.8/libcxx/include/execution#L48
++include(CheckCXXSymbolExists)
++check_cxx_symbol_exists("std::execution::seq" execution HAVE_EXECUTION_SEQ)
++
++if((NOT HAVE_EXECUTION_SEQ) AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
++  target_compile_options(object_io_exerciser 
++	  PRIVATE "-fexperimental-library"
++  ) 
++endif()
diff --git a/sys-cluster/ceph/files/ceph-20.2.1-clang++-libcxx.patch b/sys-cluster/ceph/files/ceph-20.2.1-clang++-libcxx.patch
new file mode 100644
index 000000000000..93f51c28b5dc
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-20.2.1-clang++-libcxx.patch
@@ -0,0 +1,185 @@
+From: Felix W. (65278) <felix@zeynix.de> 
+Date: Fri, 11 Sep 2026 15:30:00 +0200
+Subject: [PATCH]: ceph-20.2.1 clang/libcxx compat
+
+libcxx is internally c++20, and has no support for features which
+have been deprecated, such as std::result_of, or abi compatibility
+namespacing like std::__cxx11. I've tried to keep the patchset
+compatible with libstdc++ here, but I can't test all combinations.
+
+Apart of that, clang++ has trouble inferring types (or is stricter
+about typing), meaning that types had to be more explicit. This
+should not hurt compiling with g++ in any way.
+
+I am not certain about the type ceph::coarse_real_time::clock and 
+ceph::real_time::clock should take when printed to cout. I've decided
+to cast them to time_t because the code is there and it works.
+
+Index: ceph-20.2.1/src/dmclock/support/src/indirect_intrusive_heap.h
+===================================================================
+--- ceph-20.2.1.orig/src/dmclock/support/src/indirect_intrusive_heap.h
++++ ceph-20.2.1/src/dmclock/support/src/indirect_intrusive_heap.h
+@@ -60,7 +60,7 @@ namespace crimson {
+ 
+     static_assert(
+       std::is_same<bool,
+-      typename std::result_of<C(const T&,const T&)>::type>::value,
++      typename std::invoke_result<C,const T&,const T&>::type>::value,
+       "class C must define operator() to take two const T& and return a bool");
+ 
+     static_assert(K >= 2, "K (degree of branching) must be at least 2");
+Index: ceph-20.2.1/src/s3select/include/s3select_parquet_intrf.h
+===================================================================
+--- ceph-20.2.1.orig/src/s3select/include/s3select_parquet_intrf.h
++++ ceph-20.2.1/src/s3select/include/s3select_parquet_intrf.h
+@@ -1045,7 +1045,7 @@ class SerializedRowGroup : public RowGro
+ 
+     const CryptoContext ctx {
+         col->has_dictionary_page(),
+-        row_group_ordinal_,
++        static_cast<int16_t>(row_group_ordinal_),
+         static_cast<int16_t>(i),
+         meta_decryptor_factory,
+         data_decryptor_factory,
+Index: ceph-20.2.1/src/rgw/driver/rados/rgw_reshard.cc
+===================================================================
+--- ceph-20.2.1.orig/src/rgw/driver/rados/rgw_reshard.cc
++++ ceph-20.2.1/src/rgw/driver/rados/rgw_reshard.cc
+@@ -1658,7 +1658,7 @@ int RGWReshard::process_entry(const cls_
+       ldpp_dout(dpp, 20) <<  __func__ <<
+ 	": INFO: reshard reduction for bucket \"" <<
+ 	entry.bucket_name << "\" will not proceed until " <<
+-	(when_queued + timespan) << dendl;
++	ceph::real_clock::to_time_t(when_queued + timespan) << dendl;
+ 
+       return 0;
+     }
+Index: ceph-20.2.1/src/rgw/rgw_bucket_logging.cc
+===================================================================
+--- ceph-20.2.1.orig/src/rgw/rgw_bucket_logging.cc
++++ ceph-20.2.1/src/rgw/rgw_bucket_logging.cc
+@@ -491,7 +491,7 @@ int log_record(rgw::sal::Driver* driver,
+         return ret;
+       }
+     } else {
+-      ldpp_dout(dpp, 20) << "INFO: record will be written to current logging object '" << obj_name << "'. will be comitted at: " << time_to_commit << dendl;
++      ldpp_dout(dpp, 20) << "INFO: record will be written to current logging object '" << obj_name << "'. will be comitted at: " << ceph::coarse_real_time::clock::to_time_t(time_to_commit) << dendl;
+     }
+   } else if (ret == -ENOENT) {
+     // try to create the temporary log object for the first time
+Index: ceph-20.2.1/src/rgw/driver/rados/rgw_sal_rados.cc
+===================================================================
+--- ceph-20.2.1.orig/src/rgw/driver/rados/rgw_sal_rados.cc
++++ ceph-20.2.1/src/rgw/driver/rados/rgw_sal_rados.cc
+@@ -2820,7 +2820,7 @@ int RadosObject::set_obj_attrs(const Dou
+   const bool log_op = flags & rgw::sal::FLAG_LOG_OP;
+   // make a tiny adjustment to the existing mtime so that fetch_remote_obj()
+   // won't return ERR_NOT_MODIFIED when syncing the modified object
+-  const auto mtime = log_op ? state.mtime + std::chrono::nanoseconds(1) : state.mtime;
++  const auto mtime = log_op ? static_cast<ceph::real_time>(state.mtime + std::chrono::nanoseconds(1)) : static_cast<ceph::real_time>(state.mtime);
+   return store->getRados()->set_attrs(dpp, rados_ctx,
+ 			bucket->get_info(),
+ 			get_obj(),
+Index: ceph-20.2.1/src/common/io_exerciser/ObjectModel.cc
+===================================================================
+--- ceph-20.2.1.orig/src/common/io_exerciser/ObjectModel.cc
++++ ceph-20.2.1/src/common/io_exerciser/ObjectModel.cc
+@@ -76,6 +76,8 @@ void ObjectModel::applyIoOp(IoOp& op) {
+           if (writeOp.offset[i] + writeOp.length[i] > contents.size()) {
+             contents.resize(writeOp.offset[i] + writeOp.length[i]);
+           }
++	  // Note: std::execution::seq is an experimental feature in libcxx.
++	  // Use -fexperimental-library when compiling.
+           std::generate(std::execution::seq,
+                         std::next(contents.begin(), writeOp.offset[i]),
+                         std::next(contents.begin(),
+Index: ceph-20.2.1/src/rgw/driver/d4n/d4n_directory.cc
+===================================================================
+--- ceph-20.2.1.orig/src/rgw/driver/d4n/d4n_directory.cc
++++ ceph-20.2.1/src/rgw/driver/d4n/d4n_directory.cc
+@@ -182,7 +182,12 @@ int BucketDirectory::zscan(const DoutPre
+       return -ec.value();
+     }
+ 
++// std::__cxx11 avoids abi mismatch in libstdc++. It does not apply to other stdlibs.
++#ifdef __GLIBCXX__
+     std::vector<boost::redis::resp3::basic_node<std::__cxx11::basic_string<char> > > root_array;
++#else
++    std::vector<boost::redis::resp3::basic_node<std::basic_string<char> > > root_array;
++#endif
+     if (resp.has_value()) {
+       root_array = resp.value();
+       ldpp_dout(dpp, 20) << "BucketDirectory::" << __func__ << "() aggregate size is: " << root_array.size() << dendl;
+Index: ceph-20.2.1/src/common/io_exerciser/IoSequence.cc
+===================================================================
+--- ceph-20.2.1.orig/src/common/io_exerciser/IoSequence.cc
++++ ceph-20.2.1/src/common/io_exerciser/IoSequence.cc
+@@ -9,52 +9,52 @@ std::ostream& ceph::io_exerciser::operat
+                                              const Sequence& seq) {
+   switch (seq) {
+     case Sequence::SEQUENCE_SEQ0:
+-      os << "SEQUENCE_SEQ0";
++      os << static_cast<std::string>("SEQUENCE_SEQ0");
+       break;
+     case Sequence::SEQUENCE_SEQ1:
+-      os << "SEQUENCE_SEQ1";
++      os << static_cast<std::string>("SEQUENCE_SEQ1");
+       break;
+     case Sequence::SEQUENCE_SEQ2:
+-      os << "SEQUENCE_SEQ2";
++      os << static_cast<std::string>("SEQUENCE_SEQ2");
+       break;
+     case Sequence::SEQUENCE_SEQ3:
+-      os << "SEQUENCE_SEQ3";
++      os << static_cast<std::string>("SEQUENCE_SEQ3");
+       break;
+     case Sequence::SEQUENCE_SEQ4:
+-      os << "SEQUENCE_SEQ4";
++      os << static_cast<std::string>("SEQUENCE_SEQ4");
+       break;
+     case Sequence::SEQUENCE_SEQ5:
+-      os << "SEQUENCE_SEQ5";
++      os << static_cast<std::string>("SEQUENCE_SEQ5");
+       break;
+     case Sequence::SEQUENCE_SEQ6:
+-      os << "SEQUENCE_SEQ6";
++      os << static_cast<std::string>("SEQUENCE_SEQ6");
+       break;
+     case Sequence::SEQUENCE_SEQ7:
+-      os << "SEQUENCE_SEQ7";
++      os << static_cast<std::string>("SEQUENCE_SEQ7");
+       break;
+     case Sequence::SEQUENCE_SEQ8:
+-      os << "SEQUENCE_SEQ8";
++      os << static_cast<std::string>("SEQUENCE_SEQ8");
+       break;
+     case Sequence::SEQUENCE_SEQ9:
+-      os << "SEQUENCE_SEQ9";
++      os << static_cast<std::string>("SEQUENCE_SEQ9");
+       break;
+     case Sequence::SEQUENCE_SEQ10:
+-      os << "SEQUENCE_SEQ10";
++      os << static_cast<std::string>("SEQUENCE_SEQ10");
+       break;
+     case Sequence::SEQUENCE_SEQ11:
+-      os << "SEQUENCE_SEQ11";
++      os << static_cast<std::string>("SEQUENCE_SEQ11");
+       break;
+     case Sequence::SEQUENCE_SEQ12:
+-      os << "SEQUENCE_SEQ12";
++      os << static_cast<std::string>("SEQUENCE_SEQ12");
+       break;
+     case Sequence::SEQUENCE_SEQ13:
+-      os << "SEQUENCE_SEQ13";
++      os << static_cast<std::string>("SEQUENCE_SEQ13");
+       break;
+     case Sequence::SEQUENCE_SEQ14:
+-      os << "SEQUENCE_SEQ14";
++      os << static_cast<std::string>("SEQUENCE_SEQ14");
+       break;
+     case Sequence::SEQUENCE_END:
+-      os << "SEQUENCE_END";
++      os << static_cast<std::string>("SEQUENCE_END");
+       break;
+   }
+   return os;
diff --git a/sys-cluster/ceph/files/ceph-20.2.1-qatzip-werror.patch b/sys-cluster/ceph/files/ceph-20.2.1-qatzip-werror.patch
new file mode 100644
index 000000000000..281ae76f00ed
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-20.2.1-qatzip-werror.patch
@@ -0,0 +1,22 @@
+From: Felix W. (65278) <felix@zeynix.de> 
+Date: Fri, 11 Sep 2026 15:30:00 +0200
+Subject: [PATCH] clang/qatzip: Do not Werror
+
+Werror in releases is always a mistake.
+Here, qatzip sets -Werror and -std=gnu99. This causes problems
+with clang because qatzip invariably uses features beyond gnu99,
+which cause clang to abort compilation.
+
+Index: b/src/qatzip/configure.ac
+===================================================================
+--- a/src/qatzip/configure.ac
++++ b/src/qatzip/configure.ac
+@@ -211,7 +211,7 @@ AS_IF([test ! -z "${ICP_ROOT}"],
+ 
+ #check for compile flags
+ AC_MSG_CHECKING([cflags])
+-CFLAGS+=' -Wall -Werror -std=gnu99 -pedantic \
++CFLAGS+=' -Wall -std=gnu99 -pedantic \
+           -fstack-protector-strong -fPIE -fPIC \
+           -fno-delete-null-pointer-checks -fwrapv'
+ AS_IF([test "x${CC}" = "xgcc"], [CFLAGS+=' -fno-strict-overflow'], [])
diff --git a/sys-cluster/ceph/files/ceph-20.2.4-clang++-libcxx.patch b/sys-cluster/ceph/files/ceph-20.2.4-clang++-libcxx.patch
new file mode 100644
index 000000000000..3dd4790a52f7
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-20.2.4-clang++-libcxx.patch
@@ -0,0 +1,40 @@
+From: Felix W. (65278) <felix@zeynix.de> 
+Date: Fri, 11 Sep 2026 15:30:00 +0200
+Subject: [PATCH] ceph-20.2.4: fix CephKeyServer gentoo patch
+
+ceph-20.2.1-boost-1.90-intrusive_ptr_fixes.patch introduces fixes
+around boost 1.90 and intrusive_ptr. Meanwhile, in ceph 20.2.4,
+CephKeyServer now has an intrusive_ptr reference to CephContext.
+
+This does not work, because clang++ has no idea how to find the
+helper functions in ceph::common::CephContext. So while templating
+is fine, finding intrusive_ptr_{add_ref,release} can't work.
+Frankly, I have no idea how g++ does it and it should not work.
+
+I've made the namespace of CephContext explicit and included the
+relevant header.
+
+Index: ceph-20.2.4/src/auth/cephx/CephxKeyServer.h
+===================================================================
+--- ceph-20.2.4.orig/src/auth/cephx/CephxKeyServer.h
++++ ceph-20.2.4/src/auth/cephx/CephxKeyServer.h
+@@ -20,6 +20,8 @@
+ #include "auth/KeyRing.h"
+ #include "CephxProtocol.h"
+ #include "common/ceph_mutex.h"
++#include "common/ceph_context.h"
++
+ #include "include/common_fwd.h"
+ 
+ namespace ceph { class Formatter; }
+@@ -152,9 +154,8 @@ struct KeyServerData {
+ WRITE_CLASS_ENCODER(KeyServerData)
+ WRITE_CLASS_ENCODER(KeyServerData::Incremental)
+ 
+-
+ class KeyServer : public KeyStore {
+-  boost::intrusive_ptr<CephContext> kscct;
++  boost::intrusive_ptr<ceph::common::CephContext> kscct;
+   KeyServerData data;
+   std::map<EntityName, CryptoKey> used_pending_keys;
+   mutable ceph::mutex lock;
diff --git a/sys-fs/mtd-utils/mtd-utils-2.3.1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.3.1.ebuild
index 149d8dbf1334..1eef7098233d 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.3.1.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="+lzo selinux +ssl test ubifs xattr +zstd"
 REQUIRED_USE="ubifs? ( lzo ssl xattr zstd )"
 RESTRICT="!test? ( test )"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 32a52051b828..5635234e9b43 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,10 @@ DIST gentoo-kernel-6.1.187-1.amd64.gpkg.tar 75581440 BLAKE2B 66f8f3ed6f0b8b5b3d3
 DIST gentoo-kernel-6.1.187-1.arm64.gpkg.tar 69171200 BLAKE2B 52054b1b186bde85799c59662f6ce0c7fc85e149525423f5cc9b36f7d223901fc73a0fc862f61054d663a6d06b08fdfa2717ce3f9f8f4c46fb9bbca5b2804c4b SHA512 9b9ea1e42aa0763c54a6b1b0c0bad49919b914d84c56f94df3024daff6b043e1fabaa4fbe278c718a4080f9184c08591b465c7644a5134129e34409e9ea40d0d
 DIST gentoo-kernel-6.1.187-1.ppc64le.gpkg.tar 62638080 BLAKE2B baebfc494bb568a99016067d7227129cfce808ed6edccf6ec2c03badf7162b826606420c79feb91d3c58a8e2e25e2a25c960ce90154790bef66d09f3a276178c SHA512 b299e33cfadfb2563c823df2aee117a18b905f8b1ea531208252f68dc5936e76a0a1177faecf95d3cab364209a9c96da030da4dcd1db4f64c4079849ebdf52ce
 DIST gentoo-kernel-6.1.187-1.x86.gpkg.tar 64829440 BLAKE2B 108b3455445ddded1e4a075b48a97c9401294eec411215287ff8e244ce205eb5c408fe921886b296efafed550678bf19ec9d85e7ae450f38f5e9789fad19341f SHA512 84a9aac73b22380cbf9b939b98270140667803bb085cced8fe239183c5e5941a726151d6e0ff9dfc2023607cb2ce2852a0c617793aa63b0d8d1938e41c2531df
+DIST gentoo-kernel-6.1.188-1.amd64.gpkg.tar 75591680 BLAKE2B 811b72f54ec7e6e7e0892f86b69f161829c0cde105ed5125200fe4d94b34cc0f9f36c30bfb567b04fa6cebf0324e36073e4c3484044b0902311f33f6b3fe657c SHA512 e879e65f81ab8065845fbeb782ff4c2bfa50c5633bbb7fda635ec22b25d2af4e2bef908f7cf6d8da169553616feb2acae204f318927a1da026076450df069a53
+DIST gentoo-kernel-6.1.188-1.arm64.gpkg.tar 69191680 BLAKE2B c174b8c5f30279fd9f88e39d784bbff8a0c663a2ac6e6c96e2100d17252691be0bf9e12868c7348ad6830e76664c58b9b4991ab0583b442e608babe9a4f7338f SHA512 4f5e8f8ab9cc9221e7458567ebffffe0c0c06ea11a43d0c388d168346459ae35a1dea55294354acf6481e704fe855fb26d62be1dd00589fde15a92b036a8447c
+DIST gentoo-kernel-6.1.188-1.ppc64le.gpkg.tar 62668800 BLAKE2B c99ebe8cdb2d7dd8e723ccfd5b021657f2c37137acc426024f85926c7ac4bbb591649e05b041562a3401ea477c7ee030cb5acfcac07617926ff0a46bb1882344 SHA512 08e19f0961c2646e5af6c554d4eb63e2832c94c213ef9cb127b1d4b21a80771aac43b38a7bfc7bbc8aa9c2fd84c77c96c64211ed5d2df1989fc23b16a93167a0
+DIST gentoo-kernel-6.1.188-1.x86.gpkg.tar 64849920 BLAKE2B a486d45dfff9d8bf81382748c8059f7713847d8f0be40b924aa8a038c8d25d60b89ce14f6eb68dcd45877e79b52e0d3078d4af247b333d9649cb65acbe837277 SHA512 1f3a27d5ec24f8023f37828cb24a64b802015601dd6de54d32e4ce376b25b5cfb47a1fb71170aead62105107f96cad7e3b0f44bf69a3bf27b21008fd7548e532
 DIST gentoo-kernel-6.12.107-1.amd64.gpkg.tar 328058880 BLAKE2B 8aa2bc964651fe91874fc3fda206e0288b24115085c6c593a71e21e462c27ab6c362fceda74f6e5f0b9289835d638766087f9b4d6dc12bd645d08e1cb09ec0a9 SHA512 031563b3703184b3ce9582d177522da5edadcc16423ba14f34eb77d6720b4369025ad860cd4e41241207ffef4fa661a76dda69e1e83db7e710942f3bb85acd3a
 DIST gentoo-kernel-6.12.107-1.arm64.gpkg.tar 296550400 BLAKE2B f50641f6bc001032196329d31ceec4ea8dcf3ef86123400c12ab616cbb8b28dad4fd60354d6cc8188ce5c5d96f6a446c5422c72e1ce1fbb6d816c55a69cf487b SHA512 1f7ddf1d433b063cf26921635262c4e949cf4aab5f9bbb1dfadf551aba35ee98fb4f33c0b5ac41e9ce80c3b6dcd12e907b57d6f808b3dc58a1a9cd6e4b4a446c
 DIST gentoo-kernel-6.12.107-1.ppc64le.gpkg.tar 74035200 BLAKE2B 6ada1296df2661c3cd58e32d553e8b96f2b8829733e03332d12359602a3587ff09e5bca29675e1303cd9ca3a987e5b0891c6124edb95f99f4db87f1e4063c98c SHA512 4eedb716b2befb682c53266b8a6080edcf68bac7ee0d3cbf9479a0e0176e2c8fa4496e2da33c5832d1459dc8698568b7e7465d9cb7d23b2e6cbf941ea9d32c2d
@@ -18,6 +22,10 @@ DIST gentoo-kernel-6.12.109-1.amd64.gpkg.tar 328058880 BLAKE2B fa66b738dbcab8555
 DIST gentoo-kernel-6.12.109-1.arm64.gpkg.tar 296622080 BLAKE2B 6cedba2133e7e635c9985d6a4c20f73ca6d7930236538474500a67a2a539cf27572b4971cfe10562bb297d680060ccc67cb976a73d99ea345dcedd61b436e693 SHA512 2bddea47a1f4c822f61f36ceea58de34ced5ea98f0a4cf77dc52e84d4eca1dbc840871a231c4362a98b0f15ac187888c9033d3d16b7a21737682e646ef52c1cd
 DIST gentoo-kernel-6.12.109-1.ppc64le.gpkg.tar 74035200 BLAKE2B fad0c81cba92696940c0e0be6b801525daa64ee58acce8c631624737bb97bf72380e55be671d15f3b4626da4265f2f4dffd29bef5a534eee8ed3111708884e6f SHA512 67844523e4d0e225ce3e78433d4717f0cec427dca3989af83fc4b1b92b77defdadc517b304456698c665d48f92cb282a71c8e0a258077ab6b629e5b175c2a80f
 DIST gentoo-kernel-6.12.109-1.x86.gpkg.tar 77752320 BLAKE2B ee010c78cf3550618e3b5d0f0799b62755b47bf0216b0faa73b4a842f241828c4b049cece988d3e353074632cf9885985cb6a821fd3f2c393ab079741d99e915 SHA512 09a046e3c244a275473f74d3ad69335f2b861e632c8550b6a4e3973d6e26810e0f869fb92d2fdb3f0124a92ba293e46447d38a9758b7e93c22db0e77288df7ba
+DIST gentoo-kernel-6.12.110-1.amd64.gpkg.tar 328212480 BLAKE2B b64fe50dcfff85b8584ea87368a666780104aa2252391224c6efd43b3f3fe16ad77f3cf8abac71f39c639559a037f2a4fe5ac0f598a0656f8ee78ffc97fe3890 SHA512 3469a8ba8564f8ab3b62c3fa8af3fdfe4415778bde7fb975e89d01993e2d87b8f87025e339639b185752c5e5ed032df730ed6e1b29c2d649bd029457a100842f
+DIST gentoo-kernel-6.12.110-1.arm64.gpkg.tar 296847360 BLAKE2B 25b16f5a215f75f2d149bbed61f2bbfefdca5d9b36fc63539f4b985bb4d253cae619ab0abb53cae3c977256278484dc64dc783d9f8e9aa8178572e44f22c6b79 SHA512 9323bd02e524796ffba9a584b5bcfa7431e6dc5ed253e7d52146d168c0e9e93b400a087e6da7d938f367ae1fcda620416b3299dd960fea00b38bd17e35242510
+DIST gentoo-kernel-6.12.110-1.ppc64le.gpkg.tar 74055680 BLAKE2B 8d82d3d46b8265ae144600ce09af88c9e681da68b722723e695fa13be489450dc98681eca00d903798ac4c2e6d635582cbffe2f96b039ae48b8deb66a6e7c9f6 SHA512 1f8d1f842d1b0afc7711c3bf9b3d16bc271ce37cae49d2c5a7f7b2faea27564b5e28c1439188e22fe141a24d85ad49184003930293363cc90d5e28bdc692edeb
+DIST gentoo-kernel-6.12.110-1.x86.gpkg.tar 77762560 BLAKE2B 69f4c0555f97e1d475984de91def4d126752e4a1abf41aae7a60d2c8800f025770e7029577c0fc06d2bfb02ea57158c2064028043ec02ae96e9edc397e016c16 SHA512 882adcc4ab5ea09aba82426d5eb7f8170c7b628a9b156156f20b26952aedc4f87410527e65eb6ec639763b6044fd03cc8e0686e39390f89e2e5dd21217595d32
 DIST gentoo-kernel-6.18.48-1.amd64.gpkg.tar 468224000 BLAKE2B 807638b23ea96b5b6fe5d89fcac9cf4ba057edbc3acbdf9b49b9599a0400352ee313779ac83451fea2a609feea11a36f5deb0dcd379a57a431011b04ed8bd170 SHA512 3ad793e8025548a742c1d1e80e11780339790f608fe547a7fb3839c189186fa19c1d86e40cac26b2be1a1878b7f0fbab89d4680890dc48b238ece7c3dd75244c
 DIST gentoo-kernel-6.18.48-1.arm64.gpkg.tar 453529600 BLAKE2B 561b7662a56d7d0ba1edb0a47f5fecc804c7ed9cea0efbb50760aff2969b6099af51fd6810521f77df20b1ba4a696db16888f907f9d4779c80444ed98ae42e5c SHA512 17cfb23479437f47734273a48232755158c6844424b880f9f8119124e171c3caacb8a69259457a404e73436eb55a4ddcaff98366421b257baf0291bd03b97595
 DIST gentoo-kernel-6.18.48-1.ppc64le.gpkg.tar 77240320 BLAKE2B 338a8703838936c4a6c22bfdcad1b3819d270e246529a8d3579700959f5a903308cf87bbad722ed2799d5bfb6c3d7722dea350cdc659655e147bbaaa4fa2122b SHA512 7b11c0f479d8e67c1149da924137797456329baada737bc3bd9e002a2c1eb82e7a67fdfcc422a6729c83ff39e4ee6a21444d4af225f244d3799e1a85e4975568
@@ -34,6 +42,10 @@ DIST gentoo-kernel-6.18.51-1.amd64.gpkg.tar 468264960 BLAKE2B d81268f870eb5ea2d3
 DIST gentoo-kernel-6.18.51-1.arm64.gpkg.tar 453621760 BLAKE2B 797c0b33dca64200d63e5c218710ba8ce1a974b2a8c51664a51ae4bfbf989b435b3feb72d2b9477e42371f02f3e41a17738385e6cb8dffe03c206c500f002297 SHA512 ddf5721c80525a4ec1936f516456f3744c2b887cfd8ff29590677932dcb5a0c9b2fb73c167bd7f09e881760fb4f02e01e19cab570848169b06c61639fe556142
 DIST gentoo-kernel-6.18.51-1.ppc64le.gpkg.tar 77291520 BLAKE2B 3103d6deabf33c509fd278c0750ec9fb934a69d45ee495277d444e33d34a8ee60af4725bf88da00e4afdecccf4bc69fd0b8348cdd51dc9d1f2ea6a365f944f99 SHA512 b7427d32eeee48f4ec38c54a8a1d4a58ad507c308d8e49b4df4ac593c467561010e039b6e8e7d6cdab36a3ad302b4d571bb7ffe392119a51f9d1984885bf54f8
 DIST gentoo-kernel-6.18.51-1.x86.gpkg.tar 83681280 BLAKE2B 34765a10847186ba40f1ef87a4f2a50d570c68d1498d7d9560786844d88ae66ec6cf515a0cc7c947a2dcd31e2b80f140df13cf1ca1448a9e91e97bb8c939dbcd SHA512 9cbd38b9252d63d6ef925e9afe68ac02516789d378c592d77a98b0f3f4c43ca2e4dff44134f434c88ba5153788bc62903bfd8207b1646fff2e2302c56f75a0c4
+DIST gentoo-kernel-6.18.52-1.amd64.gpkg.tar 468602880 BLAKE2B dd7086b8961b9c8cd385b1d734851a3f99e3de0c0dfd2099241deefe9b4b07ecc8b7dc0a42f4058dc923ca228888ba0f88abdda7d8227773acd7d2365f2667a6 SHA512 d013c9b03473be8b50bf8fe862e1c26662c46bf610cf6d57c1c53e13cfa0a28d70b02dec9f32101090c524337d7f0e57a9175825190efb7cec26fc9b657b0f00
+DIST gentoo-kernel-6.18.52-1.arm64.gpkg.tar 453888000 BLAKE2B 15a8c5a443ce016444789c0573cc853cfadb4ed6dfb9daaf4542a05c8319f68052992bef2102a73650b45e547639b7acd3530da19c5a18aaa7081db435997b3d SHA512 4a6c8714adbf3d8ad6704cc07ae83dbc7053cb89e578513421ca69095679b14124ce58b75a62580c0db25e10daf9b955dd5dba21bce03eb934657cbdee737c80
+DIST gentoo-kernel-6.18.52-1.ppc64le.gpkg.tar 77322240 BLAKE2B b7b0b6e4886ebc2d775b0bab62ac98aaf362b40fbfa2f38b63f7bf36e903f418cef15f46c21b7ef389cd11b6e335b782791f51127dbd5842b1cfd75332ee306c SHA512 3e4029e50c97645770a3c12dc6e2dc3aecdae77c161aac23909a78bcfc2a110525a7765d79539bb84e75fa1fa36cba1a1a7d75afcfc217ee0409186384eddc6e
+DIST gentoo-kernel-6.18.52-1.x86.gpkg.tar 83752960 BLAKE2B 55494ad7023f33af4b22c17e576b4ca796bfc93fd9c2c8b9aeb8d6b1c4a03f76062078540a387c54031f6c413df3e61d94df158485fb4246e18f99e3359fe870 SHA512 4fb56bb334e51a8ecc077ef81a4838ad6332e9e2744566825eb4e53a723945499ceaab956a80f8549cbb486488be0509c732ae1cc6b288ce706791c3cdc42adf
 DIST gentoo-kernel-6.6.155-1.amd64.gpkg.tar 292065280 BLAKE2B 09b58a57e09e41a0ac8be8ff9895c6594d3c5edf5291618b4294b988ddefc77b6ea4d31821df54d12130fb833b743635cf21acdb244c78785358422ae72e9b99 SHA512 edcc9f8b1f1709b38344aa639575fe0e51fd056552fa1e45f246dcc30dd149626b00cd2eb56339a8b8fb40916500d1a4c5c9ee7403a1b8aeecfbf6c72731f59d
 DIST gentoo-kernel-6.6.155-1.arm64.gpkg.tar 261027840 BLAKE2B 300caea989edf2f85e4b98edc79fb3aec3c935ead4eafabbbef3e20ceafea5adae9a5a8c8b76b732988a4cd91aee348d90a1fd407a8bcab900cdf2e3e36cfce3 SHA512 871f9c8f141aedc54cde08bf42c5a9cc35eb6ef62a7c4b7bb85bfb272e3fd512f75c7dbdbf338b9008ad594eb3e3a28bda3ec42c21938b1fe10f28f7ebf78881
 DIST gentoo-kernel-6.6.155-1.ppc64le.gpkg.tar 65331200 BLAKE2B c1ebc6c0b945c767f2c2871e484729d1dc94641df89a3d941eb2e4518f5f9bf5edcf4f82dbeb05ef3b4197ec5b85a69dd1f5ea7ae7518ced94f844b6fb0b82ad SHA512 b711f02d2597fd7ea3b7c8216b70d482f6c281f9ab5b1f9f594c686e9605ea0c65bc49a26751f113c0961662c25689829923e33bbd984b1852402363199f9ab1
@@ -42,6 +54,10 @@ DIST gentoo-kernel-6.6.156-1.amd64.gpkg.tar 292116480 BLAKE2B 9067ff69d8818219e8
 DIST gentoo-kernel-6.6.156-1.arm64.gpkg.tar 261048320 BLAKE2B 69f0cef7d7f7e8ad79765fdea0d86844ded4914cb125174e0fa601cfe405afd7122559eb6fd8b24e0b6c4a92d24c83ee50a3f08c0f8b231a9225147829a433f2 SHA512 efecdbfe8c485989286cce0c96fdadd6c8d541bf02f94ca1afedf37065ba0a4a8968cc0cc004ec69ff945bdad683ce9f6901f4961e4d0838904ce5757fa9caec
 DIST gentoo-kernel-6.6.156-1.ppc64le.gpkg.tar 65331200 BLAKE2B 15c31a6dc682bac8f75b0cc37ed74b8ef5c380b859a8249318860caddec3e6892e626d180c192b5ab02203a81b6b93fe9c93095f079e6db6472a5904fe01ce10 SHA512 fe636d8220e5cfd4acf519d3b92c8391bf234706794978371bb12ce64d93e440fbfe769dd914866813d003c90a22c7a6e4840ccf62a9443379ecbeaf1e705a6c
 DIST gentoo-kernel-6.6.156-1.x86.gpkg.tar 68659200 BLAKE2B a08f4ba4907f6f0781e9cf6b2fb2495a1b6e236abaa1cd8c9fc71e325f108e880da8a8162a1568f9d99e5aa502c046afd6638fc15c1310b1c38b5dfd88e6a177 SHA512 e4201d3cedb3e5e793e92b10892e647bfb287299387f535da988e33b46b9fe04ae466c8f377fb78fe3cf38a605f4e7823d4ea4f71971ccbd764d4445c71755db
+DIST gentoo-kernel-6.6.157-1.amd64.gpkg.tar 292147200 BLAKE2B c2b0f4e63550f9fee42c396ba1081b6ace28d01fa4e6bbf9c7f19f34bad641e766d81a7305a304f722b8609a29c58b86665f45650dcf83bd878681210c51ca26 SHA512 772d9eb65a6a58fad9cec2b595a107243e69918fbdf4b6e6a3975bff38043ca61dc564e911cd2d38dec1bef68dd86932179e801146002bc761114231e207eb06
+DIST gentoo-kernel-6.6.157-1.arm64.gpkg.tar 261160960 BLAKE2B a76b38b5e2a496c6c63913650d37755d6cc95f4d9075ac9b2f4898b4f7d340ed8c6a5b4ebef9775efc7a2664891af084b0a94eef35dfc6da7929e9689c79298f SHA512 8cad93f8d29ac46dca9824847c75570b651da68afce6474fd0c8f97367f88267453af424519fc3b9d4408ddea9c6e325679cf5067a286cf78766a938f72ef44b
+DIST gentoo-kernel-6.6.157-1.ppc64le.gpkg.tar 65372160 BLAKE2B 91560f7feb1d1741eb64c53d920de608bc492ddb3d49a78892fe800c72dce21fa3228fbf42e063c44554154b331ec5aae094e2d601a521d897f8bd4386b93a7e SHA512 cbbe6f6bfe8ff250907179f6fd0e3e0933e7025662cb7f1a3e9915b882f35db0d9effe45fd0dc50df1680c66240f5e233fd7586d786b15a0fdb50242531c6d6c
+DIST gentoo-kernel-6.6.157-1.x86.gpkg.tar 68689920 BLAKE2B c9b19ae987c143a6f6246223aa9a8669b36722601c8721d4575bbf946aeaaf82013d61b98c8ba2ed455ae428f5eee2f743296cc7cec7d3ecbd02138fc4aff0ae SHA512 33ffec5ac72026a89cd8c3ce0774ab6c365b2d22775e96d8b402774c8b7853ef5ea198321454beaaf9c52a5308ff2ef2d19e8eeb443ffeb8205f42e145dfee15
 DIST gentoo-kernel-7.1.12-1.amd64.gpkg.tar 360120320 BLAKE2B 85953b93a1f014f66299f427f6a54d00e2a04351aca6e45f45ea235c271966f7c4416a4fbab5989da2d603d1f36502ca6b3371b1e57183bce1052b742ff449cc SHA512 52598e002cff3b1e0960fead7fd0278a97aeb71188664284ad53ee61ee0f225f4dc66555c9b9cd9f4afb3e5b16e14c19e30106000c9b9851693fd956d9d0044b
 DIST gentoo-kernel-7.1.12-1.arm64.gpkg.tar 331622400 BLAKE2B 43bbf39938f7109ff84d1c7f5504746d7e0131a2a40081c4ec2a505513a66bd52a0a858811235c8fc7a35617eee3f1e549bc023fa4d21d3970c33fa5f4113ce8 SHA512 19d2830e910881df21ef266b582524b9a8dd0ac861b5b0fc60d43ae5d65e00bde986fdd3642a065ea445d45d9211e928214c9a6ebf3fa5846398be3e97a6a0a1
 DIST gentoo-kernel-7.1.12-1.ppc64le.gpkg.tar 79104000 BLAKE2B 381826cb4c18becc65b2c23442d723b83deee44afa8678e692eb459c7ac2094961e83914d970ce7d72ead2a6cd8a4ca4bb8bd55b05594db7cdc6d226da707530 SHA512 0fd466452bd109475a7c7cbb6b16032a4dd0a47665f5e46679af1594be806a443925be11afea9a27aad5dbb9ac3987c1eb49503740b577aaec430c14a9d83f6f
@@ -66,6 +82,10 @@ DIST gentoo-kernel-7.2.5-1.amd64.gpkg.tar 363151360 BLAKE2B 592915ade584723e8a10
 DIST gentoo-kernel-7.2.5-1.arm64.gpkg.tar 334417920 BLAKE2B 4249ecbfa81e572726f17b714a457967a12bcc807daa9c1a5dd388a06bdcb19a3236077826281f4c90c28b70a35d4aef26a895768eb14e618ebb1dd4c130520b SHA512 b722f379ba892646958d228b3e7efa8493b6173e1424451886368900f2f9702b916fae49c5703d49f746ec1616937f08fd2cd9118a17cd5aa96a24dc9cbf1d3d
 DIST gentoo-kernel-7.2.5-1.ppc64le.gpkg.tar 79861760 BLAKE2B f380d88d74711b574c5f19249311b09cff4d7762833b1ba4d1b5722bb2771708a667e62d7c9f53c1eb8baf1cbfc65d7fccb450b7e15cb0beb20804d8d68c215a SHA512 fe7a82e2b278e8ab3d8b13541540045bce0f8d5b3c1b630a7c4fccfd8f7265950633f81b893ca47943c0f6a018a32efc85f90ad378b10e38c9b560709207c684
 DIST gentoo-kernel-7.2.5-1.x86.gpkg.tar 87900160 BLAKE2B 04644651dc0c36bdc3d15ae4cfc6264200580d8e6cad1eac95e548a04b47deca403306d3c86a164947e736741d2d53031153d274b3cc00b2b748af6ee97db36c SHA512 56dc85a80b01d6f70d2b9841a2eaafa5fa6a614169b362db403e58226d498fa0a22adc0b438fa7c6a57bb5c7510c7f1fabb4e182d355df3cc5c00aa3dfd1ef8a
+DIST gentoo-kernel-7.2.6-1.amd64.gpkg.tar 363274240 BLAKE2B a76a0c35fd2fb01f5196c90ae8fec65541f891b1bcb4b42f9570b9ebca280e6ec0a48a7dda743b49c80899dff71c9c003647d57c2dd613a78afd58b62f57662c SHA512 8f1654c6161dfcd515b272804ee2f085b51a5aaf76427180c73c1e513e2f91e479e3fc18ab57f16701868ecde98450a0eab9f1e9af5ec0a74e5682917990094c
+DIST gentoo-kernel-7.2.6-1.arm64.gpkg.tar 334612480 BLAKE2B d4412a03f7296d442b3dca96eccd582331d98313fe47154dda89ac76ab26db16254ba40fd4dfcdb00dd2dcd42134c67b4dac4cf83de3cc329cb832396117be7d SHA512 4fbe1a2e6613eb40201407ff729b459cc227632dbdb44171c4daae78545b7b20b752927b271d7b6c1861e02c2abfb7cab68c26a39d39ff221a63e572e06e717c
+DIST gentoo-kernel-7.2.6-1.ppc64le.gpkg.tar 79892480 BLAKE2B 7ff134e48ca2853db11ff3156689ea19873b8cdd92a1bd4252cc4191894ed5bdad5e43a8989844f87fac0b203c2d5e111801c9a8c56e264f8736603de1e32aab SHA512 dc7821ba1dad3b512c0a20ddb105fe44ebc0d18c3c02cc65d403be3673a233f194455b0c77734ae4fdf3b3ed26e345b6603327d0e300fa9d663afdd6e8a1b4c9
+DIST gentoo-kernel-7.2.6-1.x86.gpkg.tar 87961600 BLAKE2B 4132599ae1074e8c8b12716b73b575d40741c95a5dd4b47f2bdc88f3a2d03c289503179555636ba9ab9db893d7847b2de6c6a38916977bd8efe5a2f877a1b38b SHA512 87d380ae104d99bc44230ef241d8c8c475ec32e26fb91a686009ce9a4e222b9b1534ba612e3d05603b1f50d5ce392d1fe9ccf9eeb5557f6b56bad20bd40e6a41
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
 DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f SHA512 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0
@@ -74,12 +94,14 @@ DIST linux-6.x-sha256sums-20260828.asc 246577 BLAKE2B f65a239c27ef241b753be638af
 DIST linux-6.x-sha256sums-20260902.asc 247945 BLAKE2B 0b43813b97299dc604af7f6ac01a80c00ee11d5800d1354fb0613ee9fe16dbeab19c7453df242a89d7ee910f6ee9a3c713a030cc07fb085d4fce7c16f1f965e4 SHA512 91115918e6e772e7cd80775e4b360903de19eef6e7b945826a3492b7a95902eca5b3f5bf9d1b3e744f4d5ccefd82e47dee969b8c11d9bcfaec4393f0b277bf44
 DIST linux-6.x-sha256sums-20260907.asc 248631 BLAKE2B 2f10a984a5d3b563258d041f6cec084e17d6c29d5f1cf905f7ff31cf5df3ec9aef50040bb0759b2d879eff80fec73f683bc4682940f1504b9afed77b32685279 SHA512 935ada72325fefeba6d134480c388c8cf7df12ab16d060ee50b5818ff4633795228d50aa2b36875d5af0acad8ebea70b0d8c049dd59caf2fd3556dbf9f3db1df
 DIST linux-6.x-sha256sums-20260911.asc 248972 BLAKE2B d0a49a4346ba6c0f13d122c6fa68ee0e8f1436f51fc7212015d0cfb16fc5091df947d1abd4f8aa2e9388c22a0f64484c08ea21c320935b00f9cdf58a1ccd22c8 SHA512 4bdb652871ef916bd18b7e15fab9f4b110aa35c16fdc2d67de373e5ee811ae97afca7bc123ab9615ed5cf4dc15ef936d8f4ca5e34ab79031a63e1f06e2011879
+DIST linux-6.x-sha256sums-20260914.asc 250340 BLAKE2B 93c4ed0eb9073fb36fdceafb66231db226e6d1b20451a908f5b223ca61ab452a93205289f866d5b3d145ea847019f04e7c64ce7ebaab19b42f23c48019d60ec6 SHA512 d4074ece544fa6e478d4de518dc18387d687f7b477dd8e10c1aa0e82897b4fd6c21095f387e3bb2903e9f2514741510c71f7d2661a917567daa6bfcb8873b674
 DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
 DIST linux-7.2.tar.xz 160068116 BLAKE2B cf5f3d87b96f223034c47c6e5fc972fe52c2556310eb2f064632537b8727231135a8540179fd5d51343738c8a51f51f09c7e8da374324b68551c84a4124bb71b SHA512 47e63679363261a864d271277340a6f2d45f544e1a056be4159df081f4f6537d0efa865c4af26611ab33a3079ee65db88ec2f6bc0e5fff43e0c043cde0cd91e1
 DIST linux-7.x-sha256sums-20260828.asc 11213 BLAKE2B 3be42484550c6e7863570a45175bf3260b4b27af99d129185ff002164571f09128f895d230cd9c0b96ffe6a24d7164d9e9352c7ec709c0752435cfc7616c0533 SHA512 d2e1aa002b6e2b49efedd594c56491d5563a4b1524c8c6e62802a50b49b8e586ef103ef134d56cb7891df9cd681ba194a5cf78e6cb2bb2c668d89dac78dd4d18
 DIST linux-7.x-sha256sums-20260902.asc 11883 BLAKE2B 868477ba5aaf889713f97de4ac66157c95497f9abdd779e8090dd99b676d47e3aedb0fe32e77f2953c82c61397c0be1c60a7a1716a67a5709ce1152ed1392cef SHA512 5d5d9f7f21fc9b803cd5059341af090c4378bc871efde4380e7fd04958de89b67b74079b307740620c7e978cc6b7798e95320d0269ccf77266f275140af7034b
 DIST linux-7.x-sha256sums-20260907.asc 12216 BLAKE2B fc43cf1c26c2760c3f4fabf1af6edf4448cfe39527ecf9034ba87e5118356c9bf3af1698fd60f33afbae468959ba1f456d8a325446f0bee2b2a3ac76814d9b20 SHA512 0cf93af8453deb19c43875d61b118b6c93f7598d18e81368715ee069455ec5c3073495c238f219e3088f74268cea608d84866b0e490d04d2b483ae1cbb194015
 DIST linux-7.x-sha256sums-20260911.asc 12549 BLAKE2B 2c13002580813fec5b5a0cd69d5bd428886a0bae1fa5155e125e8a13adaba4c3b3bf4831532b348ef1581ac118a776d009ec1878747a8f679a0b36af28a4d2df SHA512 6b035fd353d94ca2a482d9c38fcf75a5e1e88e426f6c635237dae0a396929c87ca465554c9cd85a951ffefa48f84af4bd2896aa534fe94a46c938b7ee5fc2c82
+DIST linux-7.x-sha256sums-20260914.asc 12882 BLAKE2B 83b8e10291ae9e0c1ca3795e86c46038d0df560de695687e52932697df2e89454285003e1d9faa5e9f26f622e8388c561474e993bc8201909c0f7bd043a31c39 SHA512 0abd88ff6979f7fffd3f9f7775cf1905b7a5df27cd8783f3cf85bf8428a815641f0112644877ee66b5e164a5a588513f64c3eded461aebc348bf6682c40f6b68
 DIST linux-gentoo-patches-6.1.178.tar.xz 14432 BLAKE2B fc278094f85f58b7aba5c3334503114d28aead086a1e62499111283f0410c02bc9db7f5187975fcf2a793a5ef32e323b9907bbd9e0fb4c0834dc1a823f36af52 SHA512 ae0606ab52f8d66f49cac198aada1cbcced465d8ae43e09ef02cee149125570e09eadfacc07f9ec0ad3b20b365df7b9718a478252771f7c6e09fecda6f701096
 DIST linux-gentoo-patches-6.12.97.tar.xz 17192 BLAKE2B e0f09dd8ef2e6ebce9adcc2c050cb7e2c7ae08188e99635d3b541c6deca5bea792f4ec2c8d0c0dbc648b0c1f227b54a95d8d807a43859b3bf1b5f57767af2113 SHA512 af6b182d1e7661c35c215f4da63c8ab53b1ffffa7818a266b4c5639ed8d03428d050f1045d02e885c1b9bdc9fb2464c3f384dcd55d7536eddf2b90ffe1f8c530
 DIST linux-gentoo-patches-6.18.42.tar.xz 10856 BLAKE2B 8d9de53163c26980f2097eac090f8add2f0f22707824c25493d24d53cc82ef5bc24dcbc7e1e324010315bd3cd05cf2abdd36c536f1457b311cc5208a1a49575d SHA512 01f3020aa34f0ee29c37473344f6dfe0180a12d20834f9c935575b98092b1c6ddd6c563aaef9e4ce6f14116e5d7386d2203f120d1c680ff617f581c867d4544c
@@ -87,18 +109,23 @@ DIST linux-gentoo-patches-6.6.145.tar.xz 39848 BLAKE2B 46a5473d9d056b691af2bcda3
 DIST linux-gentoo-patches-7.1.9.tar.xz 10624 BLAKE2B 4b502aed968239f52321da548b257b2a06d4e3cf520090d7aa53dbbf77ef5cc9e64d1bb209389f1c51e48c5953666470186aaaa55db378cb34940ce492693271 SHA512 1d2d466b005cc7537aad1e8222411dad8a86bb82c185f139a6972f8354b47f758fb8555ef04b2217cd082db5b1852ba00b5a5eb0673a57c6423dacbe606c7d39
 DIST patch-6.1.186.xz 8087268 BLAKE2B 5f78ce9b0b0cbddd71b4bd4489175c3e1a494c8d4e596bcc0785f7f7d9f1221c10eb5e35b6e687550363e7ee37968ee8fbb7c6fe60a0b2e4e882b4f265b2547b SHA512 5816e156eaa305543af1f06530fd42b9abd2b1b2e79b379800cc534e6bf1bbdfb31c693f411c15c444920b788f3bed1405abaecfdaa2d3e2d7cc34c1f508d8c2
 DIST patch-6.1.187.xz 8109252 BLAKE2B 5ec497e8fc6f086140d425fd7b4ab122d8a579b4d7227711eb0c2493cbf03590e494de9ab1700a950eac3c962dba399c996d94aefe59fd9e6154f7ffb18618b8 SHA512 bc89dd895bbf1ad4900a1a044ca9858fab747c4b46758770426c9590d22d6048adaa08919563fc9b20e9f82ba99be9f99242d7845dcf9a2de707d48dd2de9fa1
+DIST patch-6.1.188.xz 8362360 BLAKE2B 2f97dbb61f5f7f29a009866ccb3ebe10f87b18ef8da32245303edc68a6ad18e80ec27f08bc6bfdcd7a6387139437559e7aa3f30357c298e88c7ed8287875fb9e SHA512 78c57eabe1dbb76fe39add4d54efa8ca3e34af601aa6869e46a6d58d6e9cdcd51cfa03808c167c22996e09c1471fff7bb062631f09e6de60d5b03e9b85822ae2
 DIST patch-6.12.107.xz 5646156 BLAKE2B a223da9e2d6d8f52be6dd2935310de152a3afce88b5ee61bdab0e688ceaa6e96c1cb25e9378ecb64600cffa68f2b9f6f8b44ba203c7ec9076444d1b4bb73b222 SHA512 b3a97567c0c5a1bd0903a6f3f520622a0fb6b0bb29447113b6e77dbfd802470a7bde78e18a08ae3f3b848e55cc565389b58d989640ec40ce8b9aa8cf4c4a14a0
 DIST patch-6.12.108.xz 5674920 BLAKE2B b3cd77d6351c726f5eca6a5990cae7702aa95f1d7bcb4a244b483cafba951af1e500e1bddb632a6a273c180beebaa9bec527ebf5d0efe7463d979878aa5492b1 SHA512 8fa2ccbb55ba4cf6c6613e97696525b69ffbd88051fb3f9e2a03c98daa84d3f657f43212da7e4c2b5450fc405331f714e8c72ac12cd79487842a26c65325627c
 DIST patch-6.12.109.xz 5753324 BLAKE2B 9ddaebf8cb9e93e79ccf02efd4e65e8892ff751e3e660f00f8032c42ac275d72ba4aac1d61b8f628a52c064a5bc54c34d05a9510b6a9c9d90f79097c4f7e41c8 SHA512 bede54fa2db04d3bcb4b1e30369a897135a8fa6637b339a94e21cd6e198f1404109bb52626bdb3f88406e002c6f4430de8e05fc20bfeec37bc4ef434120e707f
+DIST patch-6.12.110.xz 6085060 BLAKE2B 8d1d7ad14511974f9c3508a34b3fe77284278a0b89b0cc94bd256a7d12b00c4581b49a4fc9ae3bf5b4aa67b5b76b088a9c29a1701ea9a6aa88f5bc76d4268d74 SHA512 b431836ce3b6b42b0c1ed810db6c839bb3fc7bb66b014d1a89408e0fe6d441da24e40d50d83be64e1992dd432dd7e245dafa632302892dedc46919caae354067
 DIST patch-6.18.48.xz 3258276 BLAKE2B 2065b089db773cd504b7e09e4fb111e68463ad2846368090a40466044fdb63e2db5ff1d069c7d0c83ce77a9f85c9c5507d78eec8bd79409f1990aa7c21c4ce8d SHA512 18b4d5a32a430f8599cf821e5f873e9d669e4994a21f0a98084f1780bc233a13250f69c162f440ec9ac62551b03532f99332ce9ef90b98b77e69b96c63a05a48
 DIST patch-6.18.49.xz 3282948 BLAKE2B e1a030bfe327190d14a9d3eefa77c8823a276d7f84c112a01e1f99572f35e283296415fde0a8f3f92564682a7c86b046045bd4d57f66e940bb42bfc65beab4dc SHA512 6cf1fbc3cedb1a2ef11c6ec7d045aa0f8214cb06ecfdc30cca7724207a40fc896deb6dde269d8bd87750ffe07634e7429e076e80167755526d634698bc3980a8
 DIST patch-6.18.50.xz 3404240 BLAKE2B 3b7794114d37bf1f5f0c95b5b6f44aa33c00096a162dcb6fc48006e22871d2f731626f8759f54bc30cddb8561d75896e0546124e5b11b9e6332ea121d55eb164 SHA512 2ebefa6d5c0102130ecc8445e58e674e581568b728e4b40e1dfdfa3039a10c9d1af533b2b95d3b56ae30a056838af7bfe58f78c1642c56e3db14a3c1228ffe75
 DIST patch-6.18.51.xz 3545252 BLAKE2B 1636bb5b2dfab15f9bafeb215f925acdb5c7df0fc544d7787ffbe76cd1efcaff7cb99d925e39997e7cff37266192dd07ad3d7de3a8a845a907de9d5cf72b2dcc SHA512 c5022b7b718093b791237599a00565bf37f7e6d256e136c88ddc9508163cea5993bb22cfbbf928c3604e12ecb76d7e2ce814a3634d5a65e7c84825eb4e773f9d
+DIST patch-6.18.52.xz 3996672 BLAKE2B 97ef23b4b70a2e02c1d6c2fa2b4b1c895743802007f2ac6ceb8df086c9b9fac1cff9b80c210761775de5d17012ea8c9ff9c7c3bc1561f087b92f623ec3302c8a SHA512 f1c32303a8eb7f20c7f5c8d592a23140ff880075d0e4151bf96d5b0365ff64b35324753894d8ba822ad797e673b2a878f18d6a2f557dd6d3aca1fcc8d4e5764d
 DIST patch-6.6.155.xz 6891280 BLAKE2B 1df8fbf4aab980280a52f6199f44f3030f917872fc5bf719dcd6bfeb236cd340aaea6cfe1da06948bbfbbdf4f89232a577e11dd0e422fb544ed2824b12f1c9cb SHA512 09f9f30b4bb33a324e3237e7eef78fe0dca9dc5d28e4c432a6e6bffc2a02dd4828f19bd1f0572e4f98cba94df55f427e11248689f0ae16437d0ef4cdda1a977a
 DIST patch-6.6.156.xz 6914532 BLAKE2B 95bda8ed3689d35c3bb5410f3c33b80097f78b038d343c33df3699dfb9d216215560411b939f2c6e8cba8990aa1169e914617d2432e14674484bbcac0b47d175 SHA512 de670a00152147ff05f19a5d519917bf522dfe40b3b88619e76dc768ffbf8d4609ba761c600c9441521de6254f87a6a2cf6162218ae90b1e75d7f5825c5dda10
+DIST patch-6.6.157.xz 7211724 BLAKE2B 0b1c80d86bc3fac163ef830979d2c3492e6b72ee56f17c18ce561b399a8b36d7292aabd56012bc978a7bd0b319551f7fb86d688a5e974be01a069446058f72b0 SHA512 6aca3405b62daa0e1fac66d5500705d6d780900b2960e2f50449b0db84cb4a1a814e7eadc9d97a3c959262e3cffb8ec63492ee6c3c0af163c1c8f8a10c184e1c
 DIST patch-7.1.12.xz 1401192 BLAKE2B f78bbf6e2468cf5324d0ee1b9da26d57e605c1f51c83b7bce0c5cd4776d7496c5160d6877b9efa6a0c470c1f479220e5b40a309fafd85da0ac50dd0e2cda5273 SHA512 ec4443c4af0ca05597fc45241a6676179ff562f49b8c09639c123465ea357d48d74f05f5b4b229f056b5ac7f497a04c2fb864cdde5dacc2f466637d4eb8ca330
 DIST patch-7.1.13.xz 1427684 BLAKE2B 6c80c845eee5e6b231aab8b3675eb25dee0a1257b1138501634af31d4aead57102794d155dc012498b424e523d6a472e3ca7aead4a7573aaa4e30ef1e27f7784 SHA512 b858b8594d0bb2b401a947d1c3bd3d25e4d2c07b6e07b5585a8fd84011fbca4c23f3f0424dd74a338358dc42aa53eef2d88205e1b4ddcdc8abe382b922f8d461
 DIST patch-7.2.2.xz 32596 BLAKE2B d3185df869fc6613476a9bfcae4ecbe8bc80891593df937d2ec76bf5c6a92ff0af2395abfbf52604d3083afbf41d49d1fbd8d7764bc5c6b76c87a05703b6809e SHA512 144f29bcdf647b4d90179ca4132c0e9fa1d88993bb29ac84236c10c790188d79c827e633cc6cc852ea4b6259b58c6f25a8fbb7073fedf7434e9b0f07f986c2fc
 DIST patch-7.2.3.xz 62920 BLAKE2B bfca37cdb0500afc3c369314e6cbd11871421a380e99436a3e59b689aed674f0eec7b1a605d2bebd3df84a68a2069a1ee05d437444776e0307a4d4535b88deff SHA512 b5c48b2b288bfe0e5aebe6889ae4fca078a33df5ed69444abf3da102ae5b34a0ff1747c3f141a3bb729177a97e19623dfcadb5b950f5cda7a559be0c5cdac898
 DIST patch-7.2.4.xz 281532 BLAKE2B f8bc83a92f50b064328727d28d0bb06f660e9b0fe4ccea980a81804776040ce6e7c2d71dd01656dc5a833d53f0e80ec4af91c78df37d20b4f4118673af26708b SHA512 e5b244c7b7c652d55114e4f440be7ac8eca617bbcc704ce9528bdfd793934449c6fdca3424d8e17ef6b6c053952c2aec860e34701d2b6ff9a2d09b1e52d76773
 DIST patch-7.2.5.xz 425448 BLAKE2B ee8ab8753089280cbd9afc0e424a84099e4a88b95c383618a18e009712a5862e8f2b72c90a9737197fdd2fd5c844d8fd9083319c053e9065cbc769d1253e3d16 SHA512 60af2204eddf616e3e31cd4e5f6043afab3956443da3221b9048f1e2ed7a539ae5b69bdd0ea9a664938158d099c8d2648ef66a86763305ceb7a4db8286438fbb
+DIST patch-7.2.6.xz 1049176 BLAKE2B a9aa8ced201d5c98fc971436508f9a019eb2e9cf0cdc5a830cc7e707613fe2750dd8d222646e55973e9264e722a9404a0e418a1a2f4385523c02f3732006015f SHA512 82780c916050b619145cb4fc3bebff0a3aaa34caea5c8e41e64e613a686cd2f44cd1f13f0c60df952415d25c0f4ba6f176d2548db2df2292680539cf457aa42c
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.188.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.188.ebuild
new file mode 100644
index 000000000000..6d846f2862d0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.188.ebuild
@@ -0,0 +1,168 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.1.178
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+	amd64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	virtual/libelf
+	app-alternatives/yacc
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# If this is set it will have an effect on the name of the output
+	# image. Set this variable to track this setting.
+	if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+		KERNEL_EFI_ZBOOT=1
+	fi
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KV_FULL}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KV_FULL}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KV_FULL}/.config"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KV_FULL}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.110.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.110.ebuild
new file mode 100644
index 000000000000..c669e6e1a6bc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.110.ebuild
@@ -0,0 +1,222 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.12.97
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+	amd64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# If this is set it will have an effect on the name of the output
+	# image. Set this variable to track this setting.
+	if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+		KERNEL_EFI_ZBOOT=1
+	elif use arm64 && use generic-uki; then
+		die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
+	fi
+
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	# Override user variable with the cert used during build
+	openssl x509 \
+		-inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+		-outform PEM -out "${T}/cert.pem" ||
+			die "Failed to convert pcrpkey to PEM format"
+	export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/.config"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.52.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.52.ebuild
new file mode 100644
index 000000000000..38569854681c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.52.ebuild
@@ -0,0 +1,222 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.18.42
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+	amd64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# If this is set it will have an effect on the name of the output
+	# image. Set this variable to track this setting.
+	if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+		KERNEL_EFI_ZBOOT=1
+	elif use arm64 && use generic-uki; then
+		die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
+	fi
+
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	# Override user variable with the cert used during build
+	openssl x509 \
+		-inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+		-outform PEM -out "${T}/cert.pem" ||
+			die "Failed to convert pcrpkey to PEM format"
+	export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/.config"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.157.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.157.ebuild
new file mode 100644
index 000000000000..d8237e38c426
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.157.ebuild
@@ -0,0 +1,222 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.6.145
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+	amd64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# If this is set it will have an effect on the name of the output
+	# image. Set this variable to track this setting.
+	if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+		KERNEL_EFI_ZBOOT=1
+	elif use arm64 && use generic-uki; then
+		die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
+	fi
+
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	# Override user variable with the cert used during build
+	openssl x509 \
+		-inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+		-outform PEM -out "${T}/cert.pem" ||
+			die "Failed to convert pcrpkey to PEM format"
+	export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/.config"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-7.2.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-7.2.6.ebuild
new file mode 100644
index 000000000000..cd4a41ad174a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-7.2.6.ebuild
@@ -0,0 +1,223 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-7.1.9
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/7.1/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+	amd64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	sys-libs/binutils-libs
+	virtual/libelf
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpacker
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+
+	# If this is set it will have an effect on the name of the output
+	# image. Set this variable to track this setting.
+	if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+		KERNEL_EFI_ZBOOT=1
+	elif use arm64 && use generic-uki; then
+		die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
+	fi
+
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	# Override user variable with the cert used during build
+	openssl x509 \
+		-inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+		-outform PEM -out "${T}/cert.pem" ||
+			die "Failed to convert pcrpkey to PEM format"
+	export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+	kernel-install_test "${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KV_FULL}" \
+		"${WORKDIR}/${kernel_dir}/.config"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}
diff --git a/sys-kernel/gentoo-kernel-modprep/Manifest b/sys-kernel/gentoo-kernel-modprep/Manifest
index 37ed63a840e8..22a1d696d65e 100644
--- a/sys-kernel/gentoo-kernel-modprep/Manifest
+++ b/sys-kernel/gentoo-kernel-modprep/Manifest
@@ -1,20 +1,25 @@
 DIST gentoo-kernel-modprep-6.1.186.tar.xz 7445076 BLAKE2B e6d5011194bc523bacfde99a444aa024e41b3f2a1e8ca00de09a77784f6fc48272b4ad167975e6381c3d185a16e8b7d7e543881deed1b6a1fac5655df3772158 SHA512 44c5f7eee6ed350851c8f07a2e355d5a10cc27de1d23f96d57f3f620a3be243678b6f9e0fb551775ecf19380a40e50a00e76c3bc555dd5f81398acba881552b2
 DIST gentoo-kernel-modprep-6.1.187.tar.xz 7435796 BLAKE2B d455c8c0847583fc3e6d36e8a50d0ab5d6f173383c4667ee46904a0f000c06f543a42bafe0a3a2c5bc6753fb4f5b2c5bebdc134114eab9236b020953fbb10c62 SHA512 e3e675fe0be18abf866d34005e4851895c8eb807f53d97962b24d07807c40f118e51fb83c93f34e867a881a313f288a2178352c0fb96bf8adca355dcf299139d
+DIST gentoo-kernel-modprep-6.1.188.tar.xz 7440040 BLAKE2B 83832c4d563717027a8b57261f52527c8003ad3034e7c383dcba8aa3961257d3b045211e3ef7e1affe9efb6128aaede2e842f842ec4987a6a7a7a0625aa1d20d SHA512 323b90ff31861164309b713e5ec132faccdae8edab280c167810f2358d814e9e5043af02aa310cee92b8f09b6bbecd0f28ffa4579d947fc000d7ffd6d9a1fa79
 DIST gentoo-kernel-modprep-6.12.107.tar.xz 8909364 BLAKE2B 7319d1785964bc7abba07d5bc42a92bc06a019d4e2293a96f71f34524ca2ddf37277045662614148e9dd658b19ecbfe7e80d995d42d94041aaa36cc76f72e75f SHA512 78899840ab369d11548b7b64528cfe1df3b0ed390ea6e2d82b94e990e47aafc3ad0eacd289cf356e0dff4ce21fa51e297e54bae02b15f43dc913e8dee036a10f
 DIST gentoo-kernel-modprep-6.12.108.tar.xz 8905408 BLAKE2B 779e9412f109b4675f136945f58ff9837eede9cf63babb1b3d6a2a98a280e4db11632548334bc66b7629fedc78370eb615f97286b57f50334491b4cd549b3f5d SHA512 a9635b4d00c58d94801d96e75b114ba9bad13df638eab2fed917140d14d0a59a707f112511baf3387999bc1b582641645995242d85e34e7ebec90849b4e56e4a
 DIST gentoo-kernel-modprep-6.12.109.tar.xz 8919720 BLAKE2B 8f22671562cf2f0aeed31a8df25b6c5aa16ed2a62feb5307ee540f6e2b845415c4b50fd33dcb371d77ed70b0aa4d5e73fe8dfc3fc9c2abc03e87cd7a1125d6bc SHA512 d9fb856e374a65acef15f594b5f08ad59ca1a2078dd095457a67fee70ca219992db0a3fec58569a1f32527338b57ca947482c980f749681cdad7199f595d1013
+DIST gentoo-kernel-modprep-6.12.110.tar.xz 8912272 BLAKE2B ccc087ca102b0f10a5ace4b1193e8f801dc2e0630c1d6f7161a8b5b15171e8f83f23e9290de0309fc169194872394f1df16a859605ba7176e8dc664c3ba4d914 SHA512 e894c9a92f720d76d710dd8c8871dd2574726bd9067837de05fbd73a3a41eb989efc4dc593057dfd2638125764352487ad4d9334bc19a183abfe65ed0d3c71d5
 DIST gentoo-kernel-modprep-6.18.48.tar.xz 9565136 BLAKE2B c1ef2d8c14cf7ef7202bf1e3abe21e86e15973c7fb6843897d13d4396268b81b644f4c322ae3089c1868cefb72ad7cbea066114cdc4c3e87d8e917fa0220aa06 SHA512 7fd8776ab3aefc2ab25a0161f603b75384f61d99ae7d0abdb129e76d671526883860443909e64df688d5030d768ae6997c19b3ef6a2c942c400c53cded6455fa
 DIST gentoo-kernel-modprep-6.18.49.tar.xz 9559412 BLAKE2B a59b5a2d63125b31c4e4f2bbdbb1f0881112e42292d15248dc848db0591971498e77ac5873daf0a19b47dbb9eb8dcce1073eb82bf91dbc548fdb39eea15a5bf8 SHA512 41eac9696e333f8fadbf55872de7c2197b26326b99456609951efd4f3d05bf11bc59310c47d73ae505b96040ad6fc6a60fa5458ca5ead71a24a3aa3903731b98
 DIST gentoo-kernel-modprep-6.18.50.tar.xz 9562696 BLAKE2B f070af33b770f4997ec5950cc5c42c9b8c6d2ad67fff6835654810107d89aac6edf176ea873eb3a8073527cd0eca027c531334749f82ae2405fe94d4f7cb0e8d SHA512 4913b3526b000fb99d639cfdad9ccfad9e118bffe747d20c00aec38381fcc988a348de1bd6349ff46f811a29e8f235e28b4946bbe8a8475192a050caffa77e50
 DIST gentoo-kernel-modprep-6.18.51.tar.xz 9561948 BLAKE2B 2acf6c234ea36df4f23c31995957ece21701c34a88a21ba32c2a80e5d1c29c13e8786d5e3afec366511ed16b634f909f55e9844f1ef5af9d0ddc603d0e9cda89 SHA512 a3af985501655ce376500596aace186709037beae5b3bf01c52e035e2a09fafd8dba8b3e8348ee26fe30aaaa728a4bc8c323ddf4767d58d7909a0b035c37396d
+DIST gentoo-kernel-modprep-6.18.52.tar.xz 9557100 BLAKE2B 9221abbf0276010fc4c435683cea6e05506f67aab205386b1a869828d45e1c14f8efdd1c4acdb69645199a1428e7687c65d946018aa11bd114e71cbe4d3361c2 SHA512 ca707c8cc5f91d557c3c35f136f7407d671f933e98c40c1f221acf2a040b8dd7a382096e5f37d4d1dfec926a75a5b5e7882c04c452740ac61816dbea81f711a0
 DIST gentoo-kernel-modprep-6.6.155.tar.xz 8266584 BLAKE2B c43161f8d71304fc120bbac6d977250a8fb3e357dc5b8fa3b000cc8b26861c04be38c5e4b993d594985872623048dfb488f31aa21d39eed77cf5184c754ab91f SHA512 a1863dd79c9b4f780c4aed454d9d91731a8b6821b7a3ca89f8e4ebc95ddf13af726f36fff7bf1784099eb56add600e19c87afc9fd9404ed17c8520e211307083
 DIST gentoo-kernel-modprep-6.6.156.tar.xz 8268364 BLAKE2B eae7d8caa7115c66d58d4dbba44f2a27903678e3fdabfa3fb9efafdacd48e4e6d7f49a2d59083912b8ae4aa1d41fcb483772bc18a8cac316b92be35757bdd195 SHA512 d81f8ed300b7b2a3eea0eacd4c19492d24d4091ac3b0db6ed0642e3b1c98feceeb5525d2287ed560e3d1bdda29b2c76a00f0c417dcc5278454e276f2c56230cf
+DIST gentoo-kernel-modprep-6.6.157.tar.xz 8256156 BLAKE2B 1367734e3acbe6f8a877bdef5b4add258e196f30d5ca7f922cb9533b23e49ddb3ca77d4d962fad2df9c44a84ec85adac3dec65bd18b853e60743b04678c50db0 SHA512 d47bd8210cad1ff66428b2aab3ae5ad90570d6d7278ba47f59b6f39592526953b5896c0e035eb4b8b248a1ea035582e93caf7229044e359511d346ac330d250e
 DIST gentoo-kernel-modprep-7.1.12.tar.xz 10040180 BLAKE2B d0b1087816698c140004b32d1d6de5c515d72f42a39d7dc843d7b6f435c6edabec92016599ac3c3910ad86836310086a3732a6822d2922d9dd69251be4565292 SHA512 fb7631a7414f48a8d5a2b11a8b065a4d7131e9584eb6a5cd8f9df0890ec5b1c7d35a1fc313a6f517e2eae8b3fe517e3a13488a27fed9e5353740f3930b9c2fae
 DIST gentoo-kernel-modprep-7.1.13.tar.xz 10032820 BLAKE2B 99fa16dea491148b59bd776dc89a78518efe28eafc8882eebb81b96ae8b8adfb441d29d58696c01a47c4db9c5b53be514f1e8d341c20cf1e31682deb6c746633 SHA512 873d0d27a668ee696e47eba628b0a8e09b600d60e82a2be402bb2e4d32eeee686bcb2fcdfeb1dc7f26a90301fe1043fd5b0fa6023fbd7f331180dfa594263d66
 DIST gentoo-kernel-modprep-7.2.2.tar.xz 10241984 BLAKE2B 1763c1a696450162769e09503141b6d2086f069b3e8eefb7f0a09adcfd2e26b998688d8b95f61cfe936f7161b02503ca8514d494e02a75933fd54ad55c551511 SHA512 dd8ff9576d633b54936163cd81e6e7b8431ccee8d459c63684fbc168393061a6d8fd569a31c0c84cd92af96c259c246010fc04c34017a68f815fc912a9fa5035
 DIST gentoo-kernel-modprep-7.2.3.tar.xz 10220140 BLAKE2B ba6f98b4db2b8b96d7f634282acbc5637fb8ea133c8203dc6b0f6c54b278090c2bf0d7a61e77963f4f423585a5712b72a1d4a4327bf9a2d2fa62fd19b27a4d9d SHA512 4f07813939275e2641f4a1cb596c12f944bbf5e48d353f725c27d9c3f7eb1197534bd7f378d6199fda51938d44e1dc7e61e9cf52490843628f8538339818fd75
 DIST gentoo-kernel-modprep-7.2.4.tar.xz 10218780 BLAKE2B a843e51def99d4620ffdabc511bc8b4b1189c7c92685d123c0691b48693b77c089e89bfd5838ce75028bf380a3b4e256bf70f01c667a99fb52968c81c0fa0a54 SHA512 f40e72fda6ec782c45a90c60ca3ed8ea9bc971231b242c525d5d36b09a804d227a1ebc73ae7033fc16bdbf542f5cf0b485a634ec317b510ee533f36bfa2a6398
 DIST gentoo-kernel-modprep-7.2.5.tar.xz 10221628 BLAKE2B 1957923a424babf449f115cef460982fad88ae4c7a2fecfc1e02be69976b56b06f110175c4ec25d8d8fbe833359ad8e311f0012f1178e23f985c706449cd87dc SHA512 093046834c5a8fb75cb4d99b4b2f9779a73acc2c595b66b0d0e5d7114db49969176b1fd5096ce4c11bb526ebe3d1bb98040b8b518eb2827b35d42c3bd77ea4b5
+DIST gentoo-kernel-modprep-7.2.6.tar.xz 10229256 BLAKE2B 37e725e39d6136c0f75b7b107f074160f940de4a2ad4b1e050ce21adaa0a75cffdbe6c825a7c381dda45743d3c1ccb91e88bdc11c7638c1e5c739bb5572f0784 SHA512 593c4152ef31acdffa5b6a5e4810c80c5aaeaba2ecaed3a3ba744241f5e20387b796898aae00bee43f1d7ac274c02dee9332d7c0dd51bcb173b436611603453b
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
 DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f SHA512 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0
@@ -23,12 +28,14 @@ DIST linux-6.x-sha256sums-20260828.asc 246577 BLAKE2B f65a239c27ef241b753be638af
 DIST linux-6.x-sha256sums-20260902.asc 247945 BLAKE2B 0b43813b97299dc604af7f6ac01a80c00ee11d5800d1354fb0613ee9fe16dbeab19c7453df242a89d7ee910f6ee9a3c713a030cc07fb085d4fce7c16f1f965e4 SHA512 91115918e6e772e7cd80775e4b360903de19eef6e7b945826a3492b7a95902eca5b3f5bf9d1b3e744f4d5ccefd82e47dee969b8c11d9bcfaec4393f0b277bf44
 DIST linux-6.x-sha256sums-20260907.asc 248631 BLAKE2B 2f10a984a5d3b563258d041f6cec084e17d6c29d5f1cf905f7ff31cf5df3ec9aef50040bb0759b2d879eff80fec73f683bc4682940f1504b9afed77b32685279 SHA512 935ada72325fefeba6d134480c388c8cf7df12ab16d060ee50b5818ff4633795228d50aa2b36875d5af0acad8ebea70b0d8c049dd59caf2fd3556dbf9f3db1df
 DIST linux-6.x-sha256sums-20260911.asc 248972 BLAKE2B d0a49a4346ba6c0f13d122c6fa68ee0e8f1436f51fc7212015d0cfb16fc5091df947d1abd4f8aa2e9388c22a0f64484c08ea21c320935b00f9cdf58a1ccd22c8 SHA512 4bdb652871ef916bd18b7e15fab9f4b110aa35c16fdc2d67de373e5ee811ae97afca7bc123ab9615ed5cf4dc15ef936d8f4ca5e34ab79031a63e1f06e2011879
+DIST linux-6.x-sha256sums-20260914.asc 250340 BLAKE2B 93c4ed0eb9073fb36fdceafb66231db226e6d1b20451a908f5b223ca61ab452a93205289f866d5b3d145ea847019f04e7c64ce7ebaab19b42f23c48019d60ec6 SHA512 d4074ece544fa6e478d4de518dc18387d687f7b477dd8e10c1aa0e82897b4fd6c21095f387e3bb2903e9f2514741510c71f7d2661a917567daa6bfcb8873b674
 DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
 DIST linux-7.2.tar.xz 160068116 BLAKE2B cf5f3d87b96f223034c47c6e5fc972fe52c2556310eb2f064632537b8727231135a8540179fd5d51343738c8a51f51f09c7e8da374324b68551c84a4124bb71b SHA512 47e63679363261a864d271277340a6f2d45f544e1a056be4159df081f4f6537d0efa865c4af26611ab33a3079ee65db88ec2f6bc0e5fff43e0c043cde0cd91e1
 DIST linux-7.x-sha256sums-20260828.asc 11213 BLAKE2B 3be42484550c6e7863570a45175bf3260b4b27af99d129185ff002164571f09128f895d230cd9c0b96ffe6a24d7164d9e9352c7ec709c0752435cfc7616c0533 SHA512 d2e1aa002b6e2b49efedd594c56491d5563a4b1524c8c6e62802a50b49b8e586ef103ef134d56cb7891df9cd681ba194a5cf78e6cb2bb2c668d89dac78dd4d18
 DIST linux-7.x-sha256sums-20260902.asc 11883 BLAKE2B 868477ba5aaf889713f97de4ac66157c95497f9abdd779e8090dd99b676d47e3aedb0fe32e77f2953c82c61397c0be1c60a7a1716a67a5709ce1152ed1392cef SHA512 5d5d9f7f21fc9b803cd5059341af090c4378bc871efde4380e7fd04958de89b67b74079b307740620c7e978cc6b7798e95320d0269ccf77266f275140af7034b
 DIST linux-7.x-sha256sums-20260907.asc 12216 BLAKE2B fc43cf1c26c2760c3f4fabf1af6edf4448cfe39527ecf9034ba87e5118356c9bf3af1698fd60f33afbae468959ba1f456d8a325446f0bee2b2a3ac76814d9b20 SHA512 0cf93af8453deb19c43875d61b118b6c93f7598d18e81368715ee069455ec5c3073495c238f219e3088f74268cea608d84866b0e490d04d2b483ae1cbb194015
 DIST linux-7.x-sha256sums-20260911.asc 12549 BLAKE2B 2c13002580813fec5b5a0cd69d5bd428886a0bae1fa5155e125e8a13adaba4c3b3bf4831532b348ef1581ac118a776d009ec1878747a8f679a0b36af28a4d2df SHA512 6b035fd353d94ca2a482d9c38fcf75a5e1e88e426f6c635237dae0a396929c87ca465554c9cd85a951ffefa48f84af4bd2896aa534fe94a46c938b7ee5fc2c82
+DIST linux-7.x-sha256sums-20260914.asc 12882 BLAKE2B 83b8e10291ae9e0c1ca3795e86c46038d0df560de695687e52932697df2e89454285003e1d9faa5e9f26f622e8388c561474e993bc8201909c0f7bd043a31c39 SHA512 0abd88ff6979f7fffd3f9f7775cf1905b7a5df27cd8783f3cf85bf8428a815641f0112644877ee66b5e164a5a588513f64c3eded461aebc348bf6682c40f6b68
 DIST linux-gentoo-patches-6.1.178.tar.xz 14432 BLAKE2B fc278094f85f58b7aba5c3334503114d28aead086a1e62499111283f0410c02bc9db7f5187975fcf2a793a5ef32e323b9907bbd9e0fb4c0834dc1a823f36af52 SHA512 ae0606ab52f8d66f49cac198aada1cbcced465d8ae43e09ef02cee149125570e09eadfacc07f9ec0ad3b20b365df7b9718a478252771f7c6e09fecda6f701096
 DIST linux-gentoo-patches-6.12.97.tar.xz 17192 BLAKE2B e0f09dd8ef2e6ebce9adcc2c050cb7e2c7ae08188e99635d3b541c6deca5bea792f4ec2c8d0c0dbc648b0c1f227b54a95d8d807a43859b3bf1b5f57767af2113 SHA512 af6b182d1e7661c35c215f4da63c8ab53b1ffffa7818a266b4c5639ed8d03428d050f1045d02e885c1b9bdc9fb2464c3f384dcd55d7536eddf2b90ffe1f8c530
 DIST linux-gentoo-patches-6.18.42.tar.xz 10856 BLAKE2B 8d9de53163c26980f2097eac090f8add2f0f22707824c25493d24d53cc82ef5bc24dcbc7e1e324010315bd3cd05cf2abdd36c536f1457b311cc5208a1a49575d SHA512 01f3020aa34f0ee29c37473344f6dfe0180a12d20834f9c935575b98092b1c6ddd6c563aaef9e4ce6f14116e5d7386d2203f120d1c680ff617f581c867d4544c
@@ -36,18 +43,23 @@ DIST linux-gentoo-patches-6.6.145.tar.xz 39848 BLAKE2B 46a5473d9d056b691af2bcda3
 DIST linux-gentoo-patches-7.1.9.tar.xz 10624 BLAKE2B 4b502aed968239f52321da548b257b2a06d4e3cf520090d7aa53dbbf77ef5cc9e64d1bb209389f1c51e48c5953666470186aaaa55db378cb34940ce492693271 SHA512 1d2d466b005cc7537aad1e8222411dad8a86bb82c185f139a6972f8354b47f758fb8555ef04b2217cd082db5b1852ba00b5a5eb0673a57c6423dacbe606c7d39
 DIST patch-6.1.186.xz 8087268 BLAKE2B 5f78ce9b0b0cbddd71b4bd4489175c3e1a494c8d4e596bcc0785f7f7d9f1221c10eb5e35b6e687550363e7ee37968ee8fbb7c6fe60a0b2e4e882b4f265b2547b SHA512 5816e156eaa305543af1f06530fd42b9abd2b1b2e79b379800cc534e6bf1bbdfb31c693f411c15c444920b788f3bed1405abaecfdaa2d3e2d7cc34c1f508d8c2
 DIST patch-6.1.187.xz 8109252 BLAKE2B 5ec497e8fc6f086140d425fd7b4ab122d8a579b4d7227711eb0c2493cbf03590e494de9ab1700a950eac3c962dba399c996d94aefe59fd9e6154f7ffb18618b8 SHA512 bc89dd895bbf1ad4900a1a044ca9858fab747c4b46758770426c9590d22d6048adaa08919563fc9b20e9f82ba99be9f99242d7845dcf9a2de707d48dd2de9fa1
+DIST patch-6.1.188.xz 8362360 BLAKE2B 2f97dbb61f5f7f29a009866ccb3ebe10f87b18ef8da32245303edc68a6ad18e80ec27f08bc6bfdcd7a6387139437559e7aa3f30357c298e88c7ed8287875fb9e SHA512 78c57eabe1dbb76fe39add4d54efa8ca3e34af601aa6869e46a6d58d6e9cdcd51cfa03808c167c22996e09c1471fff7bb062631f09e6de60d5b03e9b85822ae2
 DIST patch-6.12.107.xz 5646156 BLAKE2B a223da9e2d6d8f52be6dd2935310de152a3afce88b5ee61bdab0e688ceaa6e96c1cb25e9378ecb64600cffa68f2b9f6f8b44ba203c7ec9076444d1b4bb73b222 SHA512 b3a97567c0c5a1bd0903a6f3f520622a0fb6b0bb29447113b6e77dbfd802470a7bde78e18a08ae3f3b848e55cc565389b58d989640ec40ce8b9aa8cf4c4a14a0
 DIST patch-6.12.108.xz 5674920 BLAKE2B b3cd77d6351c726f5eca6a5990cae7702aa95f1d7bcb4a244b483cafba951af1e500e1bddb632a6a273c180beebaa9bec527ebf5d0efe7463d979878aa5492b1 SHA512 8fa2ccbb55ba4cf6c6613e97696525b69ffbd88051fb3f9e2a03c98daa84d3f657f43212da7e4c2b5450fc405331f714e8c72ac12cd79487842a26c65325627c
 DIST patch-6.12.109.xz 5753324 BLAKE2B 9ddaebf8cb9e93e79ccf02efd4e65e8892ff751e3e660f00f8032c42ac275d72ba4aac1d61b8f628a52c064a5bc54c34d05a9510b6a9c9d90f79097c4f7e41c8 SHA512 bede54fa2db04d3bcb4b1e30369a897135a8fa6637b339a94e21cd6e198f1404109bb52626bdb3f88406e002c6f4430de8e05fc20bfeec37bc4ef434120e707f
+DIST patch-6.12.110.xz 6085060 BLAKE2B 8d1d7ad14511974f9c3508a34b3fe77284278a0b89b0cc94bd256a7d12b00c4581b49a4fc9ae3bf5b4aa67b5b76b088a9c29a1701ea9a6aa88f5bc76d4268d74 SHA512 b431836ce3b6b42b0c1ed810db6c839bb3fc7bb66b014d1a89408e0fe6d441da24e40d50d83be64e1992dd432dd7e245dafa632302892dedc46919caae354067
 DIST patch-6.18.48.xz 3258276 BLAKE2B 2065b089db773cd504b7e09e4fb111e68463ad2846368090a40466044fdb63e2db5ff1d069c7d0c83ce77a9f85c9c5507d78eec8bd79409f1990aa7c21c4ce8d SHA512 18b4d5a32a430f8599cf821e5f873e9d669e4994a21f0a98084f1780bc233a13250f69c162f440ec9ac62551b03532f99332ce9ef90b98b77e69b96c63a05a48
 DIST patch-6.18.49.xz 3282948 BLAKE2B e1a030bfe327190d14a9d3eefa77c8823a276d7f84c112a01e1f99572f35e283296415fde0a8f3f92564682a7c86b046045bd4d57f66e940bb42bfc65beab4dc SHA512 6cf1fbc3cedb1a2ef11c6ec7d045aa0f8214cb06ecfdc30cca7724207a40fc896deb6dde269d8bd87750ffe07634e7429e076e80167755526d634698bc3980a8
 DIST patch-6.18.50.xz 3404240 BLAKE2B 3b7794114d37bf1f5f0c95b5b6f44aa33c00096a162dcb6fc48006e22871d2f731626f8759f54bc30cddb8561d75896e0546124e5b11b9e6332ea121d55eb164 SHA512 2ebefa6d5c0102130ecc8445e58e674e581568b728e4b40e1dfdfa3039a10c9d1af533b2b95d3b56ae30a056838af7bfe58f78c1642c56e3db14a3c1228ffe75
 DIST patch-6.18.51.xz 3545252 BLAKE2B 1636bb5b2dfab15f9bafeb215f925acdb5c7df0fc544d7787ffbe76cd1efcaff7cb99d925e39997e7cff37266192dd07ad3d7de3a8a845a907de9d5cf72b2dcc SHA512 c5022b7b718093b791237599a00565bf37f7e6d256e136c88ddc9508163cea5993bb22cfbbf928c3604e12ecb76d7e2ce814a3634d5a65e7c84825eb4e773f9d
+DIST patch-6.18.52.xz 3996672 BLAKE2B 97ef23b4b70a2e02c1d6c2fa2b4b1c895743802007f2ac6ceb8df086c9b9fac1cff9b80c210761775de5d17012ea8c9ff9c7c3bc1561f087b92f623ec3302c8a SHA512 f1c32303a8eb7f20c7f5c8d592a23140ff880075d0e4151bf96d5b0365ff64b35324753894d8ba822ad797e673b2a878f18d6a2f557dd6d3aca1fcc8d4e5764d
 DIST patch-6.6.155.xz 6891280 BLAKE2B 1df8fbf4aab980280a52f6199f44f3030f917872fc5bf719dcd6bfeb236cd340aaea6cfe1da06948bbfbbdf4f89232a577e11dd0e422fb544ed2824b12f1c9cb SHA512 09f9f30b4bb33a324e3237e7eef78fe0dca9dc5d28e4c432a6e6bffc2a02dd4828f19bd1f0572e4f98cba94df55f427e11248689f0ae16437d0ef4cdda1a977a
 DIST patch-6.6.156.xz 6914532 BLAKE2B 95bda8ed3689d35c3bb5410f3c33b80097f78b038d343c33df3699dfb9d216215560411b939f2c6e8cba8990aa1169e914617d2432e14674484bbcac0b47d175 SHA512 de670a00152147ff05f19a5d519917bf522dfe40b3b88619e76dc768ffbf8d4609ba761c600c9441521de6254f87a6a2cf6162218ae90b1e75d7f5825c5dda10
+DIST patch-6.6.157.xz 7211724 BLAKE2B 0b1c80d86bc3fac163ef830979d2c3492e6b72ee56f17c18ce561b399a8b36d7292aabd56012bc978a7bd0b319551f7fb86d688a5e974be01a069446058f72b0 SHA512 6aca3405b62daa0e1fac66d5500705d6d780900b2960e2f50449b0db84cb4a1a814e7eadc9d97a3c959262e3cffb8ec63492ee6c3c0af163c1c8f8a10c184e1c
 DIST patch-7.1.12.xz 1401192 BLAKE2B f78bbf6e2468cf5324d0ee1b9da26d57e605c1f51c83b7bce0c5cd4776d7496c5160d6877b9efa6a0c470c1f479220e5b40a309fafd85da0ac50dd0e2cda5273 SHA512 ec4443c4af0ca05597fc45241a6676179ff562f49b8c09639c123465ea357d48d74f05f5b4b229f056b5ac7f497a04c2fb864cdde5dacc2f466637d4eb8ca330
 DIST patch-7.1.13.xz 1427684 BLAKE2B 6c80c845eee5e6b231aab8b3675eb25dee0a1257b1138501634af31d4aead57102794d155dc012498b424e523d6a472e3ca7aead4a7573aaa4e30ef1e27f7784 SHA512 b858b8594d0bb2b401a947d1c3bd3d25e4d2c07b6e07b5585a8fd84011fbca4c23f3f0424dd74a338358dc42aa53eef2d88205e1b4ddcdc8abe382b922f8d461
 DIST patch-7.2.2.xz 32596 BLAKE2B d3185df869fc6613476a9bfcae4ecbe8bc80891593df937d2ec76bf5c6a92ff0af2395abfbf52604d3083afbf41d49d1fbd8d7764bc5c6b76c87a05703b6809e SHA512 144f29bcdf647b4d90179ca4132c0e9fa1d88993bb29ac84236c10c790188d79c827e633cc6cc852ea4b6259b58c6f25a8fbb7073fedf7434e9b0f07f986c2fc
 DIST patch-7.2.3.xz 62920 BLAKE2B bfca37cdb0500afc3c369314e6cbd11871421a380e99436a3e59b689aed674f0eec7b1a605d2bebd3df84a68a2069a1ee05d437444776e0307a4d4535b88deff SHA512 b5c48b2b288bfe0e5aebe6889ae4fca078a33df5ed69444abf3da102ae5b34a0ff1747c3f141a3bb729177a97e19623dfcadb5b950f5cda7a559be0c5cdac898
 DIST patch-7.2.4.xz 281532 BLAKE2B f8bc83a92f50b064328727d28d0bb06f660e9b0fe4ccea980a81804776040ce6e7c2d71dd01656dc5a833d53f0e80ec4af91c78df37d20b4f4118673af26708b SHA512 e5b244c7b7c652d55114e4f440be7ac8eca617bbcc704ce9528bdfd793934449c6fdca3424d8e17ef6b6c053952c2aec860e34701d2b6ff9a2d09b1e52d76773
 DIST patch-7.2.5.xz 425448 BLAKE2B ee8ab8753089280cbd9afc0e424a84099e4a88b95c383618a18e009712a5862e8f2b72c90a9737197fdd2fd5c844d8fd9083319c053e9065cbc769d1253e3d16 SHA512 60af2204eddf616e3e31cd4e5f6043afab3956443da3221b9048f1e2ed7a539ae5b69bdd0ea9a664938158d099c8d2648ef66a86763305ceb7a4db8286438fbb
+DIST patch-7.2.6.xz 1049176 BLAKE2B a9aa8ced201d5c98fc971436508f9a019eb2e9cf0cdc5a830cc7e707613fe2750dd8d222646e55973e9264e722a9404a0e418a1a2f4385523c02f3732006015f SHA512 82780c916050b619145cb4fc3bebff0a3aaa34caea5c8e41e64e613a686cd2f44cd1f13f0c60df952415d25c0f4ba6f176d2548db2df2292680539cf457aa42c
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.1.188.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.1.188.ebuild
new file mode 100644
index 000000000000..8b3c332a1bdc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.1.188.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dist-kernel-utils toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.1.178
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT=${PV}
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libelf
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	mv "${pkg_dir}"/lib "${ED}"/ || die
+	cd "${kernel_dir}" || die
+	insinto "${rel_kernel_dir}"
+	doins System.map Module.symvers
+	doins -r certs include scripts
+
+	local kern_arch=$(tc-arch-kernel)
+	insinto "${rel_kernel_dir}/arch/${kern_arch}"
+	doins -r "arch/${kern_arch}/include"
+
+	# Add the identifier
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
+
+	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
+	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
+		-delete || die
+	find -type l -delete || die
+	cp -p -R * "${ED}${rel_kernel_dir}/" || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	cd "${WORKDIR}" || die
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+}
+
+pkg_preinst() {
+	dist-kernel_update_lib_symlinks
+}
+
+pkg_postinst() {
+	dist-kernel_update_src_symlink "${EROOT}/usr/src/linux" "${KV_FULL}"
+}
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.12.110.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.12.110.ebuild
new file mode 100644
index 000000000000..85674e5df70f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.12.110.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dist-kernel-utils toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.12.97
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT=${PV}
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libelf
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	mv "${pkg_dir}"/lib "${ED}"/ || die
+	cd "${kernel_dir}" || die
+	insinto "${rel_kernel_dir}"
+	doins System.map Module.symvers
+	doins -r certs include scripts
+
+	local kern_arch=$(tc-arch-kernel)
+	insinto "${rel_kernel_dir}/arch/${kern_arch}"
+	doins -r "arch/${kern_arch}/include"
+
+	# Add the identifier
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
+
+	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
+	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
+		-delete || die
+	find -type l -delete || die
+	cp -p -R * "${ED}${rel_kernel_dir}/" || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	cd "${WORKDIR}" || die
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+}
+
+pkg_preinst() {
+	dist-kernel_update_lib_symlinks
+}
+
+pkg_postinst() {
+	dist-kernel_update_src_symlink "${EROOT}/usr/src/linux" "${KV_FULL}"
+}
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.18.52.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.18.52.ebuild
new file mode 100644
index 000000000000..fb5ef5e39e31
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.18.52.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dist-kernel-utils toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.18.42
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT=${PV}
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libelf
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	mv "${pkg_dir}"/lib "${ED}"/ || die
+	cd "${kernel_dir}" || die
+	insinto "${rel_kernel_dir}"
+	doins System.map Module.symvers
+	doins -r certs include scripts
+
+	local kern_arch=$(tc-arch-kernel)
+	insinto "${rel_kernel_dir}/arch/${kern_arch}"
+	doins -r "arch/${kern_arch}/include"
+
+	# Add the identifier
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
+
+	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
+	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
+		-delete || die
+	find -type l -delete || die
+	cp -p -R * "${ED}${rel_kernel_dir}/" || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	cd "${WORKDIR}" || die
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+}
+
+pkg_preinst() {
+	dist-kernel_update_lib_symlinks
+}
+
+pkg_postinst() {
+	dist-kernel_update_src_symlink "${EROOT}/usr/src/linux" "${KV_FULL}"
+}
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.6.157.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.6.157.ebuild
new file mode 100644
index 000000000000..7bed8780715a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.6.157.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dist-kernel-utils toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.6.145
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT=${PV}
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libelf
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	mv "${pkg_dir}"/lib "${ED}"/ || die
+	cd "${kernel_dir}" || die
+	insinto "${rel_kernel_dir}"
+	doins System.map Module.symvers
+	doins -r certs include scripts
+
+	local kern_arch=$(tc-arch-kernel)
+	insinto "${rel_kernel_dir}/arch/${kern_arch}"
+	doins -r "arch/${kern_arch}/include"
+
+	# Add the identifier
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
+
+	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
+	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
+		-delete || die
+	find -type l -delete || die
+	cp -p -R * "${ED}${rel_kernel_dir}/" || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	cd "${WORKDIR}" || die
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+}
+
+pkg_preinst() {
+	dist-kernel_update_lib_symlinks
+}
+
+pkg_postinst() {
+	dist-kernel_update_src_symlink "${EROOT}/usr/src/linux" "${KV_FULL}"
+}
diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.2.6.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.2.6.ebuild
new file mode 100644
index 000000000000..88d8ae95c0b2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-7.2.6.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dist-kernel-utils toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-7.1.9
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/7.1/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT=${PV}
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libelf
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	sys-libs/binutils-libs
+	virtual/libelf
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	mv "${pkg_dir}"/lib "${ED}"/ || die
+	cd "${kernel_dir}" || die
+	insinto "${rel_kernel_dir}"
+	doins System.map Module.symvers
+	doins -r certs include scripts
+
+	local kern_arch=$(tc-arch-kernel)
+	insinto "${rel_kernel_dir}/arch/${kern_arch}"
+	doins -r "arch/${kern_arch}/include"
+
+	# Add the identifier
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
+
+	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
+	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
+		-delete || die
+	find -type l -delete || die
+	cp -p -R * "${ED}${rel_kernel_dir}/" || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	cd "${WORKDIR}" || die
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+}
+
+pkg_preinst() {
+	dist-kernel_update_lib_symlinks
+}
+
+pkg_postinst() {
+	dist-kernel_update_src_symlink "${EROOT}/usr/src/linux" "${KV_FULL}"
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 6c6eb1c30d93..6f3c46617d3d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,3 +1,4 @@
+DIST fedora-kernel-config-7.2.5-gentoo.tar.xz 284672 BLAKE2B cfac09f1ed1536b63a88c4f501b1bc65ce97be4a5e0fc50db3e3c24965b1745225c5ef2c1cdda30ab2605f6591b6287c5e2b69facce144a5782fc4672a43a00b SHA512 4b6f340b1de7a646e1b0dc76ef7feb39deee6f1ec034d625ffa9c0ecd00bade726a1c8aa4141d76c4cd70d859cfe89129f16efbcc932d79e23996a6812be8a20
 DIST gentoo-kernel-config-g19.tar.bz2 5610 BLAKE2B ad20063ac54c8b1485a06877e1d741b3b2c0a82967e8a84b1c475fc775178de3be39942e0ae00ca3bf2bb37f586da3de35df0d8229f14e1f7f77fa9819c907bf SHA512 7e4846265a3ab9f02c121b4eeeaf494f5f0568b309fc1245a47608a88c520b5b2c265c26bcebfb66710494951cefe718ce6acb4c6292138d46221003b74556b3
 DIST kernel-6.1.102-gentoo.tar.bz2 599178 BLAKE2B 01763e0db371bca986de92e82e307c27c1fa48f1ea33c2d3c5db2a1d6138104b941e9d23c2ae0f8b7496c9519f3975517141a39ead99345e3a6f936c2e8d577d SHA512 15da1ce895048fcd2f7b9be0895ddfcce7f8140443762e45507e3b8edd1307a841b19f45b979125766d7bc397be735df9c93fc0483861f893dee6e548b132f87
 DIST kernel-6.12.41-gentoo.tar.bz2 1178332 BLAKE2B 2202a4e6f80e438e8aa2a7b14749fb284fda690be1af4c100cc4387b4974aa7a35ff9e10f83f0b2454256e3bc5379160a3504ba83228af824200ead36b91c040 SHA512 4498432485222a5b529ab84382e84f302759f5504976fdbcfba6bc8942ca8fd2080fefa873e2724c207686655fc605153ff6fa21c21e64bb55014e14f47d23f6
@@ -15,12 +16,14 @@ DIST linux-6.x-sha256sums-20260828.asc 246577 BLAKE2B f65a239c27ef241b753be638af
 DIST linux-6.x-sha256sums-20260902.asc 247945 BLAKE2B 0b43813b97299dc604af7f6ac01a80c00ee11d5800d1354fb0613ee9fe16dbeab19c7453df242a89d7ee910f6ee9a3c713a030cc07fb085d4fce7c16f1f965e4 SHA512 91115918e6e772e7cd80775e4b360903de19eef6e7b945826a3492b7a95902eca5b3f5bf9d1b3e744f4d5ccefd82e47dee969b8c11d9bcfaec4393f0b277bf44
 DIST linux-6.x-sha256sums-20260907.asc 248631 BLAKE2B 2f10a984a5d3b563258d041f6cec084e17d6c29d5f1cf905f7ff31cf5df3ec9aef50040bb0759b2d879eff80fec73f683bc4682940f1504b9afed77b32685279 SHA512 935ada72325fefeba6d134480c388c8cf7df12ab16d060ee50b5818ff4633795228d50aa2b36875d5af0acad8ebea70b0d8c049dd59caf2fd3556dbf9f3db1df
 DIST linux-6.x-sha256sums-20260911.asc 248972 BLAKE2B d0a49a4346ba6c0f13d122c6fa68ee0e8f1436f51fc7212015d0cfb16fc5091df947d1abd4f8aa2e9388c22a0f64484c08ea21c320935b00f9cdf58a1ccd22c8 SHA512 4bdb652871ef916bd18b7e15fab9f4b110aa35c16fdc2d67de373e5ee811ae97afca7bc123ab9615ed5cf4dc15ef936d8f4ca5e34ab79031a63e1f06e2011879
+DIST linux-6.x-sha256sums-20260914.asc 250340 BLAKE2B 93c4ed0eb9073fb36fdceafb66231db226e6d1b20451a908f5b223ca61ab452a93205289f866d5b3d145ea847019f04e7c64ce7ebaab19b42f23c48019d60ec6 SHA512 d4074ece544fa6e478d4de518dc18387d687f7b477dd8e10c1aa0e82897b4fd6c21095f387e3bb2903e9f2514741510c71f7d2661a917567daa6bfcb8873b674
 DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
 DIST linux-7.2.tar.xz 160068116 BLAKE2B cf5f3d87b96f223034c47c6e5fc972fe52c2556310eb2f064632537b8727231135a8540179fd5d51343738c8a51f51f09c7e8da374324b68551c84a4124bb71b SHA512 47e63679363261a864d271277340a6f2d45f544e1a056be4159df081f4f6537d0efa865c4af26611ab33a3079ee65db88ec2f6bc0e5fff43e0c043cde0cd91e1
 DIST linux-7.x-sha256sums-20260828.asc 11213 BLAKE2B 3be42484550c6e7863570a45175bf3260b4b27af99d129185ff002164571f09128f895d230cd9c0b96ffe6a24d7164d9e9352c7ec709c0752435cfc7616c0533 SHA512 d2e1aa002b6e2b49efedd594c56491d5563a4b1524c8c6e62802a50b49b8e586ef103ef134d56cb7891df9cd681ba194a5cf78e6cb2bb2c668d89dac78dd4d18
 DIST linux-7.x-sha256sums-20260902.asc 11883 BLAKE2B 868477ba5aaf889713f97de4ac66157c95497f9abdd779e8090dd99b676d47e3aedb0fe32e77f2953c82c61397c0be1c60a7a1716a67a5709ce1152ed1392cef SHA512 5d5d9f7f21fc9b803cd5059341af090c4378bc871efde4380e7fd04958de89b67b74079b307740620c7e978cc6b7798e95320d0269ccf77266f275140af7034b
 DIST linux-7.x-sha256sums-20260907.asc 12216 BLAKE2B fc43cf1c26c2760c3f4fabf1af6edf4448cfe39527ecf9034ba87e5118356c9bf3af1698fd60f33afbae468959ba1f456d8a325446f0bee2b2a3ac76814d9b20 SHA512 0cf93af8453deb19c43875d61b118b6c93f7598d18e81368715ee069455ec5c3073495c238f219e3088f74268cea608d84866b0e490d04d2b483ae1cbb194015
 DIST linux-7.x-sha256sums-20260911.asc 12549 BLAKE2B 2c13002580813fec5b5a0cd69d5bd428886a0bae1fa5155e125e8a13adaba4c3b3bf4831532b348ef1581ac118a776d009ec1878747a8f679a0b36af28a4d2df SHA512 6b035fd353d94ca2a482d9c38fcf75a5e1e88e426f6c635237dae0a396929c87ca465554c9cd85a951ffefa48f84af4bd2896aa534fe94a46c938b7ee5fc2c82
+DIST linux-7.x-sha256sums-20260914.asc 12882 BLAKE2B 83b8e10291ae9e0c1ca3795e86c46038d0df560de695687e52932697df2e89454285003e1d9faa5e9f26f622e8388c561474e993bc8201909c0f7bd043a31c39 SHA512 0abd88ff6979f7fffd3f9f7775cf1905b7a5df27cd8783f3cf85bf8428a815641f0112644877ee66b5e164a5a588513f64c3eded461aebc348bf6682c40f6b68
 DIST linux-b19b382f183d421a407f5d708dde1eff5009274d.tar.bz2 1401905 BLAKE2B fdb884e73fe206f91a39e76a76fdb1d703eb0529dc97b7f3129dacd3ae9f33c8acf14820a00facb07e99cee89acdad77b9cb43e95458656eabf375b1bb507b22 SHA512 1a9c210271a8a6b88a304b91a31caa693fbd289babfed8ee7767e834fc860f9a5cb52e457cbc548246cc7816d24490f7568389a71089975edfc4e31bd83f9490
 DIST linux-gentoo-patches-6.1.178.tar.xz 14432 BLAKE2B fc278094f85f58b7aba5c3334503114d28aead086a1e62499111283f0410c02bc9db7f5187975fcf2a793a5ef32e323b9907bbd9e0fb4c0834dc1a823f36af52 SHA512 ae0606ab52f8d66f49cac198aada1cbcced465d8ae43e09ef02cee149125570e09eadfacc07f9ec0ad3b20b365df7b9718a478252771f7c6e09fecda6f701096
 DIST linux-gentoo-patches-6.12.97.tar.xz 17192 BLAKE2B e0f09dd8ef2e6ebce9adcc2c050cb7e2c7ae08188e99635d3b541c6deca5bea792f4ec2c8d0c0dbc648b0c1f227b54a95d8d807a43859b3bf1b5f57767af2113 SHA512 af6b182d1e7661c35c215f4da63c8ab53b1ffffa7818a266b4c5639ed8d03428d050f1045d02e885c1b9bdc9fb2464c3f384dcd55d7536eddf2b90ffe1f8c530
@@ -29,18 +32,23 @@ DIST linux-gentoo-patches-6.6.145.tar.xz 39848 BLAKE2B 46a5473d9d056b691af2bcda3
 DIST linux-gentoo-patches-7.1.9.tar.xz 10624 BLAKE2B 4b502aed968239f52321da548b257b2a06d4e3cf520090d7aa53dbbf77ef5cc9e64d1bb209389f1c51e48c5953666470186aaaa55db378cb34940ce492693271 SHA512 1d2d466b005cc7537aad1e8222411dad8a86bb82c185f139a6972f8354b47f758fb8555ef04b2217cd082db5b1852ba00b5a5eb0673a57c6423dacbe606c7d39
 DIST patch-6.1.186.xz 8087268 BLAKE2B 5f78ce9b0b0cbddd71b4bd4489175c3e1a494c8d4e596bcc0785f7f7d9f1221c10eb5e35b6e687550363e7ee37968ee8fbb7c6fe60a0b2e4e882b4f265b2547b SHA512 5816e156eaa305543af1f06530fd42b9abd2b1b2e79b379800cc534e6bf1bbdfb31c693f411c15c444920b788f3bed1405abaecfdaa2d3e2d7cc34c1f508d8c2
 DIST patch-6.1.187.xz 8109252 BLAKE2B 5ec497e8fc6f086140d425fd7b4ab122d8a579b4d7227711eb0c2493cbf03590e494de9ab1700a950eac3c962dba399c996d94aefe59fd9e6154f7ffb18618b8 SHA512 bc89dd895bbf1ad4900a1a044ca9858fab747c4b46758770426c9590d22d6048adaa08919563fc9b20e9f82ba99be9f99242d7845dcf9a2de707d48dd2de9fa1
+DIST patch-6.1.188.xz 8362360 BLAKE2B 2f97dbb61f5f7f29a009866ccb3ebe10f87b18ef8da32245303edc68a6ad18e80ec27f08bc6bfdcd7a6387139437559e7aa3f30357c298e88c7ed8287875fb9e SHA512 78c57eabe1dbb76fe39add4d54efa8ca3e34af601aa6869e46a6d58d6e9cdcd51cfa03808c167c22996e09c1471fff7bb062631f09e6de60d5b03e9b85822ae2
 DIST patch-6.12.107.xz 5646156 BLAKE2B a223da9e2d6d8f52be6dd2935310de152a3afce88b5ee61bdab0e688ceaa6e96c1cb25e9378ecb64600cffa68f2b9f6f8b44ba203c7ec9076444d1b4bb73b222 SHA512 b3a97567c0c5a1bd0903a6f3f520622a0fb6b0bb29447113b6e77dbfd802470a7bde78e18a08ae3f3b848e55cc565389b58d989640ec40ce8b9aa8cf4c4a14a0
 DIST patch-6.12.108.xz 5674920 BLAKE2B b3cd77d6351c726f5eca6a5990cae7702aa95f1d7bcb4a244b483cafba951af1e500e1bddb632a6a273c180beebaa9bec527ebf5d0efe7463d979878aa5492b1 SHA512 8fa2ccbb55ba4cf6c6613e97696525b69ffbd88051fb3f9e2a03c98daa84d3f657f43212da7e4c2b5450fc405331f714e8c72ac12cd79487842a26c65325627c
 DIST patch-6.12.109.xz 5753324 BLAKE2B 9ddaebf8cb9e93e79ccf02efd4e65e8892ff751e3e660f00f8032c42ac275d72ba4aac1d61b8f628a52c064a5bc54c34d05a9510b6a9c9d90f79097c4f7e41c8 SHA512 bede54fa2db04d3bcb4b1e30369a897135a8fa6637b339a94e21cd6e198f1404109bb52626bdb3f88406e002c6f4430de8e05fc20bfeec37bc4ef434120e707f
+DIST patch-6.12.110.xz 6085060 BLAKE2B 8d1d7ad14511974f9c3508a34b3fe77284278a0b89b0cc94bd256a7d12b00c4581b49a4fc9ae3bf5b4aa67b5b76b088a9c29a1701ea9a6aa88f5bc76d4268d74 SHA512 b431836ce3b6b42b0c1ed810db6c839bb3fc7bb66b014d1a89408e0fe6d441da24e40d50d83be64e1992dd432dd7e245dafa632302892dedc46919caae354067
 DIST patch-6.18.48.xz 3258276 BLAKE2B 2065b089db773cd504b7e09e4fb111e68463ad2846368090a40466044fdb63e2db5ff1d069c7d0c83ce77a9f85c9c5507d78eec8bd79409f1990aa7c21c4ce8d SHA512 18b4d5a32a430f8599cf821e5f873e9d669e4994a21f0a98084f1780bc233a13250f69c162f440ec9ac62551b03532f99332ce9ef90b98b77e69b96c63a05a48
 DIST patch-6.18.49.xz 3282948 BLAKE2B e1a030bfe327190d14a9d3eefa77c8823a276d7f84c112a01e1f99572f35e283296415fde0a8f3f92564682a7c86b046045bd4d57f66e940bb42bfc65beab4dc SHA512 6cf1fbc3cedb1a2ef11c6ec7d045aa0f8214cb06ecfdc30cca7724207a40fc896deb6dde269d8bd87750ffe07634e7429e076e80167755526d634698bc3980a8
 DIST patch-6.18.50.xz 3404240 BLAKE2B 3b7794114d37bf1f5f0c95b5b6f44aa33c00096a162dcb6fc48006e22871d2f731626f8759f54bc30cddb8561d75896e0546124e5b11b9e6332ea121d55eb164 SHA512 2ebefa6d5c0102130ecc8445e58e674e581568b728e4b40e1dfdfa3039a10c9d1af533b2b95d3b56ae30a056838af7bfe58f78c1642c56e3db14a3c1228ffe75
 DIST patch-6.18.51.xz 3545252 BLAKE2B 1636bb5b2dfab15f9bafeb215f925acdb5c7df0fc544d7787ffbe76cd1efcaff7cb99d925e39997e7cff37266192dd07ad3d7de3a8a845a907de9d5cf72b2dcc SHA512 c5022b7b718093b791237599a00565bf37f7e6d256e136c88ddc9508163cea5993bb22cfbbf928c3604e12ecb76d7e2ce814a3634d5a65e7c84825eb4e773f9d
+DIST patch-6.18.52.xz 3996672 BLAKE2B 97ef23b4b70a2e02c1d6c2fa2b4b1c895743802007f2ac6ceb8df086c9b9fac1cff9b80c210761775de5d17012ea8c9ff9c7c3bc1561f087b92f623ec3302c8a SHA512 f1c32303a8eb7f20c7f5c8d592a23140ff880075d0e4151bf96d5b0365ff64b35324753894d8ba822ad797e673b2a878f18d6a2f557dd6d3aca1fcc8d4e5764d
 DIST patch-6.6.155.xz 6891280 BLAKE2B 1df8fbf4aab980280a52f6199f44f3030f917872fc5bf719dcd6bfeb236cd340aaea6cfe1da06948bbfbbdf4f89232a577e11dd0e422fb544ed2824b12f1c9cb SHA512 09f9f30b4bb33a324e3237e7eef78fe0dca9dc5d28e4c432a6e6bffc2a02dd4828f19bd1f0572e4f98cba94df55f427e11248689f0ae16437d0ef4cdda1a977a
 DIST patch-6.6.156.xz 6914532 BLAKE2B 95bda8ed3689d35c3bb5410f3c33b80097f78b038d343c33df3699dfb9d216215560411b939f2c6e8cba8990aa1169e914617d2432e14674484bbcac0b47d175 SHA512 de670a00152147ff05f19a5d519917bf522dfe40b3b88619e76dc768ffbf8d4609ba761c600c9441521de6254f87a6a2cf6162218ae90b1e75d7f5825c5dda10
+DIST patch-6.6.157.xz 7211724 BLAKE2B 0b1c80d86bc3fac163ef830979d2c3492e6b72ee56f17c18ce561b399a8b36d7292aabd56012bc978a7bd0b319551f7fb86d688a5e974be01a069446058f72b0 SHA512 6aca3405b62daa0e1fac66d5500705d6d780900b2960e2f50449b0db84cb4a1a814e7eadc9d97a3c959262e3cffb8ec63492ee6c3c0af163c1c8f8a10c184e1c
 DIST patch-7.1.12.xz 1401192 BLAKE2B f78bbf6e2468cf5324d0ee1b9da26d57e605c1f51c83b7bce0c5cd4776d7496c5160d6877b9efa6a0c470c1f479220e5b40a309fafd85da0ac50dd0e2cda5273 SHA512 ec4443c4af0ca05597fc45241a6676179ff562f49b8c09639c123465ea357d48d74f05f5b4b229f056b5ac7f497a04c2fb864cdde5dacc2f466637d4eb8ca330
 DIST patch-7.1.13.xz 1427684 BLAKE2B 6c80c845eee5e6b231aab8b3675eb25dee0a1257b1138501634af31d4aead57102794d155dc012498b424e523d6a472e3ca7aead4a7573aaa4e30ef1e27f7784 SHA512 b858b8594d0bb2b401a947d1c3bd3d25e4d2c07b6e07b5585a8fd84011fbca4c23f3f0424dd74a338358dc42aa53eef2d88205e1b4ddcdc8abe382b922f8d461
 DIST patch-7.2.2.xz 32596 BLAKE2B d3185df869fc6613476a9bfcae4ecbe8bc80891593df937d2ec76bf5c6a92ff0af2395abfbf52604d3083afbf41d49d1fbd8d7764bc5c6b76c87a05703b6809e SHA512 144f29bcdf647b4d90179ca4132c0e9fa1d88993bb29ac84236c10c790188d79c827e633cc6cc852ea4b6259b58c6f25a8fbb7073fedf7434e9b0f07f986c2fc
 DIST patch-7.2.3.xz 62920 BLAKE2B bfca37cdb0500afc3c369314e6cbd11871421a380e99436a3e59b689aed674f0eec7b1a605d2bebd3df84a68a2069a1ee05d437444776e0307a4d4535b88deff SHA512 b5c48b2b288bfe0e5aebe6889ae4fca078a33df5ed69444abf3da102ae5b34a0ff1747c3f141a3bb729177a97e19623dfcadb5b950f5cda7a559be0c5cdac898
 DIST patch-7.2.4.xz 281532 BLAKE2B f8bc83a92f50b064328727d28d0bb06f660e9b0fe4ccea980a81804776040ce6e7c2d71dd01656dc5a833d53f0e80ec4af91c78df37d20b4f4118673af26708b SHA512 e5b244c7b7c652d55114e4f440be7ac8eca617bbcc704ce9528bdfd793934449c6fdca3424d8e17ef6b6c053952c2aec860e34701d2b6ff9a2d09b1e52d76773
 DIST patch-7.2.5.xz 425448 BLAKE2B ee8ab8753089280cbd9afc0e424a84099e4a88b95c383618a18e009712a5862e8f2b72c90a9737197fdd2fd5c844d8fd9083319c053e9065cbc769d1253e3d16 SHA512 60af2204eddf616e3e31cd4e5f6043afab3956443da3221b9048f1e2ed7a539ae5b69bdd0ea9a664938158d099c8d2648ef66a86763305ceb7a4db8286438fbb
+DIST patch-7.2.6.xz 1049176 BLAKE2B a9aa8ced201d5c98fc971436508f9a019eb2e9cf0cdc5a830cc7e707613fe2750dd8d222646e55973e9264e722a9404a0e418a1a2f4385523c02f3732006015f SHA512 82780c916050b619145cb4fc3bebff0a3aaa34caea5c8e41e64e613a686cd2f44cd1f13f0c60df952415d25c0f4ba6f176d2548db2df2292680539cf457aa42c
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.188.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.188.ebuild
new file mode 100644
index 000000000000..2e7a673e2579
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.188.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.1.178
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	local patch
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | loong | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.110.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.110.ebuild
new file mode 100644
index 000000000000..a780678e7f08
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.110.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.12.97
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.12.41-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	local patch
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | loong | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		riscv)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+		"${dist_conf_path}"/6.12+.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.18.52.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.18.52.ebuild
new file mode 100644
index 000000000000..1984eeec9576
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.18.52.ebuild
@@ -0,0 +1,191 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.18.42
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.18.12-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+# Debian kconfig commit from:
+# https://salsa.debian.org/kernel-team/linux/-/tree/debian/latest/debian/
+DEBIAN_COMMIT=b19b382f183d421a407f5d708dde1eff5009274d
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	https://salsa.debian.org/kernel-team/linux/-/archive/${DEBIAN_COMMIT}/linux-${DEBIAN_COMMIT}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	hppa? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	local patch
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+	hppa | mips)
+			> .config || die
+		;;
+		alpha)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config.alpha-smp"
+			)
+			;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config.armmp-lpae"
+			)
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		loong)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/loong64/config"
+			)
+			;;
+		m68k)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/m68k/config"
+			)
+			;;
+		ppc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/powerpc/config.powerpc"
+			)
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		riscv)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+			;;
+		s390)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
+			;;
+		sparc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64-smp"
+			)
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+		"${dist_conf_path}"/6.12+.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.157.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.157.ebuild
new file mode 100644
index 000000000000..3e10059bb2b1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.157.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.6.145
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.6.12-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	local patch
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | loong | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-7.2.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-7.2.6.ebuild
new file mode 100644
index 000000000000..9a21214ec391
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-7.2.6.ebuild
@@ -0,0 +1,192 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-7.1.9
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=7.2.5-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+# Debian kconfig commit from:
+# https://salsa.debian.org/kernel-team/linux/-/tree/debian/latest/debian/
+DEBIAN_COMMIT=31e70f1f469ef1ce4c910df1d12b7de09da561d1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/7.1/${PATCHSET}.tar.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/config/fedora-kernel-config-${CONFIG_VER}.tar.xz
+	https://salsa.debian.org/kernel-team/linux/-/archive/${DEBIAN_COMMIT}/linux-${DEBIAN_COMMIT}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	hppa? ( savedconfig )
+	mips? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	local patch
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		hppa | mips)
+			> .config || die
+		;;
+		alpha)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config.alpha-smp"
+			)
+			;;
+		amd64)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config.armmp-lpae"
+			)
+			;;
+		arm64)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		loong)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/loong64/config"
+			)
+			;;
+		m68k)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/m68k/config"
+			)
+			;;
+		ppc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/powerpc/config.powerpc"
+			)
+			;;
+		ppc64)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		riscv)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+			;;
+		s390)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
+			;;
+		sparc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64-smp"
+			)
+			;;
+		x86)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+		"${dist_conf_path}"/6.12+.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ecd8ecb327a5..1552dd593bc5 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -4,6 +4,9 @@ DIST genpatches-6.1-202.extras.tar.xz 4032 BLAKE2B 5358876e429dd996097968c01ec06
 DIST genpatches-6.1-203.base.tar.xz 10096904 BLAKE2B 2403fb7ceb1d7ed511c123a3dc64a378147b5556653f991eaa39c305b10b12d52a8b9a6cae7a3cbd3a4cdc600e807424290214255c2c0b5b9f99ce8a4fa26f20 SHA512 2c671ba09249b5af0dd8d07ca16484d508edac943ada942dd51c61569c79cedffc557779de781b6522ff9b7af26e08472d8d82e2fc54c25a5892a9740accf5a3
 DIST genpatches-6.1-203.experimental.tar.xz 17704 BLAKE2B f8766fcdc100a6206d6089f76f7fa64d1e65d39b24fbfb8d8a44e4cf7d66da29206bbe9bbe001c940b474a116270dff63cbe6a3938a165aaddc59f5ff8a3f348 SHA512 0ecccf8c3376c6eb22b0095b9f1f2654f364976a6f7db12b15629fa0d0129111799bc9e2b5ab784a7da5a68cd60b6a8b8192ea3d131e2bcc0cc7df6661abd7ae
 DIST genpatches-6.1-203.extras.tar.xz 4032 BLAKE2B a3eb01b7f474fdafa81a02b24e8a5ca76515c696d22c8c1c7dafe98d96dc22cb28e16bdba524fda40b0729bdc60f13a76f889459dd96f48788420ce0089d31f5 SHA512 2996d9a60ebf9953f1f5ede780594c9ba639c0c5034e019ed48732b0605653a1733485ccd765681fa0569c7e1ada731bd99ee0b73f37481b3b7a91cdca2917f2
+DIST genpatches-6.1-204.base.tar.xz 10418504 BLAKE2B d0055770d4eb7b76c28c81f496d5848d2c4fd4a0961c070c86e6cfb4e7918b72239dc171b30136a4864941bca8abdfa82e2abaf979a808670aa6e14950418c47 SHA512 57bb5693b203b2c0d3ef726601a000f2ddd396056bd8b8cfd98e6eb3b52474064888e8d084274d102a8da848f038c162d9b695d21066f2be1e230484ba9d44e4
+DIST genpatches-6.1-204.experimental.tar.xz 17708 BLAKE2B 0791b5e89b9c4b78d758de77d7838442b1cbf159c55a8d8b4001e19c1d6822022fc1f6ce78dd6feace51be32f76da634e0ad00197310eeda74ac6592bf85c6e2 SHA512 658990ed66c1f430389cdc86f101fd61bb87033369988f05038586f7ddddf2719093235218c5b0b59341ccb175556acc6e857192d956254fb01f4b47c6845091
+DIST genpatches-6.1-204.extras.tar.xz 4032 BLAKE2B 4daa1f7560285a659f8cff0f0807d551527c1e543799a8e395b994e0683a959d3e92f4ab26bb9be8a07868d28860a20cb85fa2daac3cbe4febbe89163367d5bb SHA512 616e05bdad9842b7d7dba3f00d79a0f69a38478efbaf7b7f3b76d5761261c23d14e06f1f452808e2353823509b9877e3744e896cfb8a8c4c1abda2c3179563eb
 DIST genpatches-6.12-119.base.tar.xz 6625800 BLAKE2B df833db761f479d4b0459ae3846d9c0f39ef8f70f0f8e706ec3e83b1520a29629738fc87660521415ddd650514c72045328dca64964c4cb388b2a757978b138a SHA512 52f4e61ef4646699a97074a5ce65550c95a9cad43558491b0b59aa3a4e1fdd7b08d34412b4436e2ff1c48cccbc7b8bef417b3a6fd78230363b5ce5497e393ea2
 DIST genpatches-6.12-119.experimental.tar.xz 6048 BLAKE2B 10da87c50b95c080b1ae5e9899c867b5fffdc4f0d88040a98e457bddd6c5c305d2d1c9bc1ee310f178463081cfad4df18964bde4c29d82bfe8b7185d02e3e673 SHA512 8fef799f8e96bfeb1d10a0826326cb582a656e8f4df46a6bee40df7545ea323650ee568efb66e51d21634a3bd88367d31d138aa980d294ba371402b8b127445e
 DIST genpatches-6.12-119.extras.tar.xz 4300 BLAKE2B d6a99c9efdf563bcf96754aaa274a57650ec81f9b0ea48a42244ae85d28673111befab4e7d27fadd0585af9b54b681d900f7a1395565ed750428da3431117c5b SHA512 8f13503fcf18d30b0b73cf50b2b436fcd83268e0872635c29b3c72de2d84c54bbfc7d74bfea535e68a3186ecf9fa300e1292c099d285ab2e066045db389cf9a2
@@ -13,6 +16,9 @@ DIST genpatches-6.12-120.extras.tar.xz 4296 BLAKE2B f0974ce0c05ec60dcd9d77d27767
 DIST genpatches-6.12-121.base.tar.xz 6758036 BLAKE2B c550dcc2504ea811a332f532f06aed6e630a40080284791866156e6eb16275d73c0a1bb7adeb1f11d08341a35795b3050b10ce7251d216467828c3c3a0ed4c75 SHA512 6b4d1ae4af72913ca9eace08f37b4ddd34453a520d8409f4d45855c1a659ce47012a7668d5c8930afa49957318ee0a674c78752b9f34c2119f8d5629aa057296
 DIST genpatches-6.12-121.experimental.tar.xz 6052 BLAKE2B d053c28b230e651e2caf41547245cffdcacb29a178ccec834e55d2e9e0eb5e390e4c4f84b966430c5eb888fe3cbea2273156c07f13e9ab8b8635c2090eb16a8a SHA512 db1ff2937ac77344e89da06101b3323a5e9605766552519b526b6bf262098e5ac9a63326374466761bb1862a1d0cdadab2cf18a3e859a2e8b377e4a6f0612a78
 DIST genpatches-6.12-121.extras.tar.xz 4300 BLAKE2B 7d5ce847a3ca2b7f9dd79794de05e718f591e49733fa7250fbdcd892e5c243a65b2cbdd3526cafbe2a9c75b708debbc51593ed530d4046c48ea29ecf966e4914 SHA512 55059a2fbd0a584066b476d16db1e1efd80c89512cca21a6d99605b4880a6a72f3f8014df91ac9d2543cbc96553ba6e7ba20c34f6c5a215eb422bda2f685aa9c
+DIST genpatches-6.12-122.base.tar.xz 7158960 BLAKE2B a82b4c8c3051d3e74e018d235070a33c6ad9683c53f9eaf5e363477238e81ea03f20854e0f645a4d0529e18276bd7359ece73a03b563f9d760bf14811608b86d SHA512 a6bfc6a57eef45b3c9becc3e8a277607bec7ff578b38c97653d85e986ec4e622eff2d4f7bc64a4cfb3837b1c18e088639ac8017ecfc8e9e04a33647adc3f3051
+DIST genpatches-6.12-122.experimental.tar.xz 6052 BLAKE2B ae6ba83764b30a4faff1f755bd18161018bfd353fe56fecb1f4ec8562cfb4924a775fb2e3d8646c478c62b92754cfa1b9028b03ead7ea7474cb19ea54999af3e SHA512 3d042c04c7ba0ec4bde65a4fb2704844b9d0a241ba9bfe884d04bd134ce409bf9846d5eac7434e5885ba2f5480005880efe27c0c46e9eb4b2ee4ae7baead7f91
+DIST genpatches-6.12-122.extras.tar.xz 4300 BLAKE2B a2d4485ba7102841d740bb8e4707e05c032d26a12bd9e8976345a549160d29e67eb905777b94155f6e8cf7f8c7cf00ef8ec9f270b39e526235a42e240c532493 SHA512 17bdcdc914bdaae544f68f889888bf31ea23febf5a5708f53bfe00c20bc3197caea33f98f88022ff79c7eb8f931a3bce0330e3030f80a7914ec3a8eb086b50a9
 DIST genpatches-6.18-55.base.tar.xz 3541812 BLAKE2B bdb2bfb0ab3bcc33b78ae97239b5d5a04b46cbd7bc12f1c1734374873e5225fca56f6345335f47ca285f0c51c3fb491e0e4f46dcc8b6dfd33f955b27260aea3b SHA512 82e892fbd353ede694eca0931fa1bd1424f6b831946b931bd1df052af7b8ad87633f679e4b7a16f7922a6a6e1b2761cf2189ba129890fcc5945976111ecb6b06
 DIST genpatches-6.18-55.experimental.tar.xz 6004 BLAKE2B ff266b56f061adc0f6e18a377cb073bc1444e673cc674b921f3095216650b74a6e934690506af4ccc0b56ca7c47701ac469b581ffac3aba1d99854b1ad8da560 SHA512 0cb31585f99b34e563bffbceab9998dea6de5f425a54d910ef861fb09d4428094607f9298fd1ba105ca5e15b177ac91b40ecbd80a461d6597c927df553a5eda4
 DIST genpatches-6.18-55.extras.tar.xz 2176 BLAKE2B 2b7a5663495da66163ca13b8f0564ef55e60227ea382d63a6c2cec8618eec30ff808480ceac41cdaa861e2f53f5b5af1b210a609e165ba7c3f71d4994e801594 SHA512 0c842abceb93e45ab5eb777a1371c8a0159374667a8aef23cebe369fcfaaebad8c7a2dae998be184cbf1382cd834c517fcde083be709944d3d163b15a0e92963
@@ -25,12 +31,18 @@ DIST genpatches-6.18-57.extras.tar.xz 2176 BLAKE2B a7b6bda82a3ec551394411ee8ba10
 DIST genpatches-6.18-58.base.tar.xz 3872988 BLAKE2B 964fd4f7e975cbcedd17e937c453904e965795dc0da10d17957cbea7f023531d57709e159be3848fb3f994c89d8290d425baf9211c48a01de7abf3a777801e2c SHA512 c0b8f0a939feff82475116806649ed6d988853ddc020396ce0bbec37760f32394818d99c5e863b4db3bdd85d7c7b899db3f3e48fb60ce8c3adc6a3042ea4b84a
 DIST genpatches-6.18-58.experimental.tar.xz 6000 BLAKE2B ed8e795605651f839dafe8a6078cf75f4965c8587bbc80e2ed7d37893cf093a5632085f85335efefce6046f720d48a8968e10d4e51869a99a2c31270ef81b234 SHA512 d9021a82cd4f376b27adeb4e86ec85f78ae384dfc9757e51065f088abfd02275c5f09e8eaf01bc9d38acf82a6e16844a739714c460b014dfb5754ff2269bec48
 DIST genpatches-6.18-58.extras.tar.xz 2176 BLAKE2B 00604e5274ecde3f299b5f1cbe47a1f04493fa5a677e394b1c448f1b08cf7411e2e7c7538cae7cd4367c3122596d44cbca1002448164772a2d3f74581e9d160d SHA512 9cc38d75ddbcf90faa04e4eaf871df3fcf2cb618b3d860535dc4a2e086900af511db39f4c1f3950552ee0a1eecd03e16e7d55a29a8583fe6f1b99e94dd23f182
+DIST genpatches-6.18-59.base.tar.xz 4383624 BLAKE2B 120efefe8e08019cc3226bbb3c5e5f6942d2dcc384acbd2eed51d681c3f141908775dae003fac3b00e458c2608cd2ee819c88e3f59b37c8ec9fa9f597cc9ed20 SHA512 871e8beef6b1c9a4fe0445c34a3d240f20aa45ce8a3c53498a7fcd0dee6c9c769770ee34af60acb7bcb2450422acfbaa209f5441e7fff53031cbcea3f07511a2
+DIST genpatches-6.18-59.experimental.tar.xz 6000 BLAKE2B 071d1437e61ec500c5ce1047a561c3798388b1111cc57a1e1a350a7a2c906017452609a1c3b540ca74ef9338b94780b7312a1fadb1b6c7bd7b4e1178af0bc872 SHA512 a5c3c20d1e3df67279ee80a798de165f2af5ca371a32de80f8520a928bc9c55d8eb909bdcd64025fc956cb2237f66ebb2529e2a33d85378487abd1881567e968
+DIST genpatches-6.18-59.extras.tar.xz 2176 BLAKE2B 939ed95fa63011e966cc3b35872e0af458ded656d0591288f00cd91d827fcf8747e990c024027e87e71accc223a2ae35a837b16f64265f37afe86532ea8bc4c8 SHA512 46db5cdbde3c5ea212c2ebd19c9afa1c697054b48d402b3fa1237f3a05575fb6bc716096b8f024ceccd92208d24a5e5d308f117a11dd6604b1b8a8f19b61c21c
 DIST genpatches-6.6-169.base.tar.xz 8389116 BLAKE2B 0ccc10fa8b2626844997df44bff879e3f3913a2b0042ba84651c1580c4362d1c733b7cfaa0060e84c6cfc40aa99679c4904419c692c4bebbc77d0b54c8487e38 SHA512 2758b54d2d8dcc5caaa5a89fdf670c66b6124a98edd2431594c6e09f60c3a44a9fa41e7168b3a3559c4efcd73449a3b3bb53f2b35113d560497e97aa335a817e
 DIST genpatches-6.6-169.experimental.tar.xz 6052 BLAKE2B 1f24146a9dcecb58e393c55e897bcd0d6834b6834c8c5ab2d85faac0008bdb0ff324bdd9e628b57834e3e3b489c6c6418611e61b989e37c1f731b0e36d1823d7 SHA512 660cec2d1dbd492bf8fb2843085a797c4924a94d4e3541963ff383a4bd106470cefbf24ad9783993b5ccdd066e73b3ca9d1f47ce92ed5c4da549d0f9032194c5
 DIST genpatches-6.6-169.extras.tar.xz 4028 BLAKE2B 30a8a55f8bece00a92a12aa53b03adab7b8d8941575e58777f62025cfb9e786e5196561a9ff51b6edaf7b703bdd84d987661d575d1a2c007730276e2b639081a SHA512 03fae8c9d0757d10ce68e5cb9c9aa684391692afba88ff0771ae4c0e813c2fa9ee42b8558404dc1782452e91a80ec2adcbad328cf68453a19be8c400d83b617d
 DIST genpatches-6.6-170.base.tar.xz 8419868 BLAKE2B 23e906787639e838c7e1c9ba3dac5648bd8d34e6bce8895bbfaf888dba99355cc13fdf8228b12364b3d0d81bbe53f8f9c61fae48b5fc72b41584cef41e4659f6 SHA512 eb74afe29e5c4047862e473def52803b89768b0c953cf8568b8dca13291168823e130c591199567059305a01017659acd9a491876fd4d9236cd5df89014633dd
 DIST genpatches-6.6-170.experimental.tar.xz 6048 BLAKE2B fffc9854e81412fffd07f0f33ceecbd26a33e127ed4222c8a01a8e1289781ca041d197c27840ab4cc6ef82d80a290ce576f631adcf8fc347bd0897b433f28959 SHA512 3bd7f89f371b48fbef39508bc22a9e7fabc8378d538cc4819bf80cf6bf4ce7471c39b79863d7fdaeb63c7c9fbae78f52540553c01590d487e66861f52735668c
 DIST genpatches-6.6-170.extras.tar.xz 4032 BLAKE2B 5f33e50e718ae53cec2e92f1c6dad432dcacf174478c739de5d488d4e5981fcc23ce0a1f53f263b2cd4cce50b9b0a48960bcfce50dcb4dbad57657a96b4d0fc1 SHA512 4fe6aad78aa5a9b12c62155c4bc47625ecf7934e2302a6b26e2d09741d90cdbd08ccabc3c5c0fb5fef4f21f0531c096640ebcd33c261aae53e686135a9b3bfd8
+DIST genpatches-6.6-171.base.tar.xz 8794668 BLAKE2B 59c8660afe0581d3814068f4a1984588807ebb464ce6b4e00222784dca0e7d2312bc3578b74631d1c795716ce2fd7191ee1fa467555d04e3e911f9e4154092b6 SHA512 f69296a5e0b888065054f0977e37d58c22e4dd8586c7b8dd82248ae46518f04d2a209e6e0cbdcae7fdce8947bd35d237c4c4ee24003c2ed8b04a3fc73b7169a2
+DIST genpatches-6.6-171.experimental.tar.xz 6048 BLAKE2B 0ceb54d9ddf2d5924b658c7b4a35f5ca2b00226de03d7fd96b5097f4533e295b53a5a0269849b6005865552ff5ec4da780abf9a5711886545b17efc61824431d SHA512 9456dc5fe6b9219fc24412ee11b14e2e9d2a92d746a10ab4f596a709811b93d337dcc63d368a597dbe394e8f5b94990c135d35e03abecc641c4b01c7b964d401
+DIST genpatches-6.6-171.extras.tar.xz 4032 BLAKE2B 3df3f41a4de0a744c58de290dcd0d26d5163c427da4f9aa3c76a9c742c7f83682ddd6f67df3c1f068abe28f0cd5b71e2098fc39ff37aea6992b412a83cc5c7a6 SHA512 85b6b2824945f7799b8f79a4a814f157b67f2f20e2be7ce267593fa7020e9bfa2cb1bc0eaffee1f855c7ae441a31fd5d8f08ff3721da139460962e04f07affb6
 DIST genpatches-7.1-15.base.tar.xz 1443592 BLAKE2B 1c4b9e1b06201bb4db2ab22a151f03db6fc0f77f2c38dafdaa5deb17f21211d9a9ea34b7c62745cbec88dd42179a2dce1a49ac92a7fec0caee776db07402d364 SHA512 cf760d6828dd61c3ece4eece33dfb7e6a9975c685fd40fb991da55a9bc8ef793cc7c166102dccdcb0792e5c68b82d6ab697faa9747ce74a9869a105e706d912e
 DIST genpatches-7.1-15.extras.tar.xz 2176 BLAKE2B feb1fa3f8d08cba7e55dde1137c9460c66fca1f955da907a64286cac99204e9cdfaf3d67569f7ce3831c5244c345a33ad0e0dc46dfe65f5a5dcc3848e70bd023 SHA512 e42815e6864282cee77e537b5883738b1379f6cc088c3ff08fddadcb9dbffc549fdd8f37e99d052749f5e5ba9775809990671433cd7071f24ab24fc2e1633970
 DIST genpatches-7.1-16.base.tar.xz 1471484 BLAKE2B 897e31bbca698babb1e8a8061c52308053e4077d072232269604e9263e274d0d1e4eb058042ddd3274edb2ef300dd0d2d3c29796fa70b07559de3be251c602a3 SHA512 8284453894f9a1cd9dc7403f88ac5ae43e3ba5180891be46d449ecf1535cb718dc96bfd2b30dbb3624c9ca1054fc5bbc973df748b6e97696a78874bbd89405db
@@ -46,6 +58,9 @@ DIST genpatches-7.2-5.extras.tar.xz 2176 BLAKE2B de52b3a4c63cc2bdb01b2aaf3f68009
 DIST genpatches-7.2-6.base.tar.xz 436380 BLAKE2B 0a9cb6cdb0b4356d4e17956de69b1b2bd3f5dd4f9e3288eff40e642e0542e7c2a12e35d0ff5731a03cb1ace1a15d0bfa83ff193f738298936d32471a3c2eb2b6 SHA512 687d159d94d7df919533f6ca12534c5432e162a0cf2072d07bb839c21c4a14675b1f4b615d35ede6533b4d2681a0c66b2573346e478f67bb130ee74bcaa049dc
 DIST genpatches-7.2-6.experimental.tar.xz 76720 BLAKE2B 93388fb31e8f89559b95a230284408167eea45e034468f85eeca31541ff59cd9eb340e123ecbf047b22508f7fc8907f74d072b43cf1d3a6e9cb5f8d5f4da4c66 SHA512 19bb58b974f70bf1ae47c6f64be41b8121c88c3c444e68bcc20e451084e21aafe33dacc55a6387e96c233ce26a2143305b806cd89a95c7eb94d9fdd50fec9074
 DIST genpatches-7.2-6.extras.tar.xz 2176 BLAKE2B b8b6fe9c51dd55adfd62713061261e29becd28ef520a6e93a7a564d5bf5384ad73d62f980dcb940bcb05ffa8510cf4b68265a5f2ae6b49917790828461b5a9ea SHA512 cc40b842efcadcb5fce9715c9bfefbb7235f93a8e903be193aef38636f0a1e27e048ed71b453e578602b6e01e64b6a61e7257fbe88556a6640dc67c23e4a16ef
+DIST genpatches-7.2-7.base.tar.xz 1067984 BLAKE2B 314a56307487d0cad22b5ae1c5d2ad3fae4d31210b7a0a57c3aa902263efffe5fbf15d584d29273593372c24163d6d420561c03b7cf544d3958343be14a6225d SHA512 8647f460b73f73b0e9f26d42de9765eb34801da00ad65fcc2a474a82fdd9b3dc721fbbb6e1846c758235988b5108b2cc0f0f1f4983a89eb99852c1d2ea2e6e23
+DIST genpatches-7.2-7.experimental.tar.xz 76576 BLAKE2B 395116540a07621994dc4e744f5eb2a3b3c94d4033cece0b8503c0f9a687a958eece47a11d548272828fad4c7f03fb09f412b6378f225ecc81d0ad07361a19b8 SHA512 790e364bf4f382d1aa4b8245e8e71c12f59868a22b051780cb07f9a15187b23c34a2ab8456ff64c88df39bdc838bd567d53244948255f1dc8c9734dc929284a3
+DIST genpatches-7.2-7.extras.tar.xz 2176 BLAKE2B 7d71cab0ab7af87880c4ef5e03d63084b72d622d429abe6db7a19181c5f4567ab17a9a5f6074612b28896609600044aa735a0031dffd14c934916df2b4d7339a SHA512 6b9cd52b2252e4ca12f67fbd82bd39e48d4baa425296e763f1b9547e1d341cfe8f63051906734f7e8c9d78f1105448bc5d90c96baa15b7cddb6544ab60df3420
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548
 DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f SHA512 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.188.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.188.ebuild
new file mode 100644
index 000000000000..6b2a0ffa93ce
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.188.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="204"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.12.110.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.12.110.ebuild
new file mode 100644
index 000000000000..894558b12c1b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.12.110.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="122"
+
+inherit check-reqs kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	rm "${S}/tools/testing/selftests/tc-testing/action-ebpf"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.18.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.18.52.ebuild
new file mode 100644
index 000000000000..27018644381a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.18.52.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="59"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.6.157.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.6.157.ebuild
new file mode 100644
index 000000000000..516d5bf8089d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.6.157.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="171"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-7.2.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-7.2.6.ebuild
new file mode 100644
index 000000000000..6cbf1bbdc9cd
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-7.2.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="7"
+K_NO_VERSION_CHECK=0
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="experimental"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index b850a67aba34..920f9f6f7a24 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,3 +1,4 @@
+DIST fedora-kernel-config-7.2.5-gentoo.tar.xz 284672 BLAKE2B cfac09f1ed1536b63a88c4f501b1bc65ce97be4a5e0fc50db3e3c24965b1745225c5ef2c1cdda30ab2605f6591b6287c5e2b69facce144a5782fc4672a43a00b SHA512 4b6f340b1de7a646e1b0dc76ef7feb39deee6f1ec034d625ffa9c0ecd00bade726a1c8aa4141d76c4cd70d859cfe89129f16efbcc932d79e23996a6812be8a20
 DIST gentoo-kernel-config-g17.tar.bz2 5551 BLAKE2B af2c06a14d214b8cd9d4dff6dcc4a3aed4e56dcd75e35238d42e06d3c05cb0d59859c5f70a423d78d91290c1479b8b1729ad3eea3f352d2cf85a0b023e2eb11d SHA512 78e56d699fe5b65bab144b7713f0a9785b6f00643eafd0171a2395f56e34d91a34fce8dd234427b8c18a7ae12bb52bb39e0f282c11de6451b2737fc61f183034
 DIST gentoo-kernel-config-g18.tar.bz2 5604 BLAKE2B 172d733748afb252f6a01eee53258d48565a6961f96195c6731938897346c35ef88fb239b7eb50cae260f0251977c5c9499102d64ad63d7c81488968f3975927 SHA512 7384add589554097249bc1815a2353d45e17dbac15b1dadbcdc7c8ebbbaa4e13f05c69d91dfa56f7602692b3f400a01a689d7f0eb2de34b8a8cb261a5c1353b6
 DIST gentoo-kernel-config-g19.tar.bz2 5610 BLAKE2B ad20063ac54c8b1485a06877e1d741b3b2c0a82967e8a84b1c475fc775178de3be39942e0ae00ca3bf2bb37f586da3de35df0d8229f14e1f7f77fa9819c907bf SHA512 7e4846265a3ab9f02c121b4eeeaf494f5f0568b309fc1245a47608a88c520b5b2c265c26bcebfb66710494951cefe718ce6acb4c6292138d46221003b74556b3
@@ -17,27 +18,34 @@ DIST linux-6.x-sha256sums-20260828.asc 246577 BLAKE2B f65a239c27ef241b753be638af
 DIST linux-6.x-sha256sums-20260902.asc 247945 BLAKE2B 0b43813b97299dc604af7f6ac01a80c00ee11d5800d1354fb0613ee9fe16dbeab19c7453df242a89d7ee910f6ee9a3c713a030cc07fb085d4fce7c16f1f965e4 SHA512 91115918e6e772e7cd80775e4b360903de19eef6e7b945826a3492b7a95902eca5b3f5bf9d1b3e744f4d5ccefd82e47dee969b8c11d9bcfaec4393f0b277bf44
 DIST linux-6.x-sha256sums-20260907.asc 248631 BLAKE2B 2f10a984a5d3b563258d041f6cec084e17d6c29d5f1cf905f7ff31cf5df3ec9aef50040bb0759b2d879eff80fec73f683bc4682940f1504b9afed77b32685279 SHA512 935ada72325fefeba6d134480c388c8cf7df12ab16d060ee50b5818ff4633795228d50aa2b36875d5af0acad8ebea70b0d8c049dd59caf2fd3556dbf9f3db1df
 DIST linux-6.x-sha256sums-20260911.asc 248972 BLAKE2B d0a49a4346ba6c0f13d122c6fa68ee0e8f1436f51fc7212015d0cfb16fc5091df947d1abd4f8aa2e9388c22a0f64484c08ea21c320935b00f9cdf58a1ccd22c8 SHA512 4bdb652871ef916bd18b7e15fab9f4b110aa35c16fdc2d67de373e5ee811ae97afca7bc123ab9615ed5cf4dc15ef936d8f4ca5e34ab79031a63e1f06e2011879
+DIST linux-6.x-sha256sums-20260914.asc 250340 BLAKE2B 93c4ed0eb9073fb36fdceafb66231db226e6d1b20451a908f5b223ca61ab452a93205289f866d5b3d145ea847019f04e7c64ce7ebaab19b42f23c48019d60ec6 SHA512 d4074ece544fa6e478d4de518dc18387d687f7b477dd8e10c1aa0e82897b4fd6c21095f387e3bb2903e9f2514741510c71f7d2661a917567daa6bfcb8873b674
 DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
 DIST linux-7.2.tar.xz 160068116 BLAKE2B cf5f3d87b96f223034c47c6e5fc972fe52c2556310eb2f064632537b8727231135a8540179fd5d51343738c8a51f51f09c7e8da374324b68551c84a4124bb71b SHA512 47e63679363261a864d271277340a6f2d45f544e1a056be4159df081f4f6537d0efa865c4af26611ab33a3079ee65db88ec2f6bc0e5fff43e0c043cde0cd91e1
 DIST linux-7.x-sha256sums-20260828.asc 11213 BLAKE2B 3be42484550c6e7863570a45175bf3260b4b27af99d129185ff002164571f09128f895d230cd9c0b96ffe6a24d7164d9e9352c7ec709c0752435cfc7616c0533 SHA512 d2e1aa002b6e2b49efedd594c56491d5563a4b1524c8c6e62802a50b49b8e586ef103ef134d56cb7891df9cd681ba194a5cf78e6cb2bb2c668d89dac78dd4d18
 DIST linux-7.x-sha256sums-20260902.asc 11883 BLAKE2B 868477ba5aaf889713f97de4ac66157c95497f9abdd779e8090dd99b676d47e3aedb0fe32e77f2953c82c61397c0be1c60a7a1716a67a5709ce1152ed1392cef SHA512 5d5d9f7f21fc9b803cd5059341af090c4378bc871efde4380e7fd04958de89b67b74079b307740620c7e978cc6b7798e95320d0269ccf77266f275140af7034b
 DIST linux-7.x-sha256sums-20260907.asc 12216 BLAKE2B fc43cf1c26c2760c3f4fabf1af6edf4448cfe39527ecf9034ba87e5118356c9bf3af1698fd60f33afbae468959ba1f456d8a325446f0bee2b2a3ac76814d9b20 SHA512 0cf93af8453deb19c43875d61b118b6c93f7598d18e81368715ee069455ec5c3073495c238f219e3088f74268cea608d84866b0e490d04d2b483ae1cbb194015
 DIST linux-7.x-sha256sums-20260911.asc 12549 BLAKE2B 2c13002580813fec5b5a0cd69d5bd428886a0bae1fa5155e125e8a13adaba4c3b3bf4831532b348ef1581ac118a776d009ec1878747a8f679a0b36af28a4d2df SHA512 6b035fd353d94ca2a482d9c38fcf75a5e1e88e426f6c635237dae0a396929c87ca465554c9cd85a951ffefa48f84af4bd2896aa534fe94a46c938b7ee5fc2c82
+DIST linux-7.x-sha256sums-20260914.asc 12882 BLAKE2B 83b8e10291ae9e0c1ca3795e86c46038d0df560de695687e52932697df2e89454285003e1d9faa5e9f26f622e8388c561474e993bc8201909c0f7bd043a31c39 SHA512 0abd88ff6979f7fffd3f9f7775cf1905b7a5df27cd8783f3cf85bf8428a815641f0112644877ee66b5e164a5a588513f64c3eded461aebc348bf6682c40f6b68
 DIST linux-b19b382f183d421a407f5d708dde1eff5009274d.tar.bz2 1401905 BLAKE2B fdb884e73fe206f91a39e76a76fdb1d703eb0529dc97b7f3129dacd3ae9f33c8acf14820a00facb07e99cee89acdad77b9cb43e95458656eabf375b1bb507b22 SHA512 1a9c210271a8a6b88a304b91a31caa693fbd289babfed8ee7767e834fc860f9a5cb52e457cbc548246cc7816d24490f7568389a71089975edfc4e31bd83f9490
 DIST patch-6.1.186.xz 8087268 BLAKE2B 5f78ce9b0b0cbddd71b4bd4489175c3e1a494c8d4e596bcc0785f7f7d9f1221c10eb5e35b6e687550363e7ee37968ee8fbb7c6fe60a0b2e4e882b4f265b2547b SHA512 5816e156eaa305543af1f06530fd42b9abd2b1b2e79b379800cc534e6bf1bbdfb31c693f411c15c444920b788f3bed1405abaecfdaa2d3e2d7cc34c1f508d8c2
 DIST patch-6.1.187.xz 8109252 BLAKE2B 5ec497e8fc6f086140d425fd7b4ab122d8a579b4d7227711eb0c2493cbf03590e494de9ab1700a950eac3c962dba399c996d94aefe59fd9e6154f7ffb18618b8 SHA512 bc89dd895bbf1ad4900a1a044ca9858fab747c4b46758770426c9590d22d6048adaa08919563fc9b20e9f82ba99be9f99242d7845dcf9a2de707d48dd2de9fa1
+DIST patch-6.1.188.xz 8362360 BLAKE2B 2f97dbb61f5f7f29a009866ccb3ebe10f87b18ef8da32245303edc68a6ad18e80ec27f08bc6bfdcd7a6387139437559e7aa3f30357c298e88c7ed8287875fb9e SHA512 78c57eabe1dbb76fe39add4d54efa8ca3e34af601aa6869e46a6d58d6e9cdcd51cfa03808c167c22996e09c1471fff7bb062631f09e6de60d5b03e9b85822ae2
 DIST patch-6.12.107.xz 5646156 BLAKE2B a223da9e2d6d8f52be6dd2935310de152a3afce88b5ee61bdab0e688ceaa6e96c1cb25e9378ecb64600cffa68f2b9f6f8b44ba203c7ec9076444d1b4bb73b222 SHA512 b3a97567c0c5a1bd0903a6f3f520622a0fb6b0bb29447113b6e77dbfd802470a7bde78e18a08ae3f3b848e55cc565389b58d989640ec40ce8b9aa8cf4c4a14a0
 DIST patch-6.12.108.xz 5674920 BLAKE2B b3cd77d6351c726f5eca6a5990cae7702aa95f1d7bcb4a244b483cafba951af1e500e1bddb632a6a273c180beebaa9bec527ebf5d0efe7463d979878aa5492b1 SHA512 8fa2ccbb55ba4cf6c6613e97696525b69ffbd88051fb3f9e2a03c98daa84d3f657f43212da7e4c2b5450fc405331f714e8c72ac12cd79487842a26c65325627c
 DIST patch-6.12.109.xz 5753324 BLAKE2B 9ddaebf8cb9e93e79ccf02efd4e65e8892ff751e3e660f00f8032c42ac275d72ba4aac1d61b8f628a52c064a5bc54c34d05a9510b6a9c9d90f79097c4f7e41c8 SHA512 bede54fa2db04d3bcb4b1e30369a897135a8fa6637b339a94e21cd6e198f1404109bb52626bdb3f88406e002c6f4430de8e05fc20bfeec37bc4ef434120e707f
+DIST patch-6.12.110.xz 6085060 BLAKE2B 8d1d7ad14511974f9c3508a34b3fe77284278a0b89b0cc94bd256a7d12b00c4581b49a4fc9ae3bf5b4aa67b5b76b088a9c29a1701ea9a6aa88f5bc76d4268d74 SHA512 b431836ce3b6b42b0c1ed810db6c839bb3fc7bb66b014d1a89408e0fe6d441da24e40d50d83be64e1992dd432dd7e245dafa632302892dedc46919caae354067
 DIST patch-6.18.48.xz 3258276 BLAKE2B 2065b089db773cd504b7e09e4fb111e68463ad2846368090a40466044fdb63e2db5ff1d069c7d0c83ce77a9f85c9c5507d78eec8bd79409f1990aa7c21c4ce8d SHA512 18b4d5a32a430f8599cf821e5f873e9d669e4994a21f0a98084f1780bc233a13250f69c162f440ec9ac62551b03532f99332ce9ef90b98b77e69b96c63a05a48
 DIST patch-6.18.49.xz 3282948 BLAKE2B e1a030bfe327190d14a9d3eefa77c8823a276d7f84c112a01e1f99572f35e283296415fde0a8f3f92564682a7c86b046045bd4d57f66e940bb42bfc65beab4dc SHA512 6cf1fbc3cedb1a2ef11c6ec7d045aa0f8214cb06ecfdc30cca7724207a40fc896deb6dde269d8bd87750ffe07634e7429e076e80167755526d634698bc3980a8
 DIST patch-6.18.50.xz 3404240 BLAKE2B 3b7794114d37bf1f5f0c95b5b6f44aa33c00096a162dcb6fc48006e22871d2f731626f8759f54bc30cddb8561d75896e0546124e5b11b9e6332ea121d55eb164 SHA512 2ebefa6d5c0102130ecc8445e58e674e581568b728e4b40e1dfdfa3039a10c9d1af533b2b95d3b56ae30a056838af7bfe58f78c1642c56e3db14a3c1228ffe75
 DIST patch-6.18.51.xz 3545252 BLAKE2B 1636bb5b2dfab15f9bafeb215f925acdb5c7df0fc544d7787ffbe76cd1efcaff7cb99d925e39997e7cff37266192dd07ad3d7de3a8a845a907de9d5cf72b2dcc SHA512 c5022b7b718093b791237599a00565bf37f7e6d256e136c88ddc9508163cea5993bb22cfbbf928c3604e12ecb76d7e2ce814a3634d5a65e7c84825eb4e773f9d
+DIST patch-6.18.52.xz 3996672 BLAKE2B 97ef23b4b70a2e02c1d6c2fa2b4b1c895743802007f2ac6ceb8df086c9b9fac1cff9b80c210761775de5d17012ea8c9ff9c7c3bc1561f087b92f623ec3302c8a SHA512 f1c32303a8eb7f20c7f5c8d592a23140ff880075d0e4151bf96d5b0365ff64b35324753894d8ba822ad797e673b2a878f18d6a2f557dd6d3aca1fcc8d4e5764d
 DIST patch-6.6.155.xz 6891280 BLAKE2B 1df8fbf4aab980280a52f6199f44f3030f917872fc5bf719dcd6bfeb236cd340aaea6cfe1da06948bbfbbdf4f89232a577e11dd0e422fb544ed2824b12f1c9cb SHA512 09f9f30b4bb33a324e3237e7eef78fe0dca9dc5d28e4c432a6e6bffc2a02dd4828f19bd1f0572e4f98cba94df55f427e11248689f0ae16437d0ef4cdda1a977a
 DIST patch-6.6.156.xz 6914532 BLAKE2B 95bda8ed3689d35c3bb5410f3c33b80097f78b038d343c33df3699dfb9d216215560411b939f2c6e8cba8990aa1169e914617d2432e14674484bbcac0b47d175 SHA512 de670a00152147ff05f19a5d519917bf522dfe40b3b88619e76dc768ffbf8d4609ba761c600c9441521de6254f87a6a2cf6162218ae90b1e75d7f5825c5dda10
+DIST patch-6.6.157.xz 7211724 BLAKE2B 0b1c80d86bc3fac163ef830979d2c3492e6b72ee56f17c18ce561b399a8b36d7292aabd56012bc978a7bd0b319551f7fb86d688a5e974be01a069446058f72b0 SHA512 6aca3405b62daa0e1fac66d5500705d6d780900b2960e2f50449b0db84cb4a1a814e7eadc9d97a3c959262e3cffb8ec63492ee6c3c0af163c1c8f8a10c184e1c
 DIST patch-7.1.12.xz 1401192 BLAKE2B f78bbf6e2468cf5324d0ee1b9da26d57e605c1f51c83b7bce0c5cd4776d7496c5160d6877b9efa6a0c470c1f479220e5b40a309fafd85da0ac50dd0e2cda5273 SHA512 ec4443c4af0ca05597fc45241a6676179ff562f49b8c09639c123465ea357d48d74f05f5b4b229f056b5ac7f497a04c2fb864cdde5dacc2f466637d4eb8ca330
 DIST patch-7.1.13.xz 1427684 BLAKE2B 6c80c845eee5e6b231aab8b3675eb25dee0a1257b1138501634af31d4aead57102794d155dc012498b424e523d6a472e3ca7aead4a7573aaa4e30ef1e27f7784 SHA512 b858b8594d0bb2b401a947d1c3bd3d25e4d2c07b6e07b5585a8fd84011fbca4c23f3f0424dd74a338358dc42aa53eef2d88205e1b4ddcdc8abe382b922f8d461
 DIST patch-7.2.2.xz 32596 BLAKE2B d3185df869fc6613476a9bfcae4ecbe8bc80891593df937d2ec76bf5c6a92ff0af2395abfbf52604d3083afbf41d49d1fbd8d7764bc5c6b76c87a05703b6809e SHA512 144f29bcdf647b4d90179ca4132c0e9fa1d88993bb29ac84236c10c790188d79c827e633cc6cc852ea4b6259b58c6f25a8fbb7073fedf7434e9b0f07f986c2fc
 DIST patch-7.2.3.xz 62920 BLAKE2B bfca37cdb0500afc3c369314e6cbd11871421a380e99436a3e59b689aed674f0eec7b1a605d2bebd3df84a68a2069a1ee05d437444776e0307a4d4535b88deff SHA512 b5c48b2b288bfe0e5aebe6889ae4fca078a33df5ed69444abf3da102ae5b34a0ff1747c3f141a3bb729177a97e19623dfcadb5b950f5cda7a559be0c5cdac898
 DIST patch-7.2.4.xz 281532 BLAKE2B f8bc83a92f50b064328727d28d0bb06f660e9b0fe4ccea980a81804776040ce6e7c2d71dd01656dc5a833d53f0e80ec4af91c78df37d20b4f4118673af26708b SHA512 e5b244c7b7c652d55114e4f440be7ac8eca617bbcc704ce9528bdfd793934449c6fdca3424d8e17ef6b6c053952c2aec860e34701d2b6ff9a2d09b1e52d76773
 DIST patch-7.2.5.xz 425448 BLAKE2B ee8ab8753089280cbd9afc0e424a84099e4a88b95c383618a18e009712a5862e8f2b72c90a9737197fdd2fd5c844d8fd9083319c053e9065cbc769d1253e3d16 SHA512 60af2204eddf616e3e31cd4e5f6043afab3956443da3221b9048f1e2ed7a539ae5b69bdd0ea9a664938158d099c8d2648ef66a86763305ceb7a4db8286438fbb
+DIST patch-7.2.6.xz 1049176 BLAKE2B a9aa8ced201d5c98fc971436508f9a019eb2e9cf0cdc5a830cc7e707613fe2750dd8d222646e55973e9264e722a9404a0e418a1a2f4385523c02f3732006015f SHA512 82780c916050b619145cb4fc3bebff0a3aaa34caea5c8e41e64e613a686cd2f44cd1f13f0c60df952415d25c0f4ba6f176d2548db2df2292680539cf457aa42c
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.188.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.188.ebuild
new file mode 100644
index 000000000000..9ed996b0b727
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.188.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patch-${PV}"
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | loong | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.110.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.110.ebuild
new file mode 100644
index 000000000000..f8de074b816e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.110.ebuild
@@ -0,0 +1,142 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.12.41-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patch-${PV}"
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | loong | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		riscv)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+		"${dist_conf_path}"/6.12+.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.52.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.52.ebuild
new file mode 100644
index 000000000000..4698afee00bd
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.52.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.18.12-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+# Debian kconfig commit from:
+# https://salsa.debian.org/kernel-team/linux/-/tree/debian/latest/debian/
+DEBIAN_COMMIT=b19b382f183d421a407f5d708dde1eff5009274d
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	https://salsa.debian.org/kernel-team/linux/-/archive/${DEBIAN_COMMIT}/linux-${DEBIAN_COMMIT}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	hppa? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patch-${PV}"
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		hppa | mips)
+			> .config || die
+		;;
+		alpha)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config.alpha-smp"
+			)
+			;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config.armmp-lpae"
+			)
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		loong)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/loong64/config"
+			)
+			;;
+		m68k)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/m68k/config"
+			)
+			;;
+		ppc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/powerpc/config.powerpc"
+			)
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		riscv)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+			;;
+		s390)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
+			;;
+		sparc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64-smp"
+			)
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+		"${dist_conf_path}"/6.12+.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.157.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.157.ebuild
new file mode 100644
index 000000000000..1a1f0a9e9e85
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.157.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.6.12-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patch-${PV}"
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		arm | hppa | loong | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-7.2.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-7.2.6.ebuild
new file mode 100644
index 000000000000..89d192ea1090
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-7.2.6.ebuild
@@ -0,0 +1,182 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+
+inherit kernel-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=7.2.5-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260914
+# Debian kconfig commit from:
+# https://salsa.debian.org/kernel-team/linux/-/tree/debian/latest/debian/
+DEBIAN_COMMIT=31e70f1f469ef1ce4c910df1d12b7de09da561d1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+	https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/config/fedora-kernel-config-${CONFIG_VER}.tar.xz
+	https://salsa.debian.org/kernel-team/linux/-/archive/${DEBIAN_COMMIT}/linux-${DEBIAN_COMMIT}.tar.bz2
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc
+			-> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+	)
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	hppa? ( savedconfig )
+	mips? ( savedconfig )
+"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \
+			sha256 "${BASE_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patch-${PV}"
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		hppa | mips )
+			> .config || die
+		;;
+		alpha)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config.alpha-smp"
+			)
+			;;
+		arm)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config.armmp-lpae"
+			)
+			;;
+		amd64)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+			;;
+		arm64)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+			biendian=true
+			;;
+		loong)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/loong64/config"
+			)
+			;;
+		m68k)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/m68k/config"
+			)
+			;;
+		ppc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/powerpc/config.powerpc"
+			)
+			;;
+		ppc64)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+			biendian=true
+			;;
+		riscv)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+			;;
+		s390)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
+			;;
+		sparc)
+			cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+			merge_configs+=(
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64" \
+				"${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64-smp"
+			)
+			;;
+		x86)
+			cp "${WORKDIR}/fedora-kernel-config-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+		"${dist_conf_path}"/6.12+.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	use secureboot && merge_configs+=(
+		"${dist_conf_path}/secureboot.config"
+		"${dist_conf_path}/zboot.config"
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 2c885d9c53e3..65b9be6eb81e 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,9 +4,9 @@ DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
 DIST linux-7.2.tar.xz 160068116 BLAKE2B cf5f3d87b96f223034c47c6e5fc972fe52c2556310eb2f064632537b8727231135a8540179fd5d51343738c8a51f51f09c7e8da374324b68551c84a4124bb71b SHA512 47e63679363261a864d271277340a6f2d45f544e1a056be4159df081f4f6537d0efa865c4af26611ab33a3079ee65db88ec2f6bc0e5fff43e0c043cde0cd91e1
-DIST patch-6.1.187.xz 8109252 BLAKE2B 5ec497e8fc6f086140d425fd7b4ab122d8a579b4d7227711eb0c2493cbf03590e494de9ab1700a950eac3c962dba399c996d94aefe59fd9e6154f7ffb18618b8 SHA512 bc89dd895bbf1ad4900a1a044ca9858fab747c4b46758770426c9590d22d6048adaa08919563fc9b20e9f82ba99be9f99242d7845dcf9a2de707d48dd2de9fa1
-DIST patch-6.12.109.xz 5753324 BLAKE2B 9ddaebf8cb9e93e79ccf02efd4e65e8892ff751e3e660f00f8032c42ac275d72ba4aac1d61b8f628a52c064a5bc54c34d05a9510b6a9c9d90f79097c4f7e41c8 SHA512 bede54fa2db04d3bcb4b1e30369a897135a8fa6637b339a94e21cd6e198f1404109bb52626bdb3f88406e002c6f4430de8e05fc20bfeec37bc4ef434120e707f
-DIST patch-6.18.51.xz 3545252 BLAKE2B 1636bb5b2dfab15f9bafeb215f925acdb5c7df0fc544d7787ffbe76cd1efcaff7cb99d925e39997e7cff37266192dd07ad3d7de3a8a845a907de9d5cf72b2dcc SHA512 c5022b7b718093b791237599a00565bf37f7e6d256e136c88ddc9508163cea5993bb22cfbbf928c3604e12ecb76d7e2ce814a3634d5a65e7c84825eb4e773f9d
-DIST patch-6.6.156.xz 6914532 BLAKE2B 95bda8ed3689d35c3bb5410f3c33b80097f78b038d343c33df3699dfb9d216215560411b939f2c6e8cba8990aa1169e914617d2432e14674484bbcac0b47d175 SHA512 de670a00152147ff05f19a5d519917bf522dfe40b3b88619e76dc768ffbf8d4609ba761c600c9441521de6254f87a6a2cf6162218ae90b1e75d7f5825c5dda10
+DIST patch-6.1.188.xz 8362360 BLAKE2B 2f97dbb61f5f7f29a009866ccb3ebe10f87b18ef8da32245303edc68a6ad18e80ec27f08bc6bfdcd7a6387139437559e7aa3f30357c298e88c7ed8287875fb9e SHA512 78c57eabe1dbb76fe39add4d54efa8ca3e34af601aa6869e46a6d58d6e9cdcd51cfa03808c167c22996e09c1471fff7bb062631f09e6de60d5b03e9b85822ae2
+DIST patch-6.12.110.xz 6085060 BLAKE2B 8d1d7ad14511974f9c3508a34b3fe77284278a0b89b0cc94bd256a7d12b00c4581b49a4fc9ae3bf5b4aa67b5b76b088a9c29a1701ea9a6aa88f5bc76d4268d74 SHA512 b431836ce3b6b42b0c1ed810db6c839bb3fc7bb66b014d1a89408e0fe6d441da24e40d50d83be64e1992dd432dd7e245dafa632302892dedc46919caae354067
+DIST patch-6.18.52.xz 3996672 BLAKE2B 97ef23b4b70a2e02c1d6c2fa2b4b1c895743802007f2ac6ceb8df086c9b9fac1cff9b80c210761775de5d17012ea8c9ff9c7c3bc1561f087b92f623ec3302c8a SHA512 f1c32303a8eb7f20c7f5c8d592a23140ff880075d0e4151bf96d5b0365ff64b35324753894d8ba822ad797e673b2a878f18d6a2f557dd6d3aca1fcc8d4e5764d
+DIST patch-6.6.157.xz 7211724 BLAKE2B 0b1c80d86bc3fac163ef830979d2c3492e6b72ee56f17c18ce561b399a8b36d7292aabd56012bc978a7bd0b319551f7fb86d688a5e974be01a069446058f72b0 SHA512 6aca3405b62daa0e1fac66d5500705d6d780900b2960e2f50449b0db84cb4a1a814e7eadc9d97a3c959262e3cffb8ec63492ee6c3c0af163c1c8f8a10c184e1c
 DIST patch-7.1.13.xz 1427684 BLAKE2B 6c80c845eee5e6b231aab8b3675eb25dee0a1257b1138501634af31d4aead57102794d155dc012498b424e523d6a472e3ca7aead4a7573aaa4e30ef1e27f7784 SHA512 b858b8594d0bb2b401a947d1c3bd3d25e4d2c07b6e07b5585a8fd84011fbca4c23f3f0424dd74a338358dc42aa53eef2d88205e1b4ddcdc8abe382b922f8d461
-DIST patch-7.2.5.xz 425448 BLAKE2B ee8ab8753089280cbd9afc0e424a84099e4a88b95c383618a18e009712a5862e8f2b72c90a9737197fdd2fd5c844d8fd9083319c053e9065cbc769d1253e3d16 SHA512 60af2204eddf616e3e31cd4e5f6043afab3956443da3221b9048f1e2ed7a539ae5b69bdd0ea9a664938158d099c8d2648ef66a86763305ceb7a4db8286438fbb
+DIST patch-7.2.6.xz 1049176 BLAKE2B a9aa8ced201d5c98fc971436508f9a019eb2e9cf0cdc5a830cc7e707613fe2750dd8d222646e55973e9264e722a9404a0e418a1a2f4385523c02f3732006015f SHA512 82780c916050b619145cb4fc3bebff0a3aaa34caea5c8e41e64e613a686cd2f44cd1f13f0c60df952415d25c0f4ba6f176d2548db2df2292680539cf457aa42c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.12.109.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.188.ebuild
index 099fab28cbca..5cd983bb2664 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.12.109.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.188.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
+
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.187.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.12.110.ebuild
index 099fab28cbca..5cd983bb2664 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.187.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.12.110.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
+
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.18.51.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.18.52.ebuild
index 99d9dcaf656f..99d9dcaf656f 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.18.51.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.18.52.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.6.156.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.6.157.ebuild
index 099fab28cbca..5cd983bb2664 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.6.156.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.6.157.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
+
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-7.2.5.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-7.2.6.ebuild
index 99d9dcaf656f..99d9dcaf656f 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-7.2.5.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-7.2.6.ebuild
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index e7e620b148af..ccac57eb37a3 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -4,4 +4,5 @@ DIST liburing-2.11.tar.gz 429859 BLAKE2B 9a649132e28569c7de30f284da13fb7318f406f
 DIST liburing-2.12.tar.gz 441865 BLAKE2B 9229974bcebd6d117fb686ed998dfc76a3dd68c1d1da0d18a895b55cc6ba01f1656756f95987f1a18495306d038ebc4c7090c2eb0dea455b596c5e639d413b29 SHA512 ccd40be43d4ea046c63d949cfddd9adb0fda531e3ae4ee17d4639b82a11eda966d8a2afd280b4e6b45f907ea1d53bbd432bfd8ae7a015609e86555a766fc850f
 DIST liburing-2.13.tar.gz 454243 BLAKE2B e9032e48622ee87ddbd9dd25d4e0264f0a648f9540acaca69a3a9bea05e64c5a8bdf2da37787ea72a298074f01bc0ab8baf934da5ece792443ee4417245d75fd SHA512 ada60d8c0bf5b546e45fe2e9e58b2cb4e342665d260648210218e5802dbc7bf650bc8bbcf0620dee27bc4310089dd5c509451a4f451368eccf1e1c5b3a4db0a7
 DIST liburing-2.14.tar.gz 487718 BLAKE2B 9e2e7b6c3a7a4fa2d285bb8cb1bea65bef7d56aac7992b912feaf67c2b99590912fd195213a04c320f3ef615ee4f45b8c4b808ca78442d74cbbdd93bda13c700 SHA512 3eb8419cd6c9ae4909b9697b188f5c6a27e107694eefe9747822524c8710e0798476aa43acada578fcbcf6e46b63ebdfb59350e4ba8f928dfe7cac3614e32a48
+DIST liburing-2.15.tar.gz 550191 BLAKE2B 0b2dfc71fc76b3c429864c8cad5186abd2ce7ab8b136eca81a92988f52fedeac49b739cee0a7e7b78f32ff7c5bfbd42263bbfddd15b7abdc51de823d5c9e9d9c SHA512 8f2de8b294b14ef2802fe1806ae62a0a4e1f8a52c423e1069a97600a742492eecb1078c435624b9a094a07ae5f706a68e333714c00c904f3d93ca8acf40f81ae
 DIST liburing-2.9.tar.gz 407191 BLAKE2B 7081f9430e9532cad659e24de7ba998ad40f15a3fc3bf08fbe2b30df2bb335d4b06affb98d5667d4f8e6c8bc6e7a98c25caddd57ec5c98940562eb0e7977e54d SHA512 f27233e6128444175b18cd1d45647acdd27b906a8cd561029508710e443b44416b916cad1b2c1217e23d9a5ffb5ba68b119e9c812eae406650fbd10bf26c2fa5
diff --git a/sys-libs/liburing/liburing-2.15.ebuild b/sys-libs/liburing/liburing-2.15.ebuild
new file mode 100644
index 000000000000..3d52769f11ba
--- /dev/null
+++ b/sys-libs/liburing/liburing-2.15.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Efficient I/O with io_uring"
+HOMEPAGE="https://github.com/axboe/liburing"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="
+		https://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git
+		https://github.com/axboe/liburing.git
+	"
+	S="${WORKDIR}"/liburing-${PV}
+else
+	SRC_URI="
+		https://github.com/axboe/liburing/archive/refs/tags/${P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	QA_PKGCONFIG_VERSION=${PV}
+	S="${WORKDIR}"/liburing-${P}
+fi
+
+LICENSE="MIT"
+SLOT="0/2" # liburing.so major version
+IUSE="examples static-libs test"
+# https://lore.kernel.org/io-uring/13d5c94e-9f3c-4a0e-a468-562e78155ba5@kernel.dk/
+RESTRICT="!test? ( test ) test"
+
+# At least installed headers need <linux/*>, bug #802516
+DEPEND=">=sys-kernel/linux-headers-5.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use examples; then
+		sed -e '/examples/d' Makefile -i || die
+	fi
+	if ! use test; then
+		sed -e '/test/d' Makefile -i || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libdevdir="${EPREFIX}/usr/$(get_libdir)"
+		--mandir="${EPREFIX}/usr/share/man"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--use-libc
+	)
+	# No autotools configure! "econf" will fail.
+	TMPDIR="${T}" ./configure "${myconf[@]}" || die
+}
+
+multilib_src_compile() {
+	emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.a" -delete || die
+	fi
+}
+
+multilib_src_test() {
+	local disabled_tests=(
+		accept.c
+		conn-unreach.t
+		fpos.c
+		io_uring_register.c
+		link-timeout.c
+		read-before-exit.c
+		recv-msgall-stream.c
+		msg-ring.c
+		wait-timeout.t
+	)
+	local disabled_test
+	for disabled_test in "${disabled_tests[@]}"; do
+		sed -i "/\s*${disabled_test}/d" test/Makefile \
+			|| die "Failed to remove ${disabled_test}"
+	done
+
+	emake -C test V=1 runtests
+}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 6254367ad561..6e5dd765f1a7 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -195,6 +195,55 @@ DIST ncurses-6.6-20260404.patch.gz 5546 BLAKE2B 30b4c0973e9cea1296cc3f60c4140225
 DIST ncurses-6.6-20260404.patch.gz.asc 729 BLAKE2B 353528c751e141cc78c1fe281ad6629280efdaa0e8faecd409681b91bd5e53db6321bf4030d1f8f53b35c1647fc7005da9a12e9c47c9ca066d9878a9f7ec4273 SHA512 01d0f8709d592b6d979c670627dddc2ea4120d0ad1bf679932199cbec322d6d83dd029a365b8df9cfd0a75a446a44015231cdf64d7b0aed3c578437861e2ae81
 DIST ncurses-6.6-20260411.patch.gz 3662 BLAKE2B 9e2ca4d0c1222a14461d9a01e5d67dfe6c8281d084413dda50c06935cb7b41bcff1d9d74a40b2d47b003475ccceda4417c193553e34d5c8d845694bbca1536a5 SHA512 dc4fa7682ad91056e8bbad942991344216a418a88505e468a38b60d06fd25abcc5d9b047474ea43d4e097e97ad2b4e8cf91c5e28f5b716a0a8a651548f7eba94
 DIST ncurses-6.6-20260411.patch.gz.asc 729 BLAKE2B 45bacf4a9ac503271c25c39e6f74f536f1dd2e6464b194a3525ef6134acb8543c6a4e1a4e293d5617c2c0680e86ee6a7c9151710c68244f3278fdc81a314d2be SHA512 b5d7a0e245d98943cada86996268817cf9722bfc1c2addfbf20dc63da3de5d4cbd92aaa6609f79f862ac5ecc2c86c55b139e00f3a5820e27adddb1695e954ebd
+DIST ncurses-6.6-20260418.patch.gz 14537 BLAKE2B 7afd1fabc6718e6dc83be7d21a4932b9a332afc69f4896865be4bb860ab350c57dabe574d5847a737c3eac4bfb565742443fde8519bf78527627685737049c6f SHA512 bbe8c9d5d0f35b94e14a135c647ae5e728a1e2151710e69ff11485b93279c70eb3c540d019c23d3640394b9046fbe76de38d3b811a0356e9a50c4a69b3ef4f6f
+DIST ncurses-6.6-20260418.patch.gz.asc 729 BLAKE2B 8bde517c5dadfa9d90c7f9cda7ab7f686edbae80d5b5dfeae971b959aa4f78a56841a2a09a3ebd6e63f98c64189390dd1bb15597a76032ff2b5b27c424ca2e42 SHA512 0bd766c42aaef9eae19e65abd549c0f3f1b012f10cca2152629530c139370dae9d77c3d9562ab9b778a5bd65531e19ab44e6abdd655d7c32f343d1145978a194
+DIST ncurses-6.6-20260425.patch.gz 210782 BLAKE2B a3d2b25551aa8c891199a9a738e15925b32743e82af8c14bdb6885c6ce8331213b8a0d52ab8fedd96569da7e767ef9bf7c7cc07bb979eea9ac25ffd218e35197 SHA512 5a48a3947b4a15ad41d5aebec30a37dbad8e8a08d6ab178053884d91c45c6b308d4e082dd099cfecbc6511d4f4f37ff8262ad0a6f0c74591a7ab9da8c66d08be
+DIST ncurses-6.6-20260425.patch.gz.asc 729 BLAKE2B 2dd4949c75f497d25ebe70e96e7be61e00975a65079a9a718fd6c9dbee46c4e2997697ed6feb06eaf5714040f8254309ca12906798bf29f11a176dc3cafd4d69 SHA512 432cb78435fbbec789c8cd74fb763f775c91a089ea6501992ce929d272edfd5056a6b4586193c9aacb0a70e3443ecd93c43790f9d5e8ae913feba89e344c91d8
+DIST ncurses-6.6-20260502.patch.gz 3736 BLAKE2B 2b32b3fe2fa97b96224b139674a1a5444370da759b2fc18d41f0e8cecc0af2dfd52685b531d3b82da6ba27a37ee7df911cf002f3b47a9510c5a917c5de229638 SHA512 15f2a73e9266807e7dce1c9cd8e84b08e6b23f465a592e9d2b6de94377b187a29472748c396aceedf2eded005a4252becb9e78c4298a09eda1ccdfa3261cb907
+DIST ncurses-6.6-20260502.patch.gz.asc 729 BLAKE2B 3914d120ad691f87ddb98efee1195f4b4f4b15144ce8057850948313b09d36a533b3421a156e2fb6f69923df68adfc4ec950c95740d468c321885ef088d44b5c SHA512 810dadaa4d06eb4a26147b38a463ec7113b08545a2b390c55c83f21b3b431e13231824630d087cd3f744a79a043018ae8bc42dced8b3f7d0ca32302882fc2366
+DIST ncurses-6.6-20260509.patch.gz 5237 BLAKE2B aa4002e389465b497fe43214224bf2d591c4b08027aa121b8e186e4736817d8a187a3906a627997b019b69e64526b452f672122879b59179e36cf7492d071882 SHA512 3bdc6501d05995fe752791ca512253db9517d19fe7d85e388673611c5a157ef7220b31e78601192fd8ff63e049b4d9a52f705c45a32e7a30fbbbb8109d36c420
+DIST ncurses-6.6-20260509.patch.gz.asc 729 BLAKE2B bee40b716f4b95a46b41d7d66a288208fdb99668bbc82843f015eec803a78f5d79d2dcfa2c4acb57e4a1935e9e27fb499f79afdb4424b1f9522ec143777d5423 SHA512 f5effd71c392d026db5466b1420862e8db824965a09f33d1cd47a87610bba224584c51fe0d29333872ed9e2d3ebdff45d79aba75b1b88516077ddd40c7bdd023
+DIST ncurses-6.6-20260516.patch.gz 14409 BLAKE2B f21de6129d844f077172343269c1387fc827227470b5faff277cd378c1e9aa16541b6dc51b73de2ae4ffeec4706242fee75259ef78c735e3202f8943e65dd1fe SHA512 c0c75d9f38ad59f9143f11e12d75eb647498615886c0c4f06ea4c7168e09042e2b2de22da1e5cb4080449a91477ebcd60756f0ec9dc96ff83ecb85903224933d
+DIST ncurses-6.6-20260516.patch.gz.asc 729 BLAKE2B be1c35d2f9552bc36e083bcd6d071d7a64c8357119a78764c31c41865ac62d53dc9bbaf65700d6ca0f867ae0dd1b9bff29c34e07e7eb3881bec7deb66b724829 SHA512 b84ed68ee70a85619f5411004b6d4ec38b50033a7b42666551383771502886b98a0b080aac59e5560bdb403f8abb1fb4fe127d7e514d841c9f2dc36dcf14a4a7
+DIST ncurses-6.6-20260523.patch.gz 7537 BLAKE2B 54c86c3d11b5d5b1626d14d087936fea27eec523eb1ba7011ea3e7bd7113a3abb24dc3da447284cd88d45cc73be55d1f6690b723a3bdb1e9c12e2a646c3d5058 SHA512 902558be3136d38147364f6e01aa142d24519bcc5f2e962974f6d7f334c7a3f5190748e658b381c7de25765d37d3cd58eb61a26b75e3e8064ec7355d3cec4963
+DIST ncurses-6.6-20260523.patch.gz.asc 729 BLAKE2B 85e82688093a13433d0cf474e90b6191f405903bc469a86f9edcf7930db26857824a0504d67d9e4b9e758056e841e6972fd8754cafd9a94cc178892c334bd000 SHA512 adc1f298cd366fc62db813ef2b822eb0a5e49000db1e79faa29854804138b10ea28acdf9065a7be028c15ce5ba8fca6e0cc3b819612a2b351b091326342facfb
+DIST ncurses-6.6-20260530.patch.gz 113406 BLAKE2B 0ee3ee6a74b0147e4e416176fb3b0f9620626e1a7d4c541f2fd37061822b197e743de11babcd6aeb47f3f7242770255cc3694dfabcd37f62492c08d7c2c392e8 SHA512 950994abab08f48d9d8150b2d2a2f954c7f404565e24fcb4d58307dd0480099efd42864cc98e38dc02ee316ca966765971eb4b9aed317d23b97c0b70b35a5a5a
+DIST ncurses-6.6-20260530.patch.gz.asc 729 BLAKE2B 4966f839668e9dc872670d93099389c164dc381f176eff5e7e281c319a8ac70ea15ec9f7930b7ba1de9a58baa693180edad9068879eeab2dfa448deebe4499c7 SHA512 2f5fffdc8655f41688abd624bea4f6ed62088adf1a8263e8fcffda07f0c3e078344b79e30e02b7bd4eb1f317ba5289c9a1bea2da51c2e22412b9850b5e883f5b
+DIST ncurses-6.6-20260606.patch.gz 16006 BLAKE2B dc91122cf5429c8de46a55b8e803dd914e19976e3f674a0661b96547e3fb3a2fe99c57b69fad7d1c02d722dbae8530ef1ff60be1162b1842a6f785ca111778e0 SHA512 58fe3896c48e30a9244893cb93439c8839c74351d457463445dfa29bad20141a0e4e5b3c45c3a05a6612db5d1c8a835ff7e957d1301bb9f8822761d287475a33
+DIST ncurses-6.6-20260606.patch.gz.asc 729 BLAKE2B 604a69018bd1c6d688bf10f60afdaf61ff42ecbaadba22b3c396d8b765538f3d1df30178fb606fe8b9657f6f7165de52ba8cfcedfae36735918a122de03e9b3e SHA512 3d0d4584ed54005a4bd10955f31e13b5529e42507ff593f61cfb2012efc502236c289b915bda1ab30bd0c5ce6662acbc9da25b55168830a6915991c450ab4769
+DIST ncurses-6.6-20260607.patch.gz 2062 BLAKE2B 49940ba3ee5755fdf74cabc3aa8da0965cdb92854c29ba25b2e5473df5b9d0f905f796e728e6ba5c5b0e9352e55c31bb697f65df28a04c8c9d18d9b52be89f22 SHA512 ef677ab433fe11d8fc7420601864080c5c6aa52b17518cd22c72373ec2698b8e81dc730115ce2a88e9fffe888a5e35f6c300aa2766cc541c5842e7cb4dee406d
+DIST ncurses-6.6-20260607.patch.gz.asc 729 BLAKE2B 5c9806d5c0e125e1659a22df821bca33c3f8457931877fe20334db0e7ca67134fb728b1c52c3c94bab0a1af35bf8db0ac8474283edae17660555a59b54c96023 SHA512 4a365529fa44e86dd5bfa6d73af472004c52a2aa4f257c04632be44672ae99f4dc108e4fff19016d853e47b5b8317f2980e0ded5d1858cfc0a678685a82b8db6
+DIST ncurses-6.6-20260608.patch.gz 2925 BLAKE2B f63a5fb777fab6fa027a5aef604bfe1e2a48d4667f1ad978ad7a929f8944c4b26e888a9de2b35ea7b083f27cf400b3388004740ae6c34d69d8fbfe92155b7ba2 SHA512 84222a93e08990ad65cc4af8ada132462d1049dd9bb900db94089c77861a1fc7d494563ea5ec590080c1e75e4bb81e51d4cb7275d492bed42482012c73e8f3e9
+DIST ncurses-6.6-20260608.patch.gz.asc 729 BLAKE2B f98e2805fce8310a39ccff430d896119d9eaf905c5761522e5180a15fed1032de7eab8350a7e9775681d5a8ac4baa9c25d35df5b753d1626fd2bce4e54b419c0 SHA512 61096b2cfa7d5ce22d567d967e750ede45e6c9dbf4e58cb0f23fcf10cf9963eac829de282f5f5be496a5db108e734612408a56f1aaf0b717358ffde39291375a
+DIST ncurses-6.6-20260613.patch.gz 9268 BLAKE2B d69d0048630a03db3af1216f03c70ab0d665ba7342638619ec5b0bba3ed8e53c526638a4102c8aefa172d01bd8e6d6a0d04e06f7a2a95759f710eed905a99b30 SHA512 8fd34780a02561ce96b826a337aa870bf629a1de61e631a8b58a993b9083cea0f378b2f8c001111f24a6e7fa404abe724fe3f2fdd5bdcc14026563aa7f1100cd
+DIST ncurses-6.6-20260613.patch.gz.asc 729 BLAKE2B 37ccb4ccd621a268cf3a1a03fdc25d63143c270f0bf846263491f18108a28eca0eeb87b6ac39b6341140cec6365a01e438d815fae9cd587586355975640f018f SHA512 fc8c94b512e903733a3ae85828bffd319bb47509c25425540c15d5f267b30821e0971d38f08bc835f48405ad9be5057084f5d256195c1132e4b7138fbeb6f740
+DIST ncurses-6.6-20260620.patch.gz 7039 BLAKE2B 895bb7f8171442a53cef628d5750eec7fb7e3f9e68348abc828701ebc1364a65db73d5e620e20a7afde0ed34d5bc3ba7c4f27522243b9fe78e55440b6ff335e7 SHA512 59a6a8f855ff3e5e610a8519ced459470fd645c45272c59c93143bbcd4970ddcc5e92d6524f472eb08877210fd7691cebef886de18c080a1bf0a241b4f85ade9
+DIST ncurses-6.6-20260620.patch.gz.asc 729 BLAKE2B 910cbcbe31c4c1c5cfdbe3b05116fd52f5b04330ed3e20a10bd1ad41486dd0ee7615b8957d336d873af57e32fa9986563bae8572322ccb731a0c3bf7e2c51556 SHA512 ed22566f5b20e2206963c38b44085702862c02b9a396c4c50e1ee66a40ab9d31fe77f7ec438ed1274557fa4d676f7762d74548fe5152c08578c15873e5721574
+DIST ncurses-6.6-20260627.patch.gz 12054 BLAKE2B 09a0f0a10cb9bb7d164e8f32f8b7ba403b512a0d9e6a3e473e9debe13d1a2fbe76a452d911e728f985635145cc3444ca8534be2fe39496ce4e999dbb4a2dc3b8 SHA512 b7ebb5573ea732c540b3fd29fd70eebc1ceeb19bd5567f9335e7c8510eadee8cfd56800aa3fead9eb713a53259d7096b52e8989b42c7fffadc55b6416ba41fa4
+DIST ncurses-6.6-20260627.patch.gz.asc 729 BLAKE2B 1e08c950b63e81e8f765c8244eb2f53d1e8ebd4c13531a8c8f6a076ccebe5b1d27c284ec1a4037d19537758c6e649ead251bd50639045146d12710ceb0732822 SHA512 d981e0c70e2e200c8179c7a68cd8ee4dc93d3801f03896fe855ab0bb4123ca641817cf3df00ce316272f48b0230777a5a289d65100e3d6f845679f200830aaae
+DIST ncurses-6.6-20260704.patch.gz 16124 BLAKE2B cfdfa7776b9e6dedabcf1c082229d46f4bcd6c36e27ae660a4a0bbf89c7bc23afaaa267cc8532f42ca08dbd9f51f93d7e986973b2dda2075177e07cebc27dda1 SHA512 f63d0ea6f5a41dc35787eb4a52a9e5ebe695deaeca25587003bd7e0204e2c1e9216bb643e000b952153cd0e46ecc38ee43bb59511b0823cd09b0ef76a157d6db
+DIST ncurses-6.6-20260704.patch.gz.asc 729 BLAKE2B 0a78de9e6fd9d8cf4e9971cbdc53bde42d8dfa96629d0b131314b441188019094455625f3bc544664b93cdd2e5a534fca67133c312ae5d5c300c9db8189ffc2e SHA512 d9be635d0a343f8231466f0072ba1fdbb904b212145ca55d4105a4abf906e30587d7a9c4ed94f1646f322576df33e4fac1a5e6d268fc1241fe764292e070ffdd
+DIST ncurses-6.6-20260711.patch.gz 14611 BLAKE2B 6327d85fe1b481923766f612f70dbba35b3a35e04fab77a087461085607964f3e524659f1adc5cfa383cc0394e5be8e6c1c355beb7760b96de5cd8c5465fe4be SHA512 cbca11246dbd12f702bba8e7bebcdbf1dc23e6e97d1193a32830260f7b2b7d6280ccf1f9d6f1d15527c781ab3719cb5354bcc6f34fac3cf43465ddf9bd8a5e50
+DIST ncurses-6.6-20260711.patch.gz.asc 729 BLAKE2B 20faa4171995bb0420bd95ef3d51cff41342e9fa6bb7b3275cfcfedabc83a8025592f0efdbe1981c2010b0682b3ea7928a16db1b0208a0a2dbd9e0ba2f8abaff SHA512 75326e2e893dfbe77f40cf1ad8b5d30c0ea67f452cd7645444f94cd6acf0dfcf1c82b12595c45229442181b32f8611022fba3e98ea4e988f3113b3e156a715ef
+DIST ncurses-6.6-20260718.patch.gz 30433 BLAKE2B 52483315f2dcf2899a548d40f52344c5b61067fd8d7c60e3c0fe1a70536c59a2442769b9077c8b74bd2e37de9fbcc7179b293bc8bee9c7c6e717b6c0a4082bb0 SHA512 4149df8117cac2c7c270670eeb5626edd76651693c3fafa8ed798bac738e26d80fae4536e3c52e9149fd96238ee11a611ae2e03517997b8cf79649dd5a61c745
+DIST ncurses-6.6-20260718.patch.gz.asc 729 BLAKE2B 1bf398b8c0f12d3946f14df16e9453ff037e930e55cd1347da53cecbe95ebb0eb554433f84225c5a136f777577a19fd719ed5dbfd1b1af616bb6aaa454094cdd SHA512 f72aa3adeb6602b4123856dc338777700fb48cc087f7a4eb4e7ad173c4b867f725dfa83cdf1a769d576e7f28192e1c7fabe2ee8b926cdbc1837212098027fc3d
+DIST ncurses-6.6-20260725.patch.gz 22894 BLAKE2B 50ff44f45ac564c5092c6020efd81f65fb806e9bc58f2e40400afeddc0eec8c1a781c2e2bce70b52713cca58d0b98ad5117f7063023b75d0abacca59c8a77e9d SHA512 6f01a87fdaf7a39fcbd6e8c50d4d1ee959bee7864fa2720d8b8079a7fac11e7dc1b376adc935ad1136eb92012ff610ee64e6c94c4740f2337f2287cc8d037572
+DIST ncurses-6.6-20260725.patch.gz.asc 729 BLAKE2B 23ae7cc746dbbfed32dcfbde76469d08b4166b3fad17ad26484ccee906d146e4b6cff847f97d6f4a50cf4cd33768a4b22ebe303bfadf94ffbc2ae393fd05f8d1 SHA512 ebc84dcc1f466a9b7060b003dd512b4a308ac9cf15671d84e54a9fb287ff6c42fcb3530f4253903670fe909e06f19fc16154f6ac03f16943278ce2bf981b004b
+DIST ncurses-6.6-20260801.patch.gz 20105 BLAKE2B dfbdbbb361648bbcdff8850c147074a66eebbd0f8eedae6e9d95d29293d75d1342a7d0efb76a28f35ecaf7dd4d77efe1bbbef479f543bdb55f33b81c9af02149 SHA512 c2ce875f69f60e0f4f88f44da0346b172e1e53fbf3ec0165065faba0530c26cab4dd729426414e5fd4d437c1021dea6b02e9ac6c8a5d3598c8d1e3cf3fc578c4
+DIST ncurses-6.6-20260801.patch.gz.asc 729 BLAKE2B 2d5ad5fa0d15ba2b64b1a2ab2ff0e7e8a6360fff52ee3caffeaa4ae9327cebce2b3c65d35fa95bb2e7a46256889a8a4f8ac6dfba26ae83cd4386f172836671ae SHA512 38d130c0fd334b97aeb96baf1bd783f56f3eb930cfaec4c8d24b93927e3a67c1b04c030706741c7874525794d7d3b7b900e2a6f54453ed07f5f0924b1aadd5a6
+DIST ncurses-6.6-20260808.patch.gz 5286 BLAKE2B 6562b838c9df69805f77230fa6ffae1e2417e67711d8bafd549ff51a02b6ae652ab366f65e5729569580d46dea95716ba28acce332e8636b93d657ac33ccddcc SHA512 69a39d440e8fb5375c7af6e6e120f78c0fcfc172436f670fd30b19d275cd096600c5a607717111cf1fdd3b7435158c17161573a73d9a0513c2b96254a4e80894
+DIST ncurses-6.6-20260808.patch.gz.asc 729 BLAKE2B fc41a6982e1392864a8b3edffdc2e77439b51f241a6c921fc6d54506cca8f8b2dde7ff95b7752e9ec82ab507a71fbc83e41260dec7a355c7ad33a6503606f853 SHA512 9b6f8dcd991f1f3032e607404e726cd140e77a7f83a6b74dba3686a8556004dd9515cbb9e44819fb711d6b1e2938ca19d110214c76b69bb4ee54569affa7df45
+DIST ncurses-6.6-20260815.patch.gz 53165 BLAKE2B ca91c15babe94a95ca5b6b81b443c88d98c49a0d22d66301d7e3c864accd24dd4367fcbcce534f1b000348eab0868745b879e3f2aa334304cbe60e92f9825eab SHA512 112f87f48593f1c6563a59b0cfc22fe61036b21741d0c6c10630c325d2ec634602829419cbe8b7799a482d9618c803f548bfed893323ddec56316bdc2417c6d0
+DIST ncurses-6.6-20260815.patch.gz.asc 729 BLAKE2B e03ca6fecb19d9e563a8faab55d8c6fcbca518e905ca32185fe6b1297678af8f71bb7b4964d2d09aab2eb8ca5dd9d829f2914a432d4175ca94c5333577040232 SHA512 242c868e9d26e16123c0e71c63eb9ee85ea1a33f5603a83bd6aecabb390288b367445dc32c17ddca4a8e6c5cb6fedfa46057438bc351938c5e45003a3537f22d
+DIST ncurses-6.6-20260822.patch.gz 63008 BLAKE2B 9b4a2ece7195cbe7919413bd08f85dfc1bd5ae23a36a98398f8b94993777959059ff76403959efba3c6b620b329d3d62d8208380f3450406b6896a64cfeab87a SHA512 2fb5c320842bc69f6e4f2e4bb9fe156b8ac8c638e73c765b15d9daa640eeef398a6f4d98f543fa80c5c32281212330130685dce8767c9a8f501d7da791348d58
+DIST ncurses-6.6-20260822.patch.gz.asc 729 BLAKE2B 8a4e66927b8f0c2fe000740f5535c0cb1d935a2ac5b7ac56ebb8cd8cf774a111f52f84debc44a655cbc686d87ba37f4f222f90680dbd55ee98ba504a3d05407d SHA512 4540f2e8240989cbca94ac33c3cf169a71340bb5ce34c9cba26eb063db055e37a606de205dcf5999f36824e875b97b2a77f96b1ded0cb9d6178423bb6dc68635
+DIST ncurses-6.6-20260829.patch.gz 48385 BLAKE2B 88c444619a371f007b18bee2afc7fb836e01fa2d4d29730e9a27fb9ee60683fcbcead17f6de39e38717de3563d7b36a6f7e84fa06d548a4262c6067ccb5f2d1b SHA512 c8bf2eca1f0c8e200ad95050bcdbd1b48ead8eaf5a92ae3e0bac197a93de470c11139d086d914455a958dea637762ebe3be86accf1652c1a7d39b9ba836d983a
+DIST ncurses-6.6-20260829.patch.gz.asc 729 BLAKE2B 4bff744b90ba5dffe3e105d1c4591f4e6f8ef502a1cf9287c33ecd7958d998ce90bdaa966ba081f7c69c32a53e00e4d91566b79d60d9580c33398baab2a80fb7 SHA512 7eac4fdba05a9d212b62a7c8503217902fe4820de213fbf373ecdfd7a1bcb50992caca9cf521c7ec595c644d34b30a08579de4d5d4f4bf10794ed31f1dd5068b
+DIST ncurses-6.6-20260905.patch.gz 14356 BLAKE2B 732d7cfd1cf14b55a38e068d8bc40c9f502ea6aca4099cbfb7e19dcde61e236d46bde2abf0a3c3b9afebb61ce47bcb5ea9cb2dad861ecd4d0051b4375d73fb8b SHA512 de5cde58469a58d5297d3080ebae9f28ff75ea20b9ca40c7a8317aec4685742349e6e33f71ad9b129309c607b29dc66c5a98d93ed821e4aea448b9466a6d3cbb
+DIST ncurses-6.6-20260905.patch.gz.asc 729 BLAKE2B ca6831b2f5e3cefcf26cbd14b9c2f343b6b1ee5958c8996a2128e5334adba77f63d754aca9cd4fbe50f03e077a5b572d7cc4ac697593010e31b46bf6b6473157 SHA512 4dc179a70caa62fc1c68bd642c455f0b3d9769c69c646827da066229ac1c6a26d18978c004d7cb3c28fa6b91b3f02e5212d888a0aebbd55c527e9a6efd66ef5f
+DIST ncurses-6.6-20260912.patch.gz 144302 BLAKE2B b0cf9de7900e15805ea623a9978f3bc3c76de49f827fb7c45d2b2cb07d94725be6b490c27c1b03ec6dc7beff3f4f5bc8842453407ccbf5b41665099f00cc1636 SHA512 b2332327c56366647b012e7995a938c4bc4182ab5569452cc1168bdc70fc3cae2f6548cd86608aa81c2227ec216c5613c4a184057728aa3d3909b39fdff6894d
+DIST ncurses-6.6-20260912.patch.gz.asc 729 BLAKE2B c8137473140d28f766fabb2e74fc474d55667776dc3afd4d939db07c9ca10c7f5441a56af976e33911491050a2fc59f7c1ff88484e32c8213b49bfae0e41a8dd SHA512 38b236dc403d64475c80d5a6bb5b9410faa8e372259daf000d5f5e6feeb2171f9fc3685f3aaeebb6abb6391caead7f6024417d0c58a6f84d5431e66bc2cb0981
 DIST ncurses-6.6.tar.gz 3791150 BLAKE2B 8863ce3091fc72f23d12fe5913ea07c783e907cd8454b1c2b782f3e6bb91110cbfc4c52b8f0404eabd0d2041211183614e9d7f125ef8deeb23237b031f61fca0 SHA512 02647baae53abc844fbadee5b0a2187ad073125c4e8950df6d1c4feb781cb74ba64fb838cedfee2c246c39932187f6775b1df124f18b99a4233f0d98c72191de
 DIST ncurses-6.6.tar.gz.sig 438 BLAKE2B 0c687ae08bc40642479eeefc3f40f6993646566bd6fc2c6ff8f0f5c5bb930a3c9dfa4d85916eb9ce42ca17cec4ecccbbb532ac3bc6fdf16f5fc406171706c4b8 SHA512 73c6ca454e15d20d544e1220c62dcc265f69b42a76f29cd2068f06d874ed05d7567fdce8afe342fa5bb62d0f1c650927a88255f71b1b386a5d54d41738167eed
 DIST ncurses-6.6_p20260411-patches.tar.xz 81820 BLAKE2B 1f5496b2a77a876b96d8b1b9ffc3d6a0d7452d3b7f3f8e5e96643756b9a5c97b7aff5758f1e9e5e574875c5dc6cd9d517556c96e5d967ef6f7e2c2fc3668d543 SHA512 11bb25b97d7377ac06d78e5c1026077ba1f1a45521473d2173532e9dbb4f938cc400faf140e3ed28963c49a3561b4bc4ab45c21c24ca223d41e43ee69ba33723
+DIST ncurses-6.6_p20260912-patches.tar.xz 64856 BLAKE2B c01762e650058d7730809858165373c9d9f985054f4d473eb0c074314e436541d6c5de61204807df2e2a6ac696f8267d06558732fa5632b7526ba257fb50123e SHA512 0c34d94fea4701bb174435c9207f2063b5ae96746b3fc4d2752fb00652fc4f4f9b9ce7c523248c8bc3c6f7d545175733962ab2f97231de7b5f64ec742ae4a4bd
diff --git a/sys-libs/ncurses/ncurses-6.6_p20260411.ebuild b/sys-libs/ncurses/ncurses-6.6_p20260411-r1.ebuild
index a5b83840c446..1a9838f2a751 100644
--- a/sys-libs/ncurses/ncurses-6.6_p20260411.ebuild
+++ b/sys-libs/ncurses/ncurses-6.6_p20260411-r1.ebuild
@@ -162,14 +162,16 @@ src_configure() {
 	# bug #214642
 	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
 
-	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
-	# Order matters here -- we want unicode/thread versions to come last so that the
-	# binaries in /usr/bin support both wide and narrow.
+	# Build the various variants of ncurses -- wide, narrow, threaded (bug #510440).
+	# We only install programs & the terminfo DB for the wide version.
+	# Wide goes first because later variants won't overwrite existing files
+	# (at least partially).
+	#
 	# The naming is also important as we use these directly with filenames and when
 	# checking configure flags.
 	NCURSES_TARGETS=(
-		ncurses
 		ncursesw
+		ncurses
 		ncursest
 		ncursestw
 	)
@@ -191,6 +193,7 @@ src_configure() {
 			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
 			|| lbuildflags="${dbuildflags}"
 
+		einfo "Configuring target: minimal tic"
 		# We can't re-use the multilib BUILD_DIR because we run outside of it.
 		BUILD_DIR="${WORKDIR}" \
 		CC=${BUILD_CC} \
@@ -213,9 +216,10 @@ multilib_src_configure() {
 		use stack-realign && append-flags -mstackrealign
 	fi
 
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_configure "${t}"
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		einfo "Configuring target: ${target}"
+		do_configure "${target}"
 	done
 }
 
@@ -240,9 +244,10 @@ do_configure() {
 		# Now the rest of the various standard flags.
 		--with-shared
 		--enable-fvisibility
-		# (Originally disabled until bug #245417 is sorted out, but now
+
+		# Originally disabled until bug #245417 is sorted out, but now
 		# just keeping it off for good, given nobody needed it until now
-		# (2022) and we're trying to phase out bdb.)
+		# (2022) and we're trying to phase out bdb.
 		--without-hashed-db
 		$(use_with ada)
 		$(use_with cxx)
@@ -272,10 +277,9 @@ do_configure() {
 		$(use_enable !debug leaks)
 		$(use_enable debug expanded)
 		$(use_enable !debug macros)
-		$(multilib_native_with progs)
+		--without-progs
 		$(use_with test tests)
 		$(use_with trace)
-		$(use_with tinfo termlib)
 		--disable-stripping
 		--disable-pkg-ldflags
 	)
@@ -290,10 +294,11 @@ do_configure() {
 	esac
 
 	if [[ ${target} == ncurses*w ]] ; then
-		conf+=( --enable-widec )
+		conf+=( --enable-{widec,ext-colors} )
 	else
-		conf+=( --disable-widec )
+		conf+=( --disable-{widec,ext-colors} )
 	fi
+
 	if [[ ${target} == ncursest* ]] ; then
 		conf+=( --with-{pthread,reentrant} )
 	else
@@ -309,10 +314,37 @@ do_configure() {
 	else
 		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
 	fi
+
+	if [[ ${target} == "ncursesw" ]] ; then
+		# Overwrite libtinfo with the wide variant (bug #910430, bug #972804).
+		#
+		# Don't do this for all variants, as we can't mix ncurses with
+		# ncursestw, for example.
+		conf+=(
+			$(use_with tinfo termlib tinfo)
+			--with-ticlib=tic
+			--disable-tic-depends
+
+			$(multilib_native_with progs)
+		)
+	else
+		conf+=(
+			$(use_with tinfo termlib)
+			--with-ticlib
+			--disable-tic-depends
+
+			--disable-db-install
+		)
+	fi
+
 	# See comments in src_configure.
 	if [[ ${target} != "cross" ]] ; then
 		local cross_path="${WORKDIR}/cross"
-		[[ -d ${cross_path} ]] && export TIC="${cross_path}/progs/tic"
+		local tic="${cross_path}/progs/tic"
+		if [[ -x ${tic} ]] ; then
+			einfo "Using TIC=${tic}"
+			export TIC="${tic}"
+		fi
 	fi
 
 	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
@@ -321,6 +353,7 @@ do_configure() {
 src_compile() {
 	# See comments in src_configure.
 	if ! has_version -b "~sys-libs/${P}:0" ; then
+		einfo "Building target: minimal tic"
 		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
 	fi
 
@@ -328,9 +361,10 @@ src_compile() {
 }
 
 multilib_src_compile() {
-	local t
-	for t in "${NCURSES_TARGETS[@]}" ; do
-		do_compile "${t}"
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		einfo "Building target: ${target}"
+		do_compile "${target}"
 	done
 }
 
@@ -347,27 +381,29 @@ do_compile() {
 	# generation is quite small.
 	emake -j1 sources
 
-	# For some reason, sources depends on pc-files which depends on
-	# compiled libraries which depends on sources which ...
-	# Manually delete the pc-files file so the install step will
-	# create the .pc files we want.
-	rm -f misc/pc-files || die
 	emake "$@"
 }
 
 multilib_src_install() {
 	local target
 	for target in "${NCURSES_TARGETS[@]}" ; do
-		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+		case ${target} in
+			ncursesw)
+				einfo "Installing full target: ${target}"
+				(
+					# Make sure tic picks up the just-built library
+					local -x PATH="${BUILD_DIR}/${target}/progs${PATH+:${PATH}}"
+					local -x LD_LIBRARY_PATH="${BUILD_DIR}/${target}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
+					emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+				)
+				;;
+			*)
+				einfo "Installing library-only target: ${target}"
+				emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install.libs
+				;;
+		esac
 	done
 
-	# Move main libraries into /.
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a \
-			"${NCURSES_TARGETS[@]}" \
-			$(usex tinfo 'tinfow tinfo' '')
-	fi
-
 	# Don't delete '*.dll.a', needed for linking, bug #631468
 	if ! use static-libs; then
 		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
@@ -443,9 +479,11 @@ multilib_src_install_all() {
 pkg_preinst() {
 	preserve_old_lib /$(get_libdir)/libncurses.so.5
 	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+	preserve_old_lib /$(get_libdir)/libtinfow.so.6
 }
 
 pkg_postinst() {
 	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
 	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+	preserve_old_lib_notify /$(get_libdir)/libtinfow.so.6
 }
diff --git a/sys-libs/ncurses/ncurses-6.6_p20260912.ebuild b/sys-libs/ncurses/ncurses-6.6_p20260912.ebuild
new file mode 100644
index 000000000000..a77f1e145a13
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.6_p20260912.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# sys-libs/ncurses-compat can be bumped with sys-libs/ncurses as upstream
+# provide a configure option for the ABI version.
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs verify-sig
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+# Keep invisible-mirror.net here as some users reported 403 forbidden with invisible-island.net
+SRC_URI="
+	mirror://gnu/ncurses/${MY_P}.tar.gz
+	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
+	https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
+	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
+"
+
+GENTOO_PATCH_DEV=sam
+GENTOO_PATCH_PV=6.6_p20260912
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
+
+# Populated below in a loop. Do not add patches manually here.
+UPSTREAM_PATCHES=()
+
+if [[ ${PV} == *_p* ]] ; then
+	# Sometimes, after releases, there's no megapatch available yet.
+	#
+	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
+	#
+	#	"At times (generally to mark a relatively stable point), I create a rollup
+	#	patch, which consists of all changes from the release through the current date."
+	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
+	# This array should contain a list of all the snapshots since the last
+	# release if there's no megapatch available yet.
+	PATCH_DATES=(
+		20251231
+		20260103
+		20260117
+		20260124
+		20260131
+		20260207
+		20260214
+		20260221
+		20260301
+		20260307
+		20260314
+		20260321
+		20260328
+		20260404
+		20260411
+		20260418
+		20260425
+		20260502
+		20260509
+		20260516
+		20260523
+		20260530
+		20260606
+		20260607
+		20260608
+		20260613
+		20260620
+		20260627
+		20260704
+		20260711
+		20260718
+		20260725
+		20260801
+		20260808
+		20260815
+		20260822
+		20260829
+		20260905
+
+		# Latest patch is just _pN = $(ver_cut 4)
+		$(ver_cut 4)
+	)
+
+	if [[ -z ${PATCH_DATES[@]} ]] ; then
+		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P/_p/-}.patch.sh.gz"
+		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P/_p/-}.patch.sh.gz.asc"
+
+		# If we have a rollup patch, use that instead of the individual ones.
+		UPSTREAM_PATCHES+=( patch.sh )
+	else
+		# We use a mirror as well because we've had reports of 403 forbidden for some users.
+		upstream_url_base="https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-"
+		upstream_m_url_base="https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-"
+
+		# Prefix each date with the upstream location (https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P})
+		mangled_patches=( "${PATCH_DATES[@]/#/${upstream_url_base}}" )
+		# Suffix each with .patch.gz
+		mangled_patches=( "${mangled_patches[@]/%/.patch.gz}" )
+		mangled_patches_sig=( "${mangled_patches[@]/%/.asc}" )
+		# Repeat for .patch.gz.asc for verify-sig
+		SRC_URI+=" ${mangled_patches[@]}"
+		SRC_URI+=" verify-sig? ( ${mangled_patches_sig[@]} )"
+
+		# For all of the URLs, chuck in invisible-island.net too:
+		SRC_URI+=" ${mangled_patches[@]/${upstream_url_base}/${upstream_m_url_base}}"
+		SRC_URI+=" verify-sig? ( ${mangled_patches_sig[@]/${upstream_url_base}/${upstream_m_url_base}} )"
+
+		UPSTREAM_PATCHES=( "${PATCH_DATES[@]/%/.patch}" )
+
+		unset upstream_url_base upstream_m_url_base mangled_patches mangled_patches_sig
+	fi
+fi
+
+SRC_URI+=" https://distfiles.gentoo.org/pub/proj/base-system/ncurses/${GENTOO_PATCH_NAME}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
+# In 6.5_p20250118, the C++ examples fail to link, but there's no automated
+# testsuite anyway. Controlling building examples isn't really what USE=test
+# is for. Just restrict them. Still seems to fail after
+# https://lists.gnu.org/archive/html/bug-ncurses/2026-03/msg00013.html too.
+RESTRICT="!test? ( test ) test"
+
+# TODO: ncurses allows (and we take advantage of this, even) passing
+# the SONAME for dlopen() use, so only the header is needed at build time.
+# Maybe we should bundle a copy of gpm.h so we can move gpm to PDEPEND
+# which would be far nicer UX-wise.
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# Block the older ncurses that installed all files w/SLOT=5, bug #557472
+RDEPEND="
+	${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1
+	!minimal? ( !<x11-terms/ghostty-1.1.0 )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+PATCHES=(
+	"${UPSTREAM_PATCHES[@]/#/${WORKDIR}/${MY_P}-}"
+
+	# When rebasing Gentoo's patchset, please use git from a clean
+	# src_prepare with upstream patches already applied. git am --reject
+	# the existing patchset and rebase as required. This makes it easier
+	# to manage future rebasing & adding new patches.
+	#
+	# For the same reasons, please include the original configure.in changes,
+	# NOT just the generated results!
+	"${WORKDIR}"/${GENTOO_PATCH_NAME}
+)
+
+src_unpack() {
+	# Avoid trying to verify our own patchset tarball, there's no point
+	if use verify-sig ; then
+		local file
+		for file in ${A} ; do
+			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
+			else
+				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
+
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	# bug #115036
+	unset TERMINFO
+
+	tc-export_build_env BUILD_{CC,CXX,CPP}
+
+	# bug #214642
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
+
+	# Build the various variants of ncurses -- wide, narrow, threaded (bug #510440).
+	# We only install programs & the terminfo DB for the wide version.
+	# Wide goes first because later variants won't overwrite existing files
+	# (at least partially).
+	#
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncursesw
+		ncurses
+		ncursest
+		ncursestw
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. bug #249363, bug #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		einfo "Configuring target: minimal tic"
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		CPP=${BUILD_CPP} \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal --with-progs --without-ada
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if [[ ${ABI} == x86 ]] ; then
+		# For compatibility with older binaries at slight performance cost.
+		# bug #616402
+		use stack-realign && append-flags -mstackrealign
+	fi
+
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		einfo "Configuring target: ${target}"
+		do_configure "${target}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--enable-fvisibility
+
+		# Originally disabled until bug #245417 is sorted out, but now
+		# just keeping it off for good, given nobody needed it until now
+		# (2022) and we're trying to phase out bdb.
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+
+		# bug #930806
+		--disable-setuid-environ
+		# TODO: Maybe do these for USE=hardened
+		#--disable-root-access
+		#--disable-root-environ
+
+		--disable-termcap
+		--enable-symlinks
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_enable debug assertions)
+		$(use_enable !debug leaks)
+		$(use_enable debug expanded)
+		$(use_enable !debug macros)
+		--without-progs
+		$(use_with test tests)
+		$(use_with trace)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	case ${CHOST} in
+		*-mingw32*)
+			conf+=( --enable-term-driver )
+			;;
+		*)
+			conf+=( --disable-term-driver )
+			;;
+	esac
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-{widec,ext-colors} )
+	else
+		conf+=( --disable-{widec,ext-colors} )
+	fi
+
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+
+	if [[ ${target} == "ncursesw" ]] ; then
+		# Overwrite libtinfo with the wide variant (bug #910430, bug #972804).
+		#
+		# Don't do this for all variants, as we can't mix ncurses with
+		# ncursestw, for example.
+		conf+=(
+			$(use_with tinfo termlib tinfo)
+			--with-ticlib=tic
+			--disable-tic-depends
+
+			$(multilib_native_with progs)
+		)
+	else
+		conf+=(
+			$(use_with tinfo termlib)
+			--with-ticlib
+			--disable-tic-depends
+
+			--disable-db-install
+		)
+	fi
+
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		local tic="${cross_path}/progs/tic"
+		if [[ -x ${tic} ]] ; then
+			einfo "Using TIC=${tic}"
+			export TIC="${tic}"
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		einfo "Building target: minimal tic"
+		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		einfo "Building target: ${target}"
+		do_compile "${target}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		case ${target} in
+			ncursesw)
+				einfo "Installing full target: ${target}"
+				(
+					# Make sure tic picks up the just-built library
+					local -x PATH="${BUILD_DIR}/${target}/progs${PATH+:${PATH}}"
+					local -x LD_LIBRARY_PATH="${BUILD_DIR}/${target}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
+					emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+				)
+				;;
+			*)
+				einfo "Installing library-only target: ${target}"
+				emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install.libs
+				;;
+		esac
+	done
+
+	# Don't delete '*.dll.a', needed for linking, bug #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (bug #689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+
+	# Remove obsolete libcurses symlink that is created by the build
+	# system. Technically, this could be also achieved
+	# via --disable-overwrite but it also moves headers implicitly,
+	# and we do not want to do this yet.
+	# bug #836696
+	rm "${ED}"/usr/$(get_libdir)/libcurses* || die
+}
+
+multilib_src_install_all() {
+	local terms=(
+		# Dumb/simple values that show up when using the in-kernel VT.
+		ansi console dumb linux
+		vt{52,100,102,200,220}
+		# [u]rxvt users used to be pretty common.  Probably should drop this
+		# since upstream is dead and people are moving away from it.
+		rxvt{,-unicode}{,-256color}
+		# xterm users are common, as is terminals re-using/spoofing it.
+		xterm xterm-{,256}color
+		# screen is common (and reused by tmux).
+		screen{,-256color}
+		screen.xterm-256color
+	)
+	if use split-usr ; then
+		local x
+		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+		use minimal && rm -r "${ED}"/usr/share/terminfo*
+		# Because ncurses5-config --terminfo returns the directory we keep it
+		# bug #245374
+		keepdir /usr/share/terminfo
+	elif use minimal ; then
+		# Keep only the basic terminfo files
+		find "${ED}"/usr/share/terminfo/ \
+			\( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \
+			-type d -empty -delete || die
+	fi
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+	preserve_old_lib /$(get_libdir)/libtinfow.so.6
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+	preserve_old_lib_notify /$(get_libdir)/libtinfow.so.6
+}
diff --git a/sys-power/cpupower/cpupower-6.16-r1.ebuild b/sys-power/cpupower/cpupower-6.16-r1.ebuild
index 9ed6363cf23d..b7524129921e 100644
--- a/sys-power/cpupower/cpupower-6.16-r1.ebuild
+++ b/sys-power/cpupower/cpupower-6.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2025 Gentoo Authors
+# Copyright 2013-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
diff --git a/virtual/dist-kernel/dist-kernel-6.1.188.ebuild b/virtual/dist-kernel/dist-kernel-6.1.188.ebuild
new file mode 100644
index 000000000000..13848dc136b6
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.188.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV%_p*}
+	)
+"
diff --git a/virtual/dist-kernel/dist-kernel-6.12.110.ebuild b/virtual/dist-kernel/dist-kernel-6.12.110.ebuild
new file mode 100644
index 000000000000..13848dc136b6
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.12.110.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV%_p*}
+	)
+"
diff --git a/virtual/dist-kernel/dist-kernel-6.18.52.ebuild b/virtual/dist-kernel/dist-kernel-6.18.52.ebuild
new file mode 100644
index 000000000000..3e0fb5394edd
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.18.52.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV%_p*}
+	)
+"
diff --git a/virtual/dist-kernel/dist-kernel-6.6.157.ebuild b/virtual/dist-kernel/dist-kernel-6.6.157.ebuild
new file mode 100644
index 000000000000..13848dc136b6
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.6.157.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV%_p*}
+	)
+"
diff --git a/virtual/dist-kernel/dist-kernel-7.2.6.ebuild b/virtual/dist-kernel/dist-kernel-7.2.6.ebuild
new file mode 100644
index 000000000000..c6e96ed25616
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-7.2.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+SLOT="0/${PVR}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV%_p*}
+		~sys-kernel/gentoo-kernel-modprep-${PV}
+	)
+"
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.120.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.120.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-3.120.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-3.120.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.145.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.145.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.145.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.145.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.13.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.13.ebuild
index 058443228fa2..b618a6e40a6e 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.13.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.13.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.218.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.218.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.218.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.218.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-DB_File/perl-DB_File-1.860.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.860.0.ebuild
index 33b4b8f7f1c2..e651fe6a6755 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.860.0.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.860.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44*[berkdb] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/perl-Encode-3.240.0.ebuild b/virtual/perl-Encode/perl-Encode-3.240.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Encode/perl-Encode-3.240.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-3.240.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.243.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.243.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.243.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.243.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.780.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.780.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.780.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.780.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.630.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.630.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.630.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.630.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.950.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.950.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.950.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.950.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.231.200.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.231.200.ebuild
index 2868daf8df8b..45ae6cc4c6a5 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.231.200.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.231.200.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.223.0-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.223.0-r1.ebuild
index 26a04457d3a5..74694d4e79fb 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.223.0-r1.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.223.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.440.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.440.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.440.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.440.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/perl-IO-1.560.0.ebuild b/virtual/perl-IO/perl-IO-1.560.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-IO/perl-IO-1.560.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.560.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.3.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.3.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.3.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-2.5.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.607.80-r1.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.607.80-r1.ebuild
index c5eecf0b134d..31acbf20b0f2 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.607.80-r1.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.607.80-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.39.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.39.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.39.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.39.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.480.0.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.480.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.480.0.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.480.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.700.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.700.0.ebuild
index a4b50ac1c7a6..f2408a89b15d 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.700.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.700.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/perl-Socket-2.41.0.ebuild b/virtual/perl-Socket/perl-Socket-2.41.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Socket/perl-Socket-2.41.0.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.41.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/perl-Storable-3.410.0.ebuild b/virtual/perl-Storable/perl-Storable-3.410.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Storable/perl-Storable-3.410.0.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.410.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-Table/perl-Term-Table-0.28.0.ebuild b/virtual/perl-Term-Table/perl-Term-Table-0.28.0.ebuild
index f8f1ea336494..aa4c63a45a4a 100644
--- a/virtual/perl-Term-Table/perl-Term-Table-0.28.0.ebuild
+++ b/virtual/perl-Term-Table/perl-Term-Table-0.28.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.520.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.520.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.520.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.520.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.219.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.219.ebuild
index fa504800ad2e..dd51da2562ea 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.219.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.219.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.219.ebuild b/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.219.ebuild
index d6b7941cb469..245de362b99a 100644
--- a/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.219.ebuild
+++ b/virtual/perl-Test2-Suite/perl-Test2-Suite-1.302.219.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.70.0.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.70.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.70.0.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.70.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.978.0.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.978.0.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.978.0.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.978.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/perl-threads-2.450.0.ebuild b/virtual/perl-threads/perl-threads-2.450.0.ebuild
index 2c32851ae5e2..a67092f0d85c 100644
--- a/virtual/perl-threads/perl-threads-2.450.0.ebuild
+++ b/virtual/perl-threads/perl-threads-2.450.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44*[perl_features_ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/perl-version-0.993.400.ebuild b/virtual/perl-version/perl-version-0.993.400.ebuild
index 7046096fead5..e691f3429b3f 100644
--- a/virtual/perl-version/perl-version-0.993.400.ebuild
+++ b/virtual/perl-version/perl-version-0.993.400.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.44* ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-apps/jellyfin-bin/Manifest b/www-apps/jellyfin-bin/Manifest
index dfaca94b66ce..aded45f19fa5 100644
--- a/www-apps/jellyfin-bin/Manifest
+++ b/www-apps/jellyfin-bin/Manifest
@@ -2,7 +2,7 @@ DIST jellyfin_10.11.11-amd64-musl.tar.xz 85687656 BLAKE2B f164e2e0a5026ad15e04bb
 DIST jellyfin_10.11.11-amd64.tar.xz 85594608 BLAKE2B 2b6f0e0bd699fc106050d3707f1f904339df5f39652314c8e8414971a8d8ebc50ad6cd8b7f1000913a2f813e35f2e0fb6c79cc526da9896870e67f8081f7ddcd SHA512 31d84d98f528bc321f1dbb5ee0ad1eb4fdcfd49ba41b0f4476a4bf89d626ea232f7a468ad401ee79f7b3e87e2fb9c5269acf548768fab85d3903fe88d268f384
 DIST jellyfin_10.11.11-arm64-musl.tar.xz 81333968 BLAKE2B f7beb697c44a650264fbc8123bf08a9573e1e3c083b0522041b242012affde858df69f6409ed485afb5b9fea6c7c55013dc5254dd46ddaa3297ae65cde221db4 SHA512 f631f952bdbf4a87bed5ca41be68c1dc651f2ca670753ac56fb235d16604105833bd2e1b2a5c389f295339c59f6478e23b98778ec120cbb1c42ab7af90bf6abc
 DIST jellyfin_10.11.11-arm64.tar.xz 81317864 BLAKE2B 99842f670be9c6d4388f8021afbff7ecdc4bddb227b5398c6818d6bbcf162163c9d41d9a980bf44afc18a41967162a83ac10806bfd1e9a326fd74c622049ae0b SHA512 d33d8e39aa731f7402c89935ebc565fc435203e8ea60239b8a680997a949857c229be9299d8154a7ba021e0519bc466efa89793478d0ac886c2410f33fb4f4a5
-DIST jellyfin_12.0-amd64-musl.tar.xz 93149560 BLAKE2B bdf35f7ab417331b985e510170791743ddd4e4789639ce9b8547ac404d94958ea8d01c95c3d1fbafe6d4c1941aeb036150d9fd7752c490ed60440562a66aba62 SHA512 55977ae40c8140c82a842efc10347aebe536e33a0918d54f432637ef1e0c4489a9baeda32eec778a28d0b5a4482fac0a5346dad223eb6c48db6835ed713ad40d
-DIST jellyfin_12.0-amd64.tar.xz 88723564 BLAKE2B 3a806829df9922a732ed2db11113ab08f74f8883d665906ee73b8df73375a2b7e6498f1d00caaa15b5b4eff6a6a50aa8065d1824f141ad1434aa2976f10aa932 SHA512 5c4ebbf7f70fad78ef3852c87423bccd44a8ae54f7b49901c5afc0af1a14ab48aed5ec8c845755bc5fb3437fe110bf415ffa5522bbf280b3e739a6345c887e13
-DIST jellyfin_12.0-arm64-musl.tar.xz 88635428 BLAKE2B 0c4806597ef5df05220f7a328c72b77c6efba928a0b41e8443115c2802891dc67970aaa985ca6655a0d2ba32e97fdf0f67bcc6063a50c44fcc9a45edfc23b37c SHA512 f9e2fcfe6a7e0ff8baceb0afe8c7bd4ba36b02f648e9818e952a4659364d2a059e857b3c9f354310f4608d8fd32d4d45f4ee9a9228093fd27cc0751b3b79d3f3
-DIST jellyfin_12.0-arm64.tar.xz 84167320 BLAKE2B 9cc625b1fa48857f17fa8352609c4d4a595d4698296cf221c021a134856d70c319dd85c78e44ba68f762200aab982c5614e49d4686c9a5eec6838da274c72d39 SHA512 efb510e08c69c0850317fb6016e17c73f631f2116f38fe896ce0d1347aff700bf64c6a4c13747905255112234577aa0538bfdc16b661d7a3805725073e0709c7
+DIST jellyfin_12.1-amd64-musl.tar.xz 93154996 BLAKE2B 29c04f40262816b4663e97d28ca440ea9cfd7f8c2be8b1b441d23c24d45d806f5323ffee0e6c176f426cb23fba4166be2913ddde6930c0da714ac548a415a12e SHA512 101cb6e19b4e91e82213ead3478a8484b53c942831b5e15db7dd53cf4856e41746bfff851a2b62303808d08044ec8fff8a191ada210caae6663156437176fb15
+DIST jellyfin_12.1-amd64.tar.xz 88731316 BLAKE2B 293a24df9e1c9225fe5903f6df8b518aad5fdd3beda3a00231f2434701729986dab6eaccce9b40268910c7f03170d97a6d9eef8f4aaed3a6476a1dfd93d51643 SHA512 a7b255738c45b90c811b76f612df5952f38192b4a05e7d45816c5a8077998a204d4fdd3d302964c34dc83ebe8285a28e0c7eb80fe3ee24330314ef1468731856
+DIST jellyfin_12.1-arm64-musl.tar.xz 88646184 BLAKE2B 2ab2fe1bec41f25a22190dd0c7882df192a19a93305f4344c77d7984478a824e17b9af7d67625fa69ea8290489da64b5bd2844aab41510f96e0e4e2b134b0504 SHA512 df4781518417fc1db8f2f65dc99173fc3d3f2e8ead60e65c3dfa16935df41fcaad2cf20f557866c340337936a0d96c3453b16690b6101ea47b95faccc262375b
+DIST jellyfin_12.1-arm64.tar.xz 84187524 BLAKE2B ecaaad8605c61a2fad5450e7e92f4526112ab61ecc2a2230e2fff5e24bb88ded9c174462d00efa1a6bd0bbbb8dd2272cef081c4512e7ece6edfcb81c1d17e329 SHA512 74e1d9bb9c81c211f7fd99b29592754adf91528c7ce0bd0c4be414c9de8a8cf51831f04dce4a6ae5c4db1847323b15719d87ce657d9f3f08ae75d6cbe98bfd6b
diff --git a/www-apps/jellyfin-bin/jellyfin-bin-12.0.ebuild b/www-apps/jellyfin-bin/jellyfin-bin-12.1.ebuild
index 7e747d77779b..7e747d77779b 100644
--- a/www-apps/jellyfin-bin/jellyfin-bin-12.0.ebuild
+++ b/www-apps/jellyfin-bin/jellyfin-bin-12.1.ebuild
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index c8ba911c37c1..2e9a7d80806e 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,3 +1,3 @@
-DIST moodle-4.5.13.tgz 75119513 BLAKE2B 850ba00c787b0f307cd363f99c3f965b283dcdbf0fd0f53e122354cc18195b55ba7b3ef42a1a023adc22d4b6de2337e9903f14cb8686106ec66d8c25ef94f316 SHA512 8940d48d5c5231036a8700cb228743f27f6e3c7bf963b81494953d6b4ac9f06ccdb0c6bd3b6875207afdc1635e3e3702ba30b041fab5ffdb7e2e9a4bc4f33f4b
-DIST moodle-5.0.9.tgz 75000754 BLAKE2B 474357a320e06444ce6d87b07fb250fb2be8dd2410c358c387d93915bddf16bc63bfe563c4a1a147791aa3669378288b558900997516d2de95d6d2e7308d8146 SHA512 01a6a7f41d36db44e1585759d3617ff2b5e5aac38e0cc44452a986d19da9b811b3441c6cbb4846feb3558377863c59104668c17dd48197692e2dc252c2c50e90
-DIST moodle-5.2.2.tgz 89751760 BLAKE2B 6321821a36c49d26502373923f124c9795f5ddd53ce58d056e616bf7ae57e19acb24953329d14dcc41499284fa56628a044f3a5644212fa711fa5460f0ad2fc5 SHA512 bccea5b38a2f5e715a8a77d4e9802251f320167e29648f94a100ab52d1f89c2b76f343876c23db8a18884308775dd4920413482f7fe18a05ba35669839bd337c
+DIST moodle-4.5.14.tgz 75136951 BLAKE2B 4eec45a3cf29d0d03fa904534055b7bff1ef29d651f1738799f2a10b0e0dd2bc77b5f7aec37daca8a62a34aaa2a7be0f0e5c65fcf6c13ea0c21c7f86059e6e66 SHA512 33c5bb098a08755cbfd0c1c6af914a9b477adf08dce51875115efa95394fe52688bef37878f978a60a90ff3573b9932e85cd49b48e2d4bd66495a337ab8ed9db
+DIST moodle-5.0.10.tgz 75007511 BLAKE2B 57c806ed531c85b1d8b0073b3527d131b6a1d0e1804eacfffa6dae94725d34b5057d4b18eb6462b157dae7eb2161ebe0e8f2bb82f0d3423f41dd1ab4740dd692 SHA512 148be0f501acaed06023193ffd49801ac5da78972f39789565cdfa71a86573521c5d070e5b5d110382ff12afffae885bc08d746675c9789435ec702ac078e5e2
+DIST moodle-5.2.3.tgz 89805177 BLAKE2B 3fae4d572e88d4b362643da9f6f616b61d6b50db477f39975966255dcd4ac4b54d9f2c801a6591400c789fd9a45a4e91625d9a23be2f418c648dd763cf81c59d SHA512 8f515b0d0c4d93691f270600ea9573e35cf8167628355ee256c988ced8ffbee0adab11cb0f3f4d75866411ea13eac49c2d8f2659ee6ad0da9b168fdae1fa877f
diff --git a/www-apps/moodle/moodle-4.5.13.ebuild b/www-apps/moodle/moodle-4.5.14.ebuild
index 2be67ebc6a00..2be67ebc6a00 100644
--- a/www-apps/moodle/moodle-4.5.13.ebuild
+++ b/www-apps/moodle/moodle-4.5.14.ebuild
diff --git a/www-apps/moodle/moodle-5.0.9.ebuild b/www-apps/moodle/moodle-5.0.10.ebuild
index 2be67ebc6a00..2be67ebc6a00 100644
--- a/www-apps/moodle/moodle-5.0.9.ebuild
+++ b/www-apps/moodle/moodle-5.0.10.ebuild
diff --git a/www-apps/moodle/moodle-5.2.2.ebuild b/www-apps/moodle/moodle-5.2.3.ebuild
index 7a886b69cb1d..7a886b69cb1d 100644
--- a/www-apps/moodle/moodle-5.2.2.ebuild
+++ b/www-apps/moodle/moodle-5.2.3.ebuild
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 124b26cfc7c5..e9a85610ced4 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -192,6 +192,103 @@ DIST firefox-153.2.0esr-vi.xpi 527407 BLAKE2B da36cf6bebdc37f250fcfdb978fef28db1
 DIST firefox-153.2.0esr-xh.xpi 355159 BLAKE2B a2dabecb5712fc2adb546f0f4e595b8f24bd802e3de04dbefbb66edd70985ffcfd92477bbf16553bc3bf979fefdd402c2a91173a1a79c467752cf0d0fae5a6d7 SHA512 3ad49a67fefb3ad2d204adb71f8a280df8742cf32efd507e026810fa17c22099796f6c82ed487e7fcb55f297c6aa99c1ddf7f621a2b3e9081aea3ae85921cf3a
 DIST firefox-153.2.0esr-zh-CN.xpi 514271 BLAKE2B 3952dd563e0d756a6e5f240b938f2efbd7d7b3e693a38602e10041f58eac45a76d547e345974192478e25560f4c11be9a9cb74d4f13070dbe667132ff39290fc SHA512 a29d363ce4134fc319a2d50459f8548d1adf93d537e9e792286bc2011736fd93740458bee81a80db0f6977c5b40491c05f43817955fc05ecb5b33f0ddbcb6a4f
 DIST firefox-153.2.0esr-zh-TW.xpi 518964 BLAKE2B c7d24b780e9611e19f99a6439bc70d1bab3e83f54649cd84f48b80cbc58a1206956f0c0659b4f0980743bd2e58ff6597b761cb9936ac68ae960361880b62b214 SHA512 4da9300c3cba6234b82fd7f7a565cc0471f5f4167665022037ae847cce6a69bc4bb6358331774279e03bab5c8fafcb533d6f4862bf6e424c4e5a4ece8e7df4b9
+DIST firefox-153.3.0esr-ach.xpi 363866 BLAKE2B 0ee439fc2942f88bfde7a6588e9d6c6369844d83c38b0913f5705d4cd046bb16bd9828a6517493108dec2477b522afd96db2cc6057368fce648f75becd2dc87c SHA512 2c5380a03e89302a89c016a8d3d6ed0ee5fd50a67dc27f59d1f64067fb24a86c24168fd665ee0bce616858fa7404c6d8214d4b11e98867e22b22aa0c0fc45975
+DIST firefox-153.3.0esr-af.xpi 349901 BLAKE2B e341f8f00a9f61a2be5ef0cde6dfa9694cf6b2e684f9d79abd9464410c3e9972384a42b1c719dc59c2b12d7dc183fba9d3eb6edee2cc27795b483f5e490aba35 SHA512 757381e09e500b9c51775e3f8cb4c509c70c152f8d68594d849b4c702dc2fa9332fc6b38536ebfb59109dba2b054c7dd11dcd8c78a4d185650d9f90828ef79e0
+DIST firefox-153.3.0esr-an.xpi 392245 BLAKE2B df9a4ab61d6de2fb37042218dd77a0cdc3aa745c25014807d44ff65f8743d6eff1883bab00bc33f59e36b86021e34893681568c7ba12ae4ac53498b8bf1e45c5 SHA512 a872d0dd27718879f57a3c5ded2f3d4fe405bba8de2f808ee0dddf1bf01238cb697cc49208ac259b3d6b77a4984cad91d541ed5ee33df33e2b8a56f9e54444d5
+DIST firefox-153.3.0esr-ar.xpi 532669 BLAKE2B 382d4f2f30416924706aaf32775f8c49459e0789d0d8e77de39954e92509e827958e67743a87d6cd5c589ed16610216450ab46b95f46ef5f988907deaeb5dd75 SHA512 7d49537714f2f83364259b071418d3b21257ef6269720f0a45cde3660fb5c11074fef99dc4659683917bc9d6c11489ff1f8d5504ee9f597ff40c942ba224a017
+DIST firefox-153.3.0esr-ast.xpi 387194 BLAKE2B 41ed7aa3939eedbeaf183ce208231070ea97e61f9d1691ac772e3d3e7e6610d30c94c66106d99c9de060ac369dda314305f6e4e5925d71fdeaca966e82e608f4 SHA512 78ab433c52fb0a7003f1f568f92762d6036f99e6d3bf0e87cf87cd679752e774c2f8ef52a67f9a2bbbde8dd81c5596160c15896d86d29cb25441b4dae49de1f5
+DIST firefox-153.3.0esr-az.xpi 401947 BLAKE2B 505f945963f7b208044a54a05ef20d61aa29150fb36b191c5c0f9dcb4fc865e3b0efbc5b0bc19e0a0c651a4fe6cc98447141615e56378f6d89dc19c3df7f3d64 SHA512 db15640a1789d9b7837f309b66e292e9df962a5b0ebf4b3c2b00c29f127f66dc2c42ababb135a00fe20697b595b9c271389eb1248d2d2c9ad00ea0942ca396dd
+DIST firefox-153.3.0esr-be.xpi 585963 BLAKE2B a1c3ebb146d72f9b42d93e891830739e514ecb6060ada93679e656a638d3c4a6a8592180414cbdb999b78d765cbeb59bac278eb0f27f783fc51103e62622b8c7 SHA512 d36b9182eb59284c845839b4e768669a946b5832eadeba1378a00b0e39035440f873813b60fb28d9cb5288fe2e77863ca379d37286fa5efcd27e63e3de57a70b
+DIST firefox-153.3.0esr-bg.xpi 512454 BLAKE2B b56deaf9e1a0eb1e8ab1f292f48386b650ab265a4470ba5186616ca50559af5a8f6add37e3268edd548a315afad9593f0a3342cbe0176518c4cb77c66474b020 SHA512 9297304b94d1f85b4ee96b17b9c676a29fa5c5414ffefb3d7b40233743dedd6fa43e61f123f2d683d5a8163dea4d69a6a96d99031ade98cade296cc65da75ff1
+DIST firefox-153.3.0esr-bn.xpi 463529 BLAKE2B eb0da6533caf3b91ecdc5bcfdef38d4eabebf1da796ed383edabfd13780430f74ebcdf770c91775fcddb7f79ca9932e9d95a182b79c66cbfb9835783352de2c6 SHA512 a84a4899ef09d12e01d871df73d8a18d1677fd2509052dd4c9f05654175962c9d07c3625947c320bada6f7013d16453bb79d63ab6444046f550ed6954997f761
+DIST firefox-153.3.0esr-br.xpi 434129 BLAKE2B 7c39e48d9cc2a3ecda65babd4f2e3435c864b2b04251e965db52f21ab36811a60be5e396440f89a6bb1c7f21197f36c10cc2681bb1b9af729f45934172530e78 SHA512 a0b6a1b0ecc5255dce5c9f7aa142f5e85673e1547efc93ffaaf6cd2fcc14b3c24134428b105e538187d0393bd4e788f0c0e49bd156f4ba4c80077189d2081426
+DIST firefox-153.3.0esr-bs.xpi 470326 BLAKE2B 4a00527c3d076d72df2ab559d96d5d51b59e24266d4a8dce760b05ce43551cf06124a59f591ac02fbdb9c0c16be8e3b417724e0e7de35da8ae20a45052ec7f4c SHA512 64e0a5b1f4cd28d84fa5ea646d4e53443062f14a1235ef4fd622c690a51361fb3cf474425df81bb837460a5f3bbade398cf2db0d3a80c4e81e6970be999153d9
+DIST firefox-153.3.0esr-ca-valencia.xpi 412838 BLAKE2B 2c521dd0a532dd245ce910fe7f1b6c508b9313ce455216612320f283c4ab7f32757aff6b5a2082f0bcfe316d9b08a2e2bfb744b0a4541aacfa8d69fa067a85d8 SHA512 2037d4fb2b5967351e0380ea00642a81df4cdcd0cd00fe673d7a7c45c542ca2b69cc726b0a02c484f98fde088fc5a8d6b12c077a6a2242eb3819cb977d92c195
+DIST firefox-153.3.0esr-ca.xpi 484067 BLAKE2B 2de85bde8343492ced2d6fc43f6040cd3c34fa3b385e1e3cb4227a5100e8f41b5dbfa482e2124791dee82ae233907c374877672b853bdf0bd370badf7645888d SHA512 f5f5cdc9809f0c64584cd76afb00f0731c9a024dd845ca4208c690bafa293ded4f463367986cdb33053553a1beada7e7353b4bab686de6e9fe71af9b9df0c793
+DIST firefox-153.3.0esr-cak.xpi 432909 BLAKE2B 77af2069692d04df2b24049b5ac3f7e170aaee65e3b68ac1a9ab6b542709834aa1de8a297d459e56c757f7fa2ce68c0abbad04abdb6ea9f2f9521e054dea2c22 SHA512 98d92fc5f8c38cca8658b03b6270599b8a3f2aa678cdaa89281a62fb4ba49cf1b21b3805e33a5baac7fc15cd62e09db34c70c43d0cecaff20252933ba954a82b
+DIST firefox-153.3.0esr-cs.xpi 536306 BLAKE2B 1f8b68919219a8b4c33792bcbe6afaffaff3afe0c8c9e632dc07406fa44100c0d2b2a0aca3b498c60779555753cdcc3f1d66fc0db38dc4c543035e799ddb1608 SHA512 58587f51c30495834601d2760a99896789f4101413cca6a537bef8ef55484febe9372809c80961a4bf54a75b2d97217b355ba7478ff7109a15b1c26199192423
+DIST firefox-153.3.0esr-cy.xpi 496720 BLAKE2B fb0d5fb309338cc259d5bb7058feefb7bc1225685169a4de157364cc564b38bb30c624dc19e493f74ad3fae697bfe8985cc07d3d586ed7194a45f9cd2e3848ed SHA512 bb17a0f626b56590187364cde57ee6be80150569e8bc96884b262c3e0bc69cbedb4e6c0e215a9d40ee6e42624985d9c01cb07e9d31907dd0c7c33f59a067f11f
+DIST firefox-153.3.0esr-da.xpi 477878 BLAKE2B 35f849b932ea5a2b77ba7760e388204277129e6307e6ee53e01e09562203762607bcd39126639c6938f4abd1884b38f3864823ca9744d4b62955f70ef0b3cc56 SHA512 a4f2f721310c95e7e7168bcccef3b8563d7ed8462d7b050f4721512caa3006552779c62883839c15e96f3702bb294bf442d0a4bdac62bba4e7ce798f7457684e
+DIST firefox-153.3.0esr-de.xpi 508058 BLAKE2B 8aaae34ff9f63f26d2230ee56300d0bf02c69bc4de2fbf04a460cb2fe0df48edff29888198b16a7e8de76ddab65d61736c28a479d20ea891d71b85d0378206a4 SHA512 657579806c60ef25d09131df434a488318a4d8322452a0fd497ac3e480ea542d6a7f10c23656f7729edd8ad37f22da14c49dd5b6376d558084bbffdd62d498ce
+DIST firefox-153.3.0esr-dsb.xpi 522604 BLAKE2B bb4d3be6a062d4a614f1e0c04a9740b96acccf4549e716e5845804bab1f053f18d74d4ca7be96210188b922e3e0a07ed09825018a4d5e97a7cc406701ce9662e SHA512 4b3313b383e44487e6a9ce8c1844403791f89c67424f07626a5be6c43c096e5c75093d0e4e79aa6d36c27da3b6bd39e6b0371008e29538e2fe17a0234e185cb3
+DIST firefox-153.3.0esr-el.xpi 601826 BLAKE2B 45494ac53b6f9371b315d51a9d5812e28fca64cc0be2c545499276f14ec6f7c4a52c541b4f22ef9553b8a2f04f811c8aa41b509a132ef354c75211419ec89aaa SHA512 97bb4ecfbff1a254e1c2bceddb394c9ef92d4d38d758fab552c0efb6b0529751c4854e4813c8e50ce097930e3917f6559ef88d868c963f58e88935b863c75d1b
+DIST firefox-153.3.0esr-en-CA.xpi 459470 BLAKE2B 87073ccb54f7ce1683b62c922c1554715cf0de77ed0e28f0b5534e172bc886ba55c57ce34ef906a04960fe696fd06fac32ee317cf90c49fb19d17101237cede9 SHA512 db67f6da7da1b9e396b6b9b96bb8787d067531dd3d88feba5e4fee8fb56741618fffd78e2d11dfda67c1290d9b3d61776ad46cd9dadadc7a48b8275422b8b59f
+DIST firefox-153.3.0esr-en-GB.xpi 459801 BLAKE2B 97d3f025e0d1316bcce9de85778d08d6ab2fcd317e05d7bfb174c3645b66afdb1a7bfe7bca12517f27374387daed2a63b5fa9e75ebf6fcdea39c0629c01ab220 SHA512 c992130532b5d79fd0f1e266865b757b827654acbed81a49e144abb077d32592c9f4e293afd705e07e6d130efaa575ab9a5ecb68da731696892aee89d4a4f09c
+DIST firefox-153.3.0esr-eo.xpi 485816 BLAKE2B 7a3ec9692b416e8b45d08bd26cbeb7d013aaeb5222db1202d95172e356eece73ecc63c9c6bc960e05dc733d3030b7a8bd39be143759664e6edb4f48f0cfaa01f SHA512 8817383d33a90324c8316a11c4a68ab1b173747dd1020818a9bc1cadc55d81fa1c2a0f4301d99264f093d8a3b8b148d7d2cb9679cb0d6710b2a4ffb7c2036ec2
+DIST firefox-153.3.0esr-es-AR.xpi 498463 BLAKE2B 92cb87941809ef925f240c18f827e77a942b817b5d20512cc1adc041ca6834abe01e171d3f0b10abe07945cb373d6b12086890ff0caf2ab3f41f678d214bafe2 SHA512 5e82be7f64c06c58d5fce3009d6e7a439f369ee41cd3f52352f02141cfc084e2b157481ee271dcfa40e36b2229c77c00483f514e89eaa3cbcb03493b36e6fb78
+DIST firefox-153.3.0esr-es-CL.xpi 500129 BLAKE2B ace7359118b34bb48b771605d3ac2fd1b66ad229a3a5f015f828693e1fa7797c7a2632142d4db9546a45885a5054883124ad2d15e2410a95adc9f122d2dc7d80 SHA512 44e07104f3b100e93cbca03ba69f98344d1ecd645163c5efc46053dd8433048181a49e625dc07f7af63d5fdf6c9689a011a1e9ebc7cc46edbdeb3870cff27a18
+DIST firefox-153.3.0esr-es-ES.xpi 500226 BLAKE2B b69bea75e85d9e2ee322afb82be4576229f174bb34d089eab792cf2a655eaf328c20dbfc285d67227f49aa17623f5b7e18b57cc46ae9c4e337efe61eaacfdd89 SHA512 c7de7e05f3300616dac58a5f8edd4b9e8753dcba89bf72ed2e644f9235d86bf219dd1f0279517d5242337c408ec6470bec98c5239e889a2a0ad9821aad266a71
+DIST firefox-153.3.0esr-es-MX.xpi 502978 BLAKE2B 8ac49e51ea79b81ab17fac52ae9c5a88adf3fc90ec8fa737545373a7dd272a3b4672366c0291ccb55305f45d99470d2a4ef8e1f047379f50d2686a0ca479bfa7 SHA512 61b67c726806c2083acaaba905be9fa5fa2ec2c93f8095db0caff30e4e4f9f4998d6a92a59519fb136289d3161861261b4dcf3afdd090db729611a94ea6b5f68
+DIST firefox-153.3.0esr-et.xpi 402847 BLAKE2B 8b355dcd4de03c0fbe7a49a6d099d13bb4daa03853dbc3083530d0bdba46f003235b3f646fd3c045def16a43898cbc88d1856cba0c52c81f2e7f9e468c4053c6 SHA512 c72626586efa3c7a670ff7b03216eb9fb706e9f454b6171ac62f5e1bd1ce4ca6c388b92c5faa13fdb03a630e96bc77fd5c771dc52fa72c5e662a5f0ee216613f
+DIST firefox-153.3.0esr-eu.xpi 486065 BLAKE2B 39a549bc45f115972fec10e89fb35e90fd5aacc2bd448cec5bf9e9473b8e4000f62b76255fae5d0766ca6335e6d1a1770c8fa20dd3cc388f6398d2c59b622fdd SHA512 d2d02db7aa1c079aa66917aa3742a0439f3ed052ad6cb22cfa4defb842e3663552e99bd35b576609508061d08e16c889eea01cc93a0e48c3b5dfc7bddf8cbe6b
+DIST firefox-153.3.0esr-fa.xpi 470119 BLAKE2B c8fc23f27997674d8fe47cc20e9801ef4e53b1b79a72751d59683b231a83c994819b9a087b798f9c26cbfd5b4156ef5aa517761649935929d472c919200ede41 SHA512 82b0c3f2e5b9bce2c68a302b7fd22e78f9ff8d02b6db228d244b0e76dd4a08f8b32399db291b4da666d6f5867a72886f2b65c000c34adbdad758b0952a19badb
+DIST firefox-153.3.0esr-ff.xpi 375197 BLAKE2B 5dac2a9567f285ee3635a62cf95595692d8b7938e1a29b246ae87db9e9b94a958516d59e0b2193ed07891297cfede57adacd80eed3c29c525e8ac04c2b0a7495 SHA512 2670222f4094a0d84a05a7bf9ca52c13f7de449c81eb32a5b567448d903faa2141448011c1f7b79fb902c4f96035b5215689806c4847ea181864f4c49a5ca4ac
+DIST firefox-153.3.0esr-fi.xpi 487360 BLAKE2B 4ffa4e755daa334a69f7f428d8f6bf12cbee8e26d41a0de0bcb9bc8594f2714546dc1bb7cd1eaa09167e6b9478395d802da5430013f657ab61c720bbb2820c73 SHA512 31aedcc43472cb2f9ab5375f85f1e160dc10a3dac6b23953732a7b68f7dca80f672fbc82495da1e6fab0ba38b6af8808176cf68fb42f23e5e4113fcae19b75b9
+DIST firefox-153.3.0esr-fr.xpi 513909 BLAKE2B 3e4a1b024bf600e7a64ab164a83c46a792d92e6aecee5d97180b60ef5259796a24dcf9410467ba443184d6765a94538cae58860c73554aa502d3b92561dc49e7 SHA512 e6bfb85ce0d87c44a312c0db0a8b4f49892946fffb907386e59c5492e7cf38496c2c17066cf0c1c49d9aa54a2c6e58e049831fd27903b365bb865d5edf1d60f2
+DIST firefox-153.3.0esr-fy-NL.xpi 495025 BLAKE2B f19258c40cb968c457b5e71565f6e42380e3c1303bf0e0426118b620469047bdb199bac86f76cd2fa73f4dd331acce1c21a5f5c802b48e00f8c281ad6e8c909b SHA512 0700803d32119b78d3440ee7b1621c4c171aff4ec4702dccd505342f40032690d9080879286e0573f5b98dcdfb57ac692be352e236c3b9180ff313ae5aa88791
+DIST firefox-153.3.0esr-ga-IE.xpi 386389 BLAKE2B 77dc50c9a0da441aed0d5845d2628ecc06517498e69c9e5d844598abb0f04cd70d81d8b3b3778cab0ab32a92d8b0e737b164bbaf5968407a7db1df909a80ff3b SHA512 a2c89a3f145c6f3c5022060eeec1dadec64d19b063309b968d3c24678b7fbc31a0a999694fbdfc10a6f4443152c90f3e3959286bd1f1c80151504587a8c8e921
+DIST firefox-153.3.0esr-gd.xpi 444732 BLAKE2B c8c07a584b85ec3cc64ac52f121a3e53586030be39b6dfabf3e06c78a2dd3f90c394a070a742f8394fb751912cc0b23b2468e6a32db598152387fd74a168ff5b SHA512 641ddf471cebe528a51098c8de19b32e87634e28e24fab413e83ff739b11e61e8b5a6c1aeb55c946b543a030f5bc62dac3c45cbf4d7f87680909fcba75fbadeb
+DIST firefox-153.3.0esr-gl.xpi 466593 BLAKE2B e567924d27cb0b8f1ebb2548b6a6a47f6181b36e03335b15d28ac434613e292458f7f68bf44ee0e7d5d7d8cb3ee977af0ef65fd8be2f00f3a35135cc8953fb51 SHA512 25585b5bd8630fdc445ac6e013ab58ce350b816dc3745c529e2ef928fdea1f2febd3dae4ea37bf13f51418e3f547d6bd63be68ca2ccf5b1df0a09e40bf97c2fc
+DIST firefox-153.3.0esr-gn.xpi 504531 BLAKE2B 482d409e63296d0cd5335f667cf74bd2acb2cfc8c42872640c6369f943d82bfb025d21e87076f422c7d001923e442aa59af77e823e0bf7ac309323d19824067c SHA512 075a8ab8a84501c136d3ca62bcb0e625e8be72cca25964a3fe38342a36f5923d8368736481226d89f4fd5e13c68f80fba031ac63c0b85959d8a4e0dd434db559
+DIST firefox-153.3.0esr-gu-IN.xpi 421844 BLAKE2B aa6da03cb0ee01233dafbfade777d90a2938c90ddd42d19bb73c0dc4ccc71f0e73194db1405f0e9f682898498adf3aae397ab62d52d3c8d3e757131528bcaf12 SHA512 7388aa1a38fb6262c72528633c3278e3bc2fae5b64dbfe694bed6b84161897f1a9a8e7890f9500136b410d8ec4ba04090feee719a5687a4b1f2b2d7b6ccaf7cf
+DIST firefox-153.3.0esr-he.xpi 510786 BLAKE2B 4f8a7f3b05ee9a63bf414616f32908d3d5472819dfa0ebc339b5f36c69d10a18c7562138d9c33ade3df9d9fe7455709cd556d49427c17d1c57f6774b21185f86 SHA512 471be466b4a215f2c9bbc47ca166c8ab02f3fbdaf46cd0c36f3e7bce9e651ff21d20adfa6b83f1d5c629cb7786e3e732e8f2d37f6a9727bdb8a60cf37728a05d
+DIST firefox-153.3.0esr-hi-IN.xpi 436543 BLAKE2B a6fbd9db743853cfff2847fe6c995280585280ac853a21945ce91ae85f2e833fc109e534fe69de35b6dd7eeaa8dcb36b48d3b2e40419561d255dd49f4b9d9b96 SHA512 3f98f662a1b9d845b3aa46090aeea1434e450ef2e2214bfdc9aecb9f3cadb2ae48132f1d113ed4895e69ffa07fbf926bd935b5c07786dd00eba3b9b233f5c714
+DIST firefox-153.3.0esr-hr.xpi 490913 BLAKE2B a286eabcd5a59275285df3685733c77fed32abe3c9411b1de266d0dbaa10087a757da30789ac2d80d5a8dca6ed9a8039e508f30d52da5e1be5a837ff064cc48f SHA512 6d3b9fd6aa446c7a6d4daf6be7e64414c2620e5b9478a688d63bb29d95823816b07b95d7317685aade1ae4e9bd14c5c88731343448ce07115716b9ed768a756b
+DIST firefox-153.3.0esr-hsb.xpi 519218 BLAKE2B 3e3b164ce3a4852a63afe91357ce076b2a3a24ea4419f0e3b7ab4f55d111e094e520e96ee116af96972c289eafc7868e893300362dd69be184bb48070c23fbce SHA512 3efbaebf4730e5473a625da713daed03f51805524e19c8630f2ad695280b8f32f3a7504244c0a52684fdcba6aea51b988efe24476d1d7d3889c3d61034d9ba82
+DIST firefox-153.3.0esr-hu.xpi 523515 BLAKE2B d5db01cf571bfeadf9dc73e60af4dd3fdc425ad60c17f2975767272cc1f0a1f17f02136b3ed364706f0512e649383a8e8bee1a694ee74cc684a82c87e0e53d4c SHA512 69d0bb53c87401e9c8fe03cc77d31d6cdd7a938d1c183c99a8ac2b2b78767b68470bff7756f01ca3c6cb28662be094290ae927119c265ac3dc949fae67aaf09d
+DIST firefox-153.3.0esr-hy-AM.xpi 530423 BLAKE2B 6ee4275f23fdf9f3db58cbaff2a7d6aa9925bf5aa51d7aa310f53710073ed74b4980210b79f5895bbbc7c4fd65bb56d26aba13efbe0ff341bfc64872ba16e43b SHA512 e4bd1e5ba893d72a525540d5d24e6a04d5baab2e5cf385c240e81c2fb83205cd374b1b73853302278e5200300b6b37d09c6b7cf62ea156601cf334a0b3afbad1
+DIST firefox-153.3.0esr-ia.xpi 481814 BLAKE2B 92ce21fc627675d8d83d66dd53228e0b1018c0a70e9333ef79c4df252dc4ac36c1fd9a6382ce5edb53dfed1dd9da284fda5ffc3b7195a7f7e1f155965d5fba87 SHA512 124f0a9958ec789d1895dd38697ac08e2255b836112d3469f78bf0b39525248ee6858c3c4be1abe6d5de028edae82a7cf4f039abdad531abd282e1b18ef6a5be
+DIST firefox-153.3.0esr-id.xpi 453535 BLAKE2B 74d5884f96b9f8a0edea2e48bcd7953b5d45db951f6c4b201b5cbd5074c5422f6b959ed30f1a0a6c881ce05523156b10c25d70e6f2d199df06137693b14e8d03 SHA512 0312675cdc3570d09c997246f6d44ac953e9a5851ce143c9c7c3d373efdd091613a576f2a93c465c5dc228da9b0d32939b7f5f104121ee299d88c26d42d50fbf
+DIST firefox-153.3.0esr-is.xpi 470190 BLAKE2B 79f5bcd7e9b005274f8806d601d63199da697db7e5991a9c5cfe9cc4116a83b25cbbfa240f3f505e2d882968fe618a0e4fc2e3b315b3495594757e5451a11d07 SHA512 d4ab28820bd002beef508d94ee76a246bc0cebaed3a6cc5f4980b5efd4018c52c63ce9308d7e7b89cc19c73e3363ef295f73e07431247b522e4ea17915d32fe7
+DIST firefox-153.3.0esr-it.xpi 494086 BLAKE2B 58a814ab5c97afb731b7da1ce521b228f5d9e119f33672a760e411fd71aafcde3449071d07c2ff16e41c4d4d90413efd4cc9b99498ab4cdca9efa1a4e6de404e SHA512 29e4b99643b71fb0cba53c817e832db68c66e46812b608af11bca408f4eb1f1351fddb95e6a1e766d762fef3fe63aae6df914ad09a30c7c8c13ebc7336d6a075
+DIST firefox-153.3.0esr-ja.xpi 538002 BLAKE2B 84a0b146a6cce3c3ba4108ef7c79e31c935988f66ca6fd0900981cd133a25a1ed56b1dc6290b7887718c96bec807225414820194d360633d8ed65e1798d95de4 SHA512 0236c3b49d2196c45166ee95cd9bf8a5af324da7c7b2dcea300e484a629b22884420efaeab70e48ef8871d03e2e0346efb7ff59c21ffa19f495a5310710c8357
+DIST firefox-153.3.0esr-ka.xpi 557898 BLAKE2B d6026fadff9735ba4c624745f6169bc031232ad8d0543966adf882a9740630ddcd257621d4a2de80a8a23b678ced96e62312308a4c56e9efaa95b4d602986e58 SHA512 bf17d8244c9f9565f4a4e2c466a86d50c5793c8c4fa36ebc45f187014f2489c6e1ecea50517e8c1243eab60727a2d91e72372363a2769e6be24bb2878edace7d
+DIST firefox-153.3.0esr-kab.xpi 454985 BLAKE2B ca28aed41073cd45cfd0e1b1b14459ab32caf6c7acf882eadc913707d6bfd4a248460efc4ee90d26cc8d7cec547e296910e5f043d8554f80e53c5c56f22802f5 SHA512 a380bc30f25236fdec9a40ca4bd8bb09e5414466c760d8201dc18b5edd0ef2c7f22c6f043c269304d8590b089d253488d56a5827d72d9f28b3dc9f05834b432c
+DIST firefox-153.3.0esr-kk.xpi 577024 BLAKE2B 49cdf74bd009075f276d2bc3880b48fd8ceb265c25f99e3f77c329c9af14978447c84f21aee9db315131e180043c371e8c380e947077258a966814cb617bb2c6 SHA512 51b0273135b89a1fe9092a256c79d8e7c7166b9b6feadda64c911cb6d10fbf9ed1519b02565beff993f625291cc577a58f37aee98d78a5c62e14a8abf817d303
+DIST firefox-153.3.0esr-km.xpi 441064 BLAKE2B 46c82abe9e2bd518f7b337ab1f9c08f351fabf29fa0aed7d645065f4effd06dfda80e27907fd2d5867a3c5854e635501f3eb3ae4679e8944ea3fc2fd70c550c5 SHA512 4f2a8d0ad7ff123b4ca60f9a784f2fda63c748a9ca65fa5471d95acd03906d5004f04e85a8cd1eb150e4a299574172154879b337518cbe59f308b41e61a2c52f
+DIST firefox-153.3.0esr-kn.xpi 404822 BLAKE2B d31881f9694b55f97f6c16fc1eb77642ef3b997a0431a62ae759767e506983616398e074e7526384e3cc4c2fd06e4a6b13a4d656bff37d5dcadc4ee126e3d380 SHA512 b09bcd5dfe3f3420ab8c9671284f56c82540a778e3e4e8febe727817e99135a78f38201595f28b65b3a487ddb6dd865853120c5ad05dd2a235fab2717869403f
+DIST firefox-153.3.0esr-ko.xpi 522215 BLAKE2B 89751b31664c45c5e25277e67ff238012a744b1e33931a9a252294198b42dfa8786e6384d4a41fb05142e365ba44107831d51366a0af1593a0f8b62919d9d57d SHA512 3beb085eaad3480d6cf8de53341fa05960aaf69b0f8ec6eec4a7c6de52914942ecafaeb8fde5754c4ad1f315b88502ec62a53fcf794a2e7af23296aafd44c184
+DIST firefox-153.3.0esr-lij.xpi 383791 BLAKE2B eb0490a46babf80c0e86e59fe3ed6f3629f1335cc3a9743ccdbccde76fd79ac9a4d94b172d82b25f82a1d5e21110056a3b9270581e666314ada5587ab5ed1fd5 SHA512 d6880f1b25675b0a21c0ff2dbdbe3467d324fc915f3cc3ea16599fce614ef0afc15f571c56fef5efe1ae03361446d986fbc1a6fed7538ac2e7b9325452e8a9fd
+DIST firefox-153.3.0esr-lt.xpi 424311 BLAKE2B e8ac8bdb09ab86c68bbc031b10bcae67274ba47e5a112d5a467c61275ee45992875545772d9f3e323d3e46f6f54983740ffb9cad42c37a1fa800cbc6bef8c3b0 SHA512 4d9c4b11cbefccfe20047028ef17f7e5da801f8db4d74cf00dc99d0e16845b91418deba2920d0fd82d67eb796abe85a3bd70b4a688b276a39df7f6df8dd88b0d
+DIST firefox-153.3.0esr-lv.xpi 446547 BLAKE2B ac12bd928e56efe00fed51c15155636687db3568be080afe58d21bb89433644b138e3f0c92b727c3a5818b65708633b4997f8e07ed4e7b9a699b1389dbbe1499 SHA512 48d88ce416e0d9d2bf6924dc097c41e5b5a31bc293eacba832e407321c22c0be40508a88a89462dbee4d11df5e75b663143a29b26bc5e39039c7be741235b10e
+DIST firefox-153.3.0esr-mk.xpi 433500 BLAKE2B 84b125f6b262552a57153f608713d8e5f730da10c883975c35a333829e61ac7b4f3553615a0dd3628b70639593d6728f85b57e7ede185831f1e77c54295a00cd SHA512 4b607014eeccff5b5a40c0cff3bb191443997767c0409048c450535b355ff4165722ca487c9d9e4da60b230d584efd1154bf687419cda8e80e2d4fe64c456b5f
+DIST firefox-153.3.0esr-mr.xpi 419488 BLAKE2B 1dd9ab8f90d7079b8d2a95d53858620250cad87b58b862c622a7eed4d1239c65a6e3e69dcd54d0fb1ca9b7825a9657f4427a30283cfe68c7241c6d173139c52a SHA512 a11cf79ff958b7e1befb810778e5735a9bd74d6005348c622839daf3ba053654cd2b400974e8401d3689cc69574dd10812f35e23b810539bcbf176340bf07a49
+DIST firefox-153.3.0esr-ms.xpi 376923 BLAKE2B 566f4dd0079032aa4aee0518f0d3312b8e69bae0046ec8e0a3348f01f42067878649523d2386c83ce685b8e7d03e1bc112b1de613f3b7463858803cb4b4938a3 SHA512 5f563c3429577faeada603c73f1abd8ac69df1fed85196fb2d6f5eac5b09697cec56b1d13ef4bfcfadb1ffdb4694efa090eae6445df2240b4ac9efd8abb37f5e
+DIST firefox-153.3.0esr-my.xpi 416127 BLAKE2B 8b38f7745eedb9be6ac7bf6a725d76eedfbdddb6c6a97e5b8919600e8dfc8044cc795b87c39eebb83482865dd0f5276c8fc5a8f7c79771914df28c5afa82c7c5 SHA512 df7b5de2528c4e07320c512bd9104c9a1ceb8c3f7a3fd5ac44c2fb91ab6c38f025fcad80e295d76c05c9fa5250556dddaf0fb93e278273110b38baec61d8d6bc
+DIST firefox-153.3.0esr-nb-NO.xpi 480797 BLAKE2B fe5c63ae0b0f24396092dde6c32da6a67aa63e2b9653062ff14dee3832402dba4f26d9721bafc6603bdb891c87d452094f284b854f7b7e54fd9cb5d59b663847 SHA512 a2448977b03fa63f053ba23f4233871526b7c7b96bef5a0c42d9cb420be49f1c647c6fa4c7d5cf38d15d2ad1d7c3d156a4c04185e68b369c93d0b679c4c88113
+DIST firefox-153.3.0esr-ne-NP.xpi 417394 BLAKE2B 1cbf82b83884696ecc016eedfd4014970c45bbf24dbffbda4e5fd4813822dce26b1576b6a07c87efe8d969c47c52ccc061df2c00d6c674b338d162de42a88551 SHA512 c37567557751be44d037410841ce2722c3101f9b226adef4ceb34227e019acbc3a5e80e2abc994c3b2b7badae10bf70b7a5373a58c1a14f1f7909e2c67030635
+DIST firefox-153.3.0esr-nl.xpi 488737 BLAKE2B 52344f8fcb70eca155d8cd1610df9105b1731498ce522f3700139382aff127e9a265d8bafbbfb10608616a4390297c18b2f096d563ed0fc4ae4ff2a7afde27dc SHA512 b4ef840dc8718cca4093e77c5e4cb721904bd4a4bfe7efa18b95f9dbe3c5bf353fe373944cc2774580947a8d0caa693b53cd1c0c21721abf7c25b7f29fa4a335
+DIST firefox-153.3.0esr-nn-NO.xpi 484308 BLAKE2B b0f44da70881f1fefa709677e1ab630f5151835893f3ecc2ae4a1ee4c1c9da99605cd13e05fbd24663d5d3154221f8bc4c9f86d94f2c07c0345bf9d9e8c28030 SHA512 ac53d9f225c17e0e7a143f339a4797dbb9b9435f479ffc3c23bc95f0fb1eca91f9240733733c749ca73782513f257f3a5aef1f1a7d1e5f54bd2b3e15c1e81267
+DIST firefox-153.3.0esr-oc.xpi 448022 BLAKE2B 1406b2613b5aae9199856ac5af0ca020c83240ffdf61412d655b948d83a4a77b19e81fd09148c4df878d83cf0b93db1ec2e2fad6b7069c3345c8da1dcf9e9bfb SHA512 d0040cdcc3922c1249779d5eec7e43e50c24b2994746623cc0ab6bf7e28ebbbd0765d98da58803f71984cad3b5d7e9c333821d403b9a6de8d729dbda807f389d
+DIST firefox-153.3.0esr-pa-IN.xpi 571728 BLAKE2B cfd7a93768fd120fe64ca57b3e068539c3fc933781d2ac3aff365ac7540f0134e16f4dc81b998627c2db7264e8ec375ef0d69814b902fb77786edc165d144a20 SHA512 1aba4f146afa610e832da7fd89770be9391c69b814d060453897b8b34dc0df124c9b71db094e603bb5ae1d748694edd33faec5d0b317143571860544043f2ed2
+DIST firefox-153.3.0esr-pl.xpi 520270 BLAKE2B 912c5b1b3075458076f75d779b0d3469404fa6631f64e7437e265f6bc71f5fe945b60abfe0363043de4e3602e23d7d815395a27a95125111c55266720dff341e SHA512 c949d815438af124eb7db084f4a4235552c8bed4673bb8cfd72337ed75a6e8b328e2cffce2b88fa6610ffe341abb98dd0eb0f058975f1e80c569b7d4b7d1f3c6
+DIST firefox-153.3.0esr-pt-BR.xpi 493483 BLAKE2B 72fbed87485779194d74968475f0a2bb318f594426767c764f4a0d27abd6223910c835e7bee84261a2ed671ed893c9af6f593ce9a6cf55142452efdf517a0507 SHA512 dfa5cc001ddb432d433e69454a8896d6be9f6ce2d89e72349d871259ec8718fafb0d08031440559c18c4230a7ad0719b7f519f188a16adc9d9433d7cef403f7c
+DIST firefox-153.3.0esr-pt-PT.xpi 496370 BLAKE2B 8f37e2b200c91410051024aabe3695c4366395d5c983ccadff8d78d7bc4741215e0c24ecb4125b1711002588c71875c033adf011beafdead5375a1587a5eb6dc SHA512 2b4b8fddec1bcbe1e7eba0b50332cc61fc0b86b997a9a99928cde114e9998565d51974e30f4cebb9e88ed3696911f2170388dc074cdee7e1e1670dc2ed56b4c1
+DIST firefox-153.3.0esr-rm.xpi 473901 BLAKE2B df1505bd184ec3cdfac5b50774035b9abce38485c39927f050d84f53df7ea33bdebaa032e1581e38d53b916c965e42d8b6be823106b49f68978f041a642b799a SHA512 73c5d5b3cea572f18a3acea6d4f6babf0e2645d852a4d6b52bb9166ebc8e5df3aaa2065aa9807ce1ec3cbed872602dc43102898d9f2d3f5805db36a83e126403
+DIST firefox-153.3.0esr-ro.xpi 507663 BLAKE2B 8cac3cadd6851b33a4616d34700e5d9fd485907ef94d2dd29df5c88be935950cbc2ca04dee1f6d320dfd516e3f07fa2419325f869571beba3376b953ee64f34e SHA512 eba8f2fedfea9f05c2eba78d79f289eaf3765a4673888b1d4510575fc286603948dc247f046f9890a5f53da19ccaed2d98a4ff630c25462b09aa44a812811769
+DIST firefox-153.3.0esr-ru.xpi 589739 BLAKE2B 31b5e694e941685170387b118e4d470ba770a8cf0273ef0ffb989684d9c0a325557a45ae23f70ffb9a10203d37d80ac9292fca41205b8d9409b46b878e7c125d SHA512 bf26f7b08c8053966f8c331b9166fc46c0a31b485e1413b4b91543786d9a32f0b769e2de29fe9818acd9c557a02caaa762a5e66ae5427513a9684b6fd6e92cf7
+DIST firefox-153.3.0esr-sco.xpi 387153 BLAKE2B 0dacb7491b95391dd4069bcac916cb9f9ef827fbb18cf5c18b13f9c8419dd0a2c573455ba136fda16b10f3f826b3880389741c5c697ac56748738d29c7bb0315 SHA512 c2112599645e76ac7165686bfcafa91825ab6a2e72776d18a689d2c8cc9b168fc8ab8b718237748b73aeae3d06b34e5426e017dd0d032a9f6106e0e000fb25d2
+DIST firefox-153.3.0esr-si.xpi 465594 BLAKE2B e6aa85eae47c52dcc59cfb3ed7003c7a9cbe3b3bd23b68f9be691e14caf9b04b8addb2904a208da264739c76d4bd1f3fcfed59245d9403a972d33b46de42a0df SHA512 9fa50f9e9310ef37de28b5c7980b68a4484d021c38d3d9b7d8923620c552b416c79dc4629d8f9341efc0ba3664e26509863aa3b4fe3a143c2cabdd735c26809e
+DIST firefox-153.3.0esr-sk.xpi 526450 BLAKE2B ba456403e41879f0381e1341811e9ddf7ac32241db55a9fbe91a04c8a19306f63ac2c25def0d08da03ecd79f453b9a51fa9cd98f04f666706e351288ffd307c4 SHA512 7033be59d159cdf0fd0a5c81cd32ec4f1164023c7542775869f879b1ba96456e7615ef524ad2e11326ac1a33f93a1515a38d7893d31d14a481bd833ef2d1d0bf
+DIST firefox-153.3.0esr-skr.xpi 513165 BLAKE2B 834c37e1f2bc30157829fe5c79f6fd0cd4a7c62df2b5407ff1abcf31df0997b5bb84249fd553a6cba458b43e74aefda70951eebbcead1e75211a9244f07130bf SHA512 c1f647dd36223bb4fa42f8a5f27936996a53243d8bd8b35541d3f3669d3ead2441abdd4218875dfdbdb4f066a7e3919884f1a88ba8ae86d95985b8b214f67356
+DIST firefox-153.3.0esr-sl.xpi 498004 BLAKE2B 21a59d4448041c19e4a5960073ed3488a5a6e7ef9cf3e860c1b294d59304bc44f5b7c3e38ac78fa7ab9408b60e0b49e980c6fdd2076c4c67a1b37753805c45cb SHA512 9731c2e50b79fdf33313ea69759c5549f62fedfa8dab87eefa5dbffb96eef4513f295da14a129892f8a43be65bbaa999fa31e0cc81c170a46e7af8cc40f8f80d
+DIST firefox-153.3.0esr-son.xpi 349734 BLAKE2B d7c9461cfca8eb209ac8e196d35dd5ac9996ac8dbeed5b0c223ae885c6d116f2c16f44b226c4d3b9cc3b1188607420e83034cf2385d29207a2f4f66a851d06d4 SHA512 3e14efc290fcd1347aa0d43fb3878952a2cc259078ece550bf20050053563e164a0725eb85c2939bf3902f79aa769745d3dee41f6599f23d5a2baf6719b1ae1c
+DIST firefox-153.3.0esr-sq.xpi 503774 BLAKE2B 1332e35193d00dd597706f241b7588eedef0dd7465eada35e71ecef8b05b7cb73f5a8800a509a85623dd8182f0cc0c17fefe13b110f16b546bec5ffcfef1a256 SHA512 01c9a6809715d082ec25687ce7e23307bf79d8cb254adaa1d278659445aac62c2a3ef543d9ca57c0743680a81b8e7b0a76c9331c409ab852c31e3735d15a8f55
+DIST firefox-153.3.0esr-sr.xpi 561301 BLAKE2B 1ee9bbab72107d3bff8c6c756d88652c019c621ac32cf0b8a61807d5a416427317350090b529ed0714e2097cb753c19b4ba5d57c6ba9b35bbb940fc4b740c7c0 SHA512 31f29415a17746165f7f3db0db6362354aa2e294e9b428a1b1c857f96d652dea6347f194603955753b86b62a1082f3e09ceab2c68d1d206c35ee1087911ab50a
+DIST firefox-153.3.0esr-sv-SE.xpi 488226 BLAKE2B d22b77a69e2e9ffe28aef71f3a6733d1464c482f2a5463606534030cd4a4dae341c0e1b5ed58f334525b2b5f67a73f04768e890477d45501dc4f122f266222d7 SHA512 a917a06d9d680a1cbea2137614a5f753728671a40eb47c3bf810cbc7dc79c30f717fa97049781906becd3d96d4c096ac85b89b61f11244a5d1bbc7f4930f2292
+DIST firefox-153.3.0esr-ta.xpi 407904 BLAKE2B d3f7347f84aca35b7e30db056b6a8e5c394e67ccb9eb8edc2290490ede13497184ec3afa670350f9552dbb5ad6ded1cc0e2cf5a074826e7053106a29791419f8 SHA512 c8b16a5cdfb3f6e0bf740bf0a11cdcceda863d7891c6bd70c7009fe1917b88da6332f095c8604dce64961861b6c3e2686414036aaeaa15a239c87af4da81e424
+DIST firefox-153.3.0esr-te.xpi 447101 BLAKE2B 39a0a23688040daa46c2a9cf86d8897bda90e0af15c40c89bb44dc0d7f7a34efb596813fa7acf788a817c0433893acd623af02f8312c6b881e681d3dc91df0cb SHA512 36511e17819ef6c8b756d6a4bc02eb81ce3d0fa5cf589db1e5614b15a7abb9d6d30b341e5159175c15d350b3e3c67b9482476ee86b298166949437c45448328f
+DIST firefox-153.3.0esr-th.xpi 565321 BLAKE2B 778a146065b7421c8bfa68ea44455bf1ef9923888f6b5874f03feaaf4d59db52b4f7bda58f02df07e577ee6dcaccb53cc04220c8cb250f72bc5bae3bf59ebcae SHA512 005c86d5016bd42842be29dece5a4c075eef6378b7c859361edc8f2d24998714188212a686f9daf1d03ee2708dea445694f1a53f279955aef62d4c078be7ec7e
+DIST firefox-153.3.0esr-tl.xpi 404043 BLAKE2B 25f93b72b6369427f5b05a6d31e6e9bb84c3964ae2cfb188dff16d8e0d77cfbc6b4516a0ac15360bbc395fc860da9332c8db2dabc81e031b807b21de3f3a0de0 SHA512 0c80bb4f2485c2b8500cdaa36c1875152755c16cadb5c480d2d5dc65233146ea07a1d221d9cce55b79d97859914df3e1cece3c2a7571a5d87e402987c7d106ba
+DIST firefox-153.3.0esr-tr.xpi 503091 BLAKE2B a96b950019a5ae1be5035095f34a170b0c7e547d7e386211aa184cea22469e67e3fe0cb6eccb3fdc5b8af8729555aa98ee176308c5cf367d0877f3a054b4503e SHA512 e6182a4b28b3c5fd8418c4b8d59776f73f88cae1ee8d36cc528b46b21eeb37066a1fbb0d4b3a98ae28063685beadbe2618df9164812217671616bb95c946960e
+DIST firefox-153.3.0esr-trs.xpi 394763 BLAKE2B 7ba54355df40fb9db081f8b6ba6f94e6bd1e8c696f68e7d22bdacd2759f11b80d42da0d79735fdadb50ec7dc04782a2cdcabb1298443435d6bdcea27c0694e94 SHA512 e98b988cd9a6d5e1d1d3b6386e94dcab3932aa85bbd652e31749cd48cc48c6404aa38ec117c1c6250e51dc8cc9403ac8be9d4c5463d85fe784f5e6221b6298ea
+DIST firefox-153.3.0esr-uk.xpi 575400 BLAKE2B eecb7961101c283955f5ea1fcb659bd36f98f3e7b48b919a76265ac227975477aca4932211be1e948148722694c4eae6427169a889b53f7ffa15939fef02c58b SHA512 901bba5e6e0ffa395e07987c4b0c6a5c4ced90dc2f2e7a765310bb3ae9c14b72c3e9783b6b6d7d4543ba99d37e0ccac5df13722befe7281f24fd717b21af82fd
+DIST firefox-153.3.0esr-ur.xpi 429265 BLAKE2B 253f35517fe8d99c0f7a61b05c4ddb02e04e0e4ca6588a97c179f6865fa863ffe3ce3533b2d324b8a2e7a93b4c226b2ea0037b873ec04990266058854eae679a SHA512 6d5ea1d9074810adb029e70237627c56c2b69c1702474675dea02882a55f1c5ce40475c2bc652042f99ff37c3091e12f47f28b50adac8bb41b203014e40f7816
+DIST firefox-153.3.0esr-uz.xpi 376279 BLAKE2B 34b14e375d84c1bf691ba8e8193facf8e611a4666046da07865235fb22fc2825815c57967c1e5e36a63c59d1eb015b40041e248a10934c7685d5e4297aa6443f SHA512 42cdb5e17c0ac4911ed3f2e2df582df19d38db2914ed06870c6602359b08aa01ea017632b6f63f707d2ee968f9ad1c7d291327379f9e7e3301a0e148dfa17d45
+DIST firefox-153.3.0esr-vi.xpi 527410 BLAKE2B 2fdf1e2d3a29077084d64b5db694f86366c2f891ef64f29882ce89805837c55a6a99a83a34d7000b3ff464627b4023d03a246bf4762ab2a8d9fbbe1b405197ba SHA512 e7e38e72a04abbd72c60ccb20ed61eeb826c6260e209445194cb61317da5d823ae09ece95e2dd1c7267081ca42a58ac761141b2b47757cd05f8fddc77725d62a
+DIST firefox-153.3.0esr-xh.xpi 355152 BLAKE2B bb56583fee4e46fa098033d176fbbb6a01ac02b0a1895b8fcedba40003951ed7ac165a5978d4ee55b56bbbe3db75ca92f7561bef2181ff3032da55c4233800e4 SHA512 f54f5dfc3af2aa75de0dc81a85c63a63022c1cddbcad6d285c358a2ab64ec78338ea86927244c0f331d23c96f34465e2f6b328da6f8261b8f52fc458ec3092b3
+DIST firefox-153.3.0esr-zh-CN.xpi 514286 BLAKE2B 8e7d7c17a4b9721d941e28db3c85188805034a81f3998a5887f51e3028620a5b5cd7dad42842dfd797885d91553c2644f165be42c50bb089be9d5ea99c48e3d1 SHA512 7b4d978e388177d7e1183db7507f756beae3eb05e14ebe6d3a3af876d123861b1954d83b9e0e7a043f6642cadd198ce2693a7edfc9272cac466e137a8d7b1e8f
+DIST firefox-153.3.0esr-zh-TW.xpi 518963 BLAKE2B c418dadab092e69fab9881d83fee9fa644baf7ece075ecb503849fdbb53d091c74fe4a74a07b78385aa448fc50e10bde8f5cc96c384c66feee668d4b7eb458e9 SHA512 33d46693bd165b61cbfb05becad941f977c00d8b0e8013a95cc29792a5209f329c1321b4e2a67f045683393a96cc54720e79fe1d162d31cd69cd3e3f6c142a21
 DIST firefox-155.0-ach.xpi 368807 BLAKE2B 8d1f6af5034a7214d8bddc59360a297c2f6da320e2a35891182ce7c23361ff3307c4dfecc0ba336806fc0772bc86be5124e92b6bc8541756ce5a4931f7036748 SHA512 e386a08f858480fb1122a0d39a43b7a2e812614ea6da05b07d6611098469d649036df70efd8306d339de97671e69aa88f5b5dfa4b4a8d89547ec5e9c5261ea3f
 DIST firefox-155.0-af.xpi 355024 BLAKE2B 1bf0c0953888ea402fdd7c81026fe8628b38d0aa0a96641f6f2736c40c752ea36a7340e3efeb265ee7816edab800299e80c5130e153b2ad59940161ec3f48fd2 SHA512 be1d7e85e6189e6ff6738b7e084a6a4f8d70787277a9e2dd7688c1caa4d2815222ea229196298ecf823af2d97fdff6b1353c62916771e686f4b374d788e4412b
 DIST firefox-155.0-an.xpi 397598 BLAKE2B 153418e965ee0540c20e1729cd707a5dd622a7a6cdac3bd9a092ba561a36a0bd682509301df2916891c83117513e6f137ac21e9d9cee98007435882a3a957e9f SHA512 46b6212ab862fe7c0d1551c76533f9692a4a667a505c73b9bf1e5880f560d44f12c0b138032ab6bd26ed58b23f4ac3b7d9795a13e412ea900f2665fba85b5f98
@@ -386,12 +483,113 @@ DIST firefox-155.0.1-vi.xpi 547935 BLAKE2B 61bb455a62fe6f47e74cd44632498d3ceaf41
 DIST firefox-155.0.1-xh.xpi 360264 BLAKE2B 7e9946dcaafc599ed1e810db8036651aa4aed98425fe5a615a5669eaa99b0f884df7659b8b7e4c1fe62ef12049be1142efe9b6197fb3cc6a8402d72d880c29f3 SHA512 f1501f619d9f2b962b1b7f189d52c5259d31f8476cd80a83bc982f54ad45075f60d28bd7979fad6f90fe8d95eaec23de578de9ba031b7ce9e9f595842eaff9aa
 DIST firefox-155.0.1-zh-CN.xpi 533213 BLAKE2B 4f509855878f406d891a52435cd82d3a4692b93cafd1aee76188382fc68e7bc96b4e7e396e82697b6e73eed2727cc4a22d3adc8c1144504788cc3be9b6b315e1 SHA512 0254ea3dcb87bd51fdc6446e15985101984985de26a16b3ad60b69becc885660d1f8a8cde783d0f4eec49d9b75197c7eb135405c2c9a88d9b329ea25868cb0a2
 DIST firefox-155.0.1-zh-TW.xpi 539312 BLAKE2B 070182136cac1bc6e7d27524eb6ae439682c87d149a17727a48f56ef7d7362d47f5b9cb9b1c0dc6cdfa0a87c298686e3a72fbb89fd91bc605eb941aa1d8db473 SHA512 5ca9738a71c97cf5d7538ecd4052d5ec3488bf410a1e36abc6843d1098961744967ceb413cc26a0b8ba12fadba694679c1b0a1b3c303383ee20a8f96e651726c
+DIST firefox-156.0-ach.xpi 371199 BLAKE2B 487a0a026c7f4c9b2ae5a90cca9623e32692722f8283f86a5e0cd68255e57be5820ac3a78c5f0c8259c68d2034e0d0a66fe75c0bf7e1b311709b10cc38f2a904 SHA512 628077283a37ae8f764ba373c2f60bbdb749f867230aaae1040a97f8a43f4a2c7f7d993ef539d013b8b6bdcebdac2683dd9be034766f9e34733bf6012bc391d4
+DIST firefox-156.0-af.xpi 357416 BLAKE2B 13165df29ab56b34a20eac5f20d4b815f9fd80ebf4838807dd444be09a3c6884e7b069fa0f7c35f69213f69e651146bf09d9ca57a370775bd224fcae662f5c93 SHA512 735e52d63f84037ecae2043481eec725e3467ce58cca5c74a97fe2fbb8696bd134ce8c221a564b0bfe52945447deddc7536856e43b229538624ff3aa26228b8f
+DIST firefox-156.0-an.xpi 400004 BLAKE2B a30fe48bd33fb97792dd9ecf41ac07f76c5010665713ae4b379a787b87c16ed7f64d33ac770050e6bb8e0852a36840d2587c1d73a74e1b14b6880b8f8709e70a SHA512 16fca1b3d5755e6d5a6adeaa23a3b078e78f5d5f7866dd167f2c95fd0fcc69813bb78cecf081a179aac34bc7a11eb8b177bb5404f4b019bdb359d5f815e48338
+DIST firefox-156.0-ar.xpi 545263 BLAKE2B 3476535243902c1f314d3d3caadcff56bfb0477fdbb276cebbbc6eabb6cf5e31a7d8e327bdf8b6e32af84e17f700c7862575554ab8bf01d9fee4386ccfe6727e SHA512 725e698c0432513fd00acd3c4a22e8cf890d29f882361eb530eeef540d8ca800204c9c7c56661d8d8e5d06f1198b552e9d26c2518f58a6bda8aa6c2282732dd1
+DIST firefox-156.0-ast.xpi 394994 BLAKE2B c9932eb0e62c3f821e694ac2aef21d1dde2bce4feb6338cb2bb27c0e9eb5acf059a821924dabe4dd8a66c6226f0d6efa983a2342f6d807b32baf1f227ea33e4f SHA512 2f09bd5c6ee00bd589fa7e0b7a50734aab3b9f61ebac34a0194c37b75e174077cd675f4c14c70ad66884484edd9c68e8424df5dd399aee5bd0b179376a417007
+DIST firefox-156.0-az.xpi 411675 BLAKE2B a3d991694ecc05df7ca9e77c3ab0899ce41e0c6e810900179e20ff996a2fc50a5786de3dc8d881c419ca85ab70e2390a1681144dbc8d9a574b652970c878903a SHA512 e373c35e981394241030752892cf508d2dba143d05a989a3fc7ed0ee7a9b73f47463cda831ed1f0f02b5eb15daa877865da03457fe5052479d9ed32650fd5613
+DIST firefox-156.0-be.xpi 613960 BLAKE2B 1824f39ddb78553c1a0d63e44531ec4f68dbd8fdfa5b4d69d293ca230dd6053975de4e95f773ba38b003aee662cb683b133b3661bbb351a39e5a9cc136b4d29b SHA512 9c6088ad20338c6e04fbf3c923a825acfdb17c0b6ee0462fa09517bc4f2427a1bf88ef9c657e3bfa26c9954f27a29031f263284ad587a9590f1e30e161efdd74
+DIST firefox-156.0-bg.xpi 522248 BLAKE2B 65a2667620a80432b425b7d4a5f226a36cefcb66715215d4744e034d14b2a863cfecb2f5a1114bff94dbca316b40b74c94e461d84f55c6e6d9a92531433f0417 SHA512 464a8ec781b73299242e83c03715ae00fd256c651c4c4f27dc25af3e15dcf636062fd5c8d0f48fc1c289ca58fc3b48ae6631a2dae93ddfe7d96cee1b2ad6f253
+DIST firefox-156.0-bn.xpi 471076 BLAKE2B d50b866ac0d3bd045a467ab4a105ed6cd6939ca9d96041ab5571b3cc9e539057fb7b77b7b59c15cbcec95b961de9f2ae41006d31e3d837aa708c7e2ecfd742ef SHA512 1c52a1b7c18d4e90a65eed9e032fa4f1865a36c85b269560aa609cb25d6fc5481637c245dd831ec2fd0ff6cfa4a01cee80ad97794a4faed3bd62d7513dc12a83
+DIST firefox-156.0-br.xpi 442881 BLAKE2B fb58458adcdcd59b95d698ba1697040f27912f48f8b3efd68c3e6fa44b638ebcdf74e4adf2cbd8e742a227f32113ef41c0fb7eb5a7c4d1d13493a790200dca34 SHA512 cb4ae980e899ef8b7396166efdd2364ac08d7c7d8575850102b37eeadedce023af68889d84a36fda140701ca7265df50eac5caa4bbb70027d65336dc445d8910
+DIST firefox-156.0-bs.xpi 477184 BLAKE2B 2aabce4da6d29ec9287f971d3aa8a6dccb0aaa473d1b69f98af4a92923b68bf9bfb718f5fb5312dd93af0f7eadab43b84192e532d44e38874f583e376dbe885b SHA512 4138386ba54d0a28da637bb48868a51bc80b2a656715b244febedae06c459fdc1571fb57e0bf62808c3f0ffe1414d020b6062eabdd94fba24ec460094ccb5a81
+DIST firefox-156.0-ca-valencia.xpi 420707 BLAKE2B 7d3e8f0119ece43489ecf7c5d366667feec0eb3c8caf1da69be44b01d6ebbf3ce3f90ded42088374e53de5bcc30d0f74df1ec3b952b4dee119e8ea2126736613 SHA512 57a8e9e4d3aecfc9601e7ebfb1a5dc04675cb1a5835ae0cdd78782c96b2d60736d28f1bf65e171d49237e5cff4842471c1a83f307857823fa51dec42d5f559f5
+DIST firefox-156.0-ca.xpi 502363 BLAKE2B 55f3d4f1d5bb7af6700b82189b37cbbe7b3a0f6355b0c70d181186ad659ebc936d0172be625200f401a1b285c809c98da6dfa8ba2df157a9f39a9ab070f41371 SHA512 553a6379ee3f2c96f28286de1cd36aef96e4a48915c88b465f8b94ca8350dcd4038b7c3d172627e286fc16dd5ff5126123c11cee5c6eccbf3b82b174d178f0ad
+DIST firefox-156.0-cak.xpi 445409 BLAKE2B 5409270467ea3dd60a421dd7c24d6b02016a0839e09c2ce3ade0d72a8d988292e66f2bbf1dcc057e13185c5a53d13a95b08953974bc09cda5b47ff2d8888c383 SHA512 f9c811e24f00764c7d2e5f49a098798e841f771b868ecd0a571a0d5e100c795931a17b577392d7ad27babb3a550cefad31e1f8d1bcf669fb0f3b130c866e4312
+DIST firefox-156.0-cs.xpi 562395 BLAKE2B 43dbf02a95eda2088e134fa3e0588ec3e77ae3a387d4d6da96e9b4725a4dc3e7e4b1f61a5ac0026034ed0b27c44dc95cb031b8734586c1c9bdced100fe94e16d SHA512 6804873fd11e658c7d7aed5ab71f8df524920ff675973055648f2f48d2c446aba32ff24ef1d0e72dff8b33f0ce5c973d0e8f4ddc096c83299be64ec7041321e1
+DIST firefox-156.0-cy.xpi 520043 BLAKE2B d139a7619a36aebf95aeb7d6c333bdb5dc02cc717ab4368a6a50312de2e9d84310bbc3a48ccbecebea140cc5cd0216c42dd1996cdf372d1c08d424f58f3f96bc SHA512 33e15b11fd8ca9f13431d512e470a0639c07bd763367a37c44d4349e2ccb3bf6254c2d50967c67f3c2250905a07e09c67947798f54507e02fbd90d94210c3c8b
+DIST firefox-156.0-da.xpi 491164 BLAKE2B 449da7063f68f485c697b0b6cb97e0005c4de8bae59a5a2600ecb33ba6f03e28fca14761ac8f791d91d58046dd50c562481d2bfbd70e96a52059ac4e80c9a7e6 SHA512 764f8f200f1eafd1058a56b3c528c9b1409a30c69ed80afb5f5b30794f77b71e469685b86fac382be3cd3e2722e2eacb26edffd4c2e3b72088925c50c7fa8b46
+DIST firefox-156.0-de.xpi 531748 BLAKE2B 71c8ceb259cc5d18c76634057214e9a605e2340a4792004825ec1bbe30c1308e6f9fb2339cc014054791a7903ad22c88ab88b702d6434279db8cf5b12fd154a3 SHA512 7ee6f664577872aa09b8d97abe412a1df9c13cdd028340342ec8235c19fe6e4fed53dee2b73b30d366b2a84fab2e017b93d54c6de5386a18b1f0a11b0453e0ab
+DIST firefox-156.0-dsb.xpi 547083 BLAKE2B 87870af4226a8e9cafe8620394d7ad251cb66edfd2518df1b9d3ed656bf9115667768b79110205ebf90c4465e699143a31055b07490a48fe3bc12cdd51610047 SHA512 2fd73237d36d65ebcf68ec45cfc408dfa10966d6293c547b6c334ce91f8df7635799a9b63d07938c7a35d2b214ee482e9e2504609dbcac8908e0fe05e6e2703f
+DIST firefox-156.0-el.xpi 630953 BLAKE2B 72879f0598f0b780f1de8225ca4fa5feb8eb34b2cbd3217767ea912346205b0d78f006e7b2140869f11c2855285e266b2361da9fbb3997ae008ac409f9a977c5 SHA512 cd4520bcede76d50ecfa327bd483d4b8ab6c7d4a2e7a880fdc470ae8984ba53efcab15df775370d2a9837c028f96c95c16e8df384ec0a8789c93a95857f29e22
+DIST firefox-156.0-en-CA.xpi 479495 BLAKE2B 937ab35af1f0a877393ec41dad587df99e1b2523fde2dfcad2eaff4bc73d76673a2864b0c1b0c8f96e588fc3672a73b8c0c9f736498d73ca56f240beea50c868 SHA512 aa80802b97262295b0ac1dd6d17be141eca205a991ae9f904a4835075b0054d20339ecee777943e64405cee37b1a31dea6c662d000ec17cfb57232747627758d
+DIST firefox-156.0-en-GB.xpi 480250 BLAKE2B 74dd0be80979ed3ff49f43459ee093520011ada77f0459c12e9570815c9062819e714e4edd273d235324dc98de3debeaff79c0fbcf707371bfdf5b7b4d303129 SHA512 36557cd4a97219ff25cce1c259a2bea37ef982871bb23f504805d1a02911138c41284726189cc8f83af6a7c3b0daa3b62f99c90198add8b76fe4044fb26e2bfc
+DIST firefox-156.0-eo.xpi 507133 BLAKE2B a69b524e427eccbb6cc767985dc44048acb7bb95d7f582d5a917c7d5b7d52d4d89d4bbe3d8aa50699fdc1f884c94437942d0499364a4f9d0be3a774e5b4d90d4 SHA512 62cab6b3367f67fc191da4f80de92f9218444850d9ef0c15723ac80b9a58de7806f0d83d69178f976569b8c308440d21ccabf2aad65aa9b0137781413c0ecf6b
+DIST firefox-156.0-es-AR.xpi 520969 BLAKE2B d840522ba69936c57b782ec630eb3d7cea1a6917c250c3858b4c9bf069753d7b9006b7e2022e4cb1b6efda820cc3a160b2a61b572534ca5874cc3b3a0fbd98f8 SHA512 c7262f7a9b08a40d2027900f80cc7f570b7ec8502c19c949eef6a9c07dc18a75e6fb34dc823846968b5b3ef53a16aa6dccbf0a4a143bd26fece2c2e945a7ee60
+DIST firefox-156.0-es-CL.xpi 523361 BLAKE2B cbe225a08da14e183640581e1da532ee2a747e257699226d6f6018565c7cf06737b54349f38448f60c0e201545f67a7af2e635e7497edf99845f58b2d2feeb0f SHA512 7caaaa64a36c2990af42088d11386e91cfa38c48f3cab60b8538f6b7f8e56c14b1f2bac88a7d1d5bff7d44057732675530bacbcb84a4921c799fba980435ef07
+DIST firefox-156.0-es-ES.xpi 511130 BLAKE2B d64d0a5e45e7aad3f244060ba1d83dac330d6379db99f4c2f8965439905a7bbe13ebcccb43da705151038b28eeda1a283ec9a8f0148191d04d858475b5c88454 SHA512 f0eaceba8e3b0f680a04a9afd6c100b277c98c06157cce5476b1af76a8bca53f9e4d8bf7261e3ff845167cb0bf9e33992304ce8afaaa8aeb3c98e1713b1998dd
+DIST firefox-156.0-es-MX.xpi 521219 BLAKE2B 5cb4c41083cdc118d3f1bd597748a5bc01205938dbbb8007100f03f4d42dfeb1dac99c096d6cc1056fe08536e4cba4e033a948dc1826a1454975bdaf30fc62d9 SHA512 feabea574a036623ddba51410784c440f4013f90c367162c90091fcb548f0d0ef2e56c2a25822630b739a52926b3f43d7e3793aa9ab4f5a17e4b4204e3d2d458
+DIST firefox-156.0-et.xpi 410226 BLAKE2B 0cd5089b26985ff0426b9eee3458aca61d7a6d9757b8e9679edb111ef42b6b1f959e06c0cd688598d3d46617901b12511c259e44e039b82801a87fd45f227f92 SHA512 e0538b446a18f27baacac5095e86ddf591ae94e5f7666b04231e560ebe8ade489aafd2baef4c9cae25b8078bee12973f4654708601d2dd881399b878af016608
+DIST firefox-156.0-eu.xpi 505930 BLAKE2B 919ebca65d123cf85d3ac975d8f8fe9325306108dbb9a42c54c6ae14f8a3f8fe0be7cc146829ddbb47bbe5f7c443c7b059de27cb2d162f141b992ed18daf0f67 SHA512 ce3889f06770340e6250525bce762026280e85e44f68c7f6de7fd69adb2196ef81853463d2f8d544cf9e6725790034cfb8327504bb8eb2697029973cd1dac4f4
+DIST firefox-156.0-fa.xpi 477674 BLAKE2B 599013a640e9cdae89f63683027a9d15b938fb93e5d1384269c42728e712ae7ad1b9ef2e76691e9780af9fd2d4016d3ca082a805650ec3c73add8a0f6fe9ff42 SHA512 166ad3e29ad966dab625065cefae1248b715911c0b62cb48c400f25f30e6a0a55fcea2d1e5e5cc2ce77131d602986defc2c18111db54f6b3fa9605f70b2876b3
+DIST firefox-156.0-ff.xpi 382752 BLAKE2B dbeabd1b06ec0b122e34ddce71e77dbcd2b345cbefe735952191ef9cc1982e4ee31c4ddf41078cbb94c92bdc0c3061bfc74f9d976b102064b1eb99251df2f46f SHA512 99802490e487b408bf4491b1ec68468830671fd679a49c24f0f4dade827ec2597eeb393e42cee18b6027a399daf43c765aa1620aed07e69c56c4f6d398d0185f
+DIST firefox-156.0-fi.xpi 510180 BLAKE2B a83be8e5488aac045be0abee8694e712858e501abe0d34e5a2c8b59ce531d804ed6cc27320d67afa563c5867007d521df8238f5332c3abb410ff76ae3ad93c3e SHA512 2d2008887d3f6d89f78f2199ad6c6db6058fb5766b2c6ace70861e43b1d829efa209e97bc459475468fe1149fcda2c2ca4dfde83281ead54d366ff0615890290
+DIST firefox-156.0-fr.xpi 538109 BLAKE2B 8dba29a73d331e87276c50eab2ff53ab6c9b60bda0eaef920dd867a139281d396bf08a77effb49b123f10dcbcdb721e4735f909b4da70f1ffb6909cd652c74df SHA512 d4d0e8f650e650d63837f0fb751d1cf6c21322f27b5ce5f13c1720b5830ba839ef2ea26769e1baacfc11ee14073e04a29df819c3c24d0a3d48a7cf7324a47d22
+DIST firefox-156.0-fy-NL.xpi 516878 BLAKE2B adf410f2fb30873481335bb52313401362e9bb1a7e35e44272dd605e38c9fd6bbe4a63b847b6b96e6bcecc372509e52d65fa9d5a36dddf9b35ab78a59003c29c SHA512 b17443fe59b17d15281d0c4b5099f98ed0976fdee0e67c12df1071671d71ed0387f44dada1d924599f2ce0adb833ed4abcc60133dbb38b01c638585927f9997f
+DIST firefox-156.0-ga-IE.xpi 394629 BLAKE2B d8a5cbe21d9b67b87ecd9e3ae0928c271331b59dd5028929a448cced2c554a3a219409f8a860fc851feabb5cb17f9ced8ae8e8ecc8117253e050b3b75722d861 SHA512 366f3778864ea76cfdc374b386c209d9208fab68d66b0ca45f1608ab85c4a26d9cb41da10bba54bd959af388b8b17217590da87239d8b720228e85e68702dd7c
+DIST firefox-156.0-gd.xpi 451730 BLAKE2B a1428c43e3da3c57c33279562e29586d7b7b0d42d4eacd0927874c1a15383614781da34206f47022b6e9207731cad0422143ceb28d21a0a010f8f122a26a7422 SHA512 5023531dee556cc3c4a3331cab0c34b4132e8f4c8290dd8c318ee583a847d8f6b872e610cd912240079892d61f9943d07c888723ee328a243637d3e2f482fad2
+DIST firefox-156.0-gl.xpi 473490 BLAKE2B d01d46c28f768ab76831fabaaefb6e027dde40455493962f046b229cf89dafd2330175c1bb6c7ddba800a29b1d0ba140ae41bccb001a834e6c4abde40630c2f4 SHA512 b32fbc97ef152dab0fd5bbe5a551f90fb619b42276c79a68489fca6c141ef7d1e93a47b80e5ecb31fca532a3ebd486b46415d490a4e5e5ec81d3e6f65a0f504f
+DIST firefox-156.0-gn.xpi 526015 BLAKE2B 552abadf38805064cf922793fb9d13969803b3eff49fde4e3bec15887c7211b2761f0da9f77fd3e80f3beb5a664230da5f0294de78c355cde51cc7cc682009e0 SHA512 feb1318f4544850104e001aae6783885add2b9a06163e5fc7ee60200a90818b09c0305cba6f0baaf6b5df1bbac368514994a271bbef62c614ac778308d03c36e
+DIST firefox-156.0-gu-IN.xpi 430044 BLAKE2B 36c7605dcf825a6e2539cd20c4c7810864e1b7ef0009d3f1bb952b350b18f143b93a267813039ccc8ffb7a29569d31f9e1fdffc5475f1041d94adaae13acfdbf SHA512 191aad22d3a75dea86d2c7bb98c809bfc7372084ce0f426afd29cea3e675ebe54455df12b4349b696ffdf19995760b4215df6fe38f6496bf29ba6df30df81b81
+DIST firefox-156.0-he.xpi 534626 BLAKE2B d30da071b005960d559dd574a795b35347c234d7e528c86c96a050b53e7ab5c0b2ebfa389b98b312dd790d0198f3f62eb4e71814e4343b63f853b2a77711cdc7 SHA512 7e0c6ecf5e77acfbf5ce63a52e021f52b104c007e2ad6dbfd5fab209abe67b5cc3d39706be60cfe7e93f7e45ba9fd77f1b29d958ea2837e77c2575a58f671a1f
+DIST firefox-156.0-hi-IN.xpi 444482 BLAKE2B 237958d80fcc62172664c4605d002eb9a68ca3a4d27be8267862ab454e56c60a158c18fc2f31f7c48ec85dd2c16ed39149536c29780f1f2d4ba33f95ebd2c238 SHA512 ddc8f86ff4853356d5d1b0131b484e19828e655b1ef9d165ac4162134386bce7d49d03138a340345b18b5fda45ff78242bb9891952d34462c09f037437392849
+DIST firefox-156.0-hr.xpi 499953 BLAKE2B 00ddfa4bd769fdb35dbb470072ac401ac36e6a15693854b13a3b6cffcbd9d43a7444f2c44abc0986300b31294b508ec2894ea0e6db452200e145c3e96c521caf SHA512 0418002372262f802778e2b1c38a24db248999a96549db6320b65c976dd78f577c5daec4f23ba129874100a1ed1e2f78c9917ae29d3f3104ae72057c7994126c
+DIST firefox-156.0-hsb.xpi 543506 BLAKE2B 46f9b96e78dfaba971a8c6dc0084465e673cc40d99253ec3bdcec5116c8643c9def3c959e94b72e98d00f6e87737475ac346a99b21b802a997c91491bb5b7c16 SHA512 d1a7b9b6546f29fb2e5905ad467ccab75fbea2acf5c6d2243aa245179f9b80b6cbd038a9157376c35a92bdf145f0929196c3e39e367473d1bfe20ae8db8ac5da
+DIST firefox-156.0-hu.xpi 547579 BLAKE2B 33d9e1e98fda571f148d6283e44e22361e515bc1090d3e42e52a84586db14652bfd405dc3eb43d7b8e0a8c0d6418132c877205fa533707a25fb079a3e049c554 SHA512 040e5de06d4926b3cada4f342a10fd228b3b179b3e4e675019fb7e69fd6a948827a256683932ef03b086247c3a673ba2cfc58d04525c69eb653c2994d511938d
+DIST firefox-156.0-hy-AM.xpi 548304 BLAKE2B 9a42a2247ffd5654a52affd7ad40c70e4b774dca55c7799e100ae857aa6eaa7de51cf1beee18e9804a02be76dba877488ed4997f0930b9317c76542b8570106f SHA512 5ef3573418d0173165fceda25a58dd82bbc72934a9376d819d5fb904061779616f7f7de83012495c1a5f2b2f094d2a2a281defcf058a764f44ee80223b1f8c99
+DIST firefox-156.0-ia.xpi 503738 BLAKE2B fb9f8672b242a96cace62edbc74d373ab115d14ae18903b50b1fb76e8bf1dc8889de875ff476ba4136ef64e22c7a7fc27064f12d2e2ea7af085e7d31539527c8 SHA512 0c83b6129567ca7a8a191e3e51eaa6e0083658d3ee7f567954800701fa4b7d1668211cee721515f5b6a460edfe24b219568729107a5575dceac6f4f4f64ff213
+DIST firefox-156.0-id.xpi 466176 BLAKE2B 1002879137e2c037584e9144247828557a9a13e5764d9566a8583161f642c47c9ab4be2d23843de9a607daa9eb6f5d19b0e89ae17691b2aeb9ae27af97b71212 SHA512 51debe59091dc3d4f06969ef08cbd9eac564f6336d0e6512911eaacd6aedbc968a60afbeb41270979345e204bf0a1dec4c36d025f635ee44c04550ca98357542
+DIST firefox-156.0-is.xpi 477010 BLAKE2B df5efc182f04b3b50c32565e0bcf511435cbe1578d6fff79dd5ba4496f57ec9568569a7164016ee7035525e8d5f2944c095829f8d0fc6a3f698e29c66fc1daa7 SHA512 6b55de567c6ad2e7d25a3b59b969146415276ecdce84cdcee7ab373b7fb6247b34ad7e0b82d90aa1974c20beb35384d7a3f6fadc0c1193fa41123caf1b59cdff
+DIST firefox-156.0-it.xpi 516945 BLAKE2B 9f041f56ee237763f80227d3583a1bf913c154c16e13a59dc7fb1b2a2550d9085cff2c9628e201896ec997f48c9364e3080df65a552372de8d404569ebb79f08 SHA512 5d1bdd23cf6cfd7e11114674a6c77b365be2be95aba08d5cb872e0a4dd170bc8428d074a00699156b638d7ef2ba3d7c2783bd171b7b53b6463ef13f6acc73ab0
+DIST firefox-156.0-ja.xpi 563509 BLAKE2B 78222286c7d4ee40a0d279b8b2cf29953d665580912cf6fe616f95e48fdd29a7f04d0c0cd45f502de380a3a10cbe87586356cb8c2ec29651356d050f47daa0a1 SHA512 af4f50021f51a9a84eb270770e8fdd87552422f5220362753bbf99a336bc4547aa18950fad95e51b5ecc0bcbc2a082734359dc881c9c6f255b2c4f9f6561392a
+DIST firefox-156.0-ka.xpi 578072 BLAKE2B 1836063680cb6505c857ab57925daadd2c01622b49a04c59302b6b3630da8300b97faf24e34398c7db9eb5d14aad7e76fbdbd6767c0c16db9e129349132ef42a SHA512 4cd0c9c7a35c779f967f688b2422b83bdc533ec7627e4711e72b9d291b5dce66f9d96e1487c7589fea2fb11055ab5c8b9ce009d313a687c1eb9846d508c786e4
+DIST firefox-156.0-kab.xpi 463131 BLAKE2B 2c307bdc8621c631b3ecee758ab2ffe12d8eddec986520f02ad44b324242e777b82d485dc4fe325f69ccc8e69918303861c89d7f53717672e44362e18334e336 SHA512 a96f4ec806177b3fa08ae27e65521a06410da0f0120a7845f710b79c14892bcf74f0d0af7fe4a04ece9f943a754a62265f6f37d3833a9f4a0569700cfb2ed59f
+DIST firefox-156.0-kk.xpi 604589 BLAKE2B 6a9e9905befece92d23ab8fe393d1f608f467342e8f0ff0ed8242c25a5353e54909e8b3c79f6c72557230023fe0e12af8371c769ee8d1d3f162358ff88fd163d SHA512 e1ff117b6ecb38e0274dc31213b26cebe96b06686282e5e3e3a43d29fe4252962ca0ab23333ca64d56ac66f9efbeae5d834b4d5e93d011f15d7fba3f50df1506
+DIST firefox-156.0-km.xpi 448637 BLAKE2B 6e989ca8fb012b5b78298f09c0cb5fada1c4af739244f2530a3a92117718a30e69ba3fa8c081c0854d893a8d014aa030913e0a40a20f024a7bba6c12328f5d12 SHA512 c06734c5bbb8e8a6ffbfec26d6c2c0c36e675ea84376bac59191f4ca4306d9e5e207ca1f7708501f6232bb08bb61100dcc412fb16cc21d4ecb4cd0a9290f6906
+DIST firefox-156.0-kn.xpi 412871 BLAKE2B 643e9925b3eba1f21eb785530146de519ff19c4f733f3ba82529442fcae73b5ca569faccad033851fc1352c3655d05aed041eabf78a9ed7b9886acfd8d08cd79 SHA512 3ff51b092605ebe279a0351c3eff3ef1600046072cb0e41b02be6e95a338e8133d245f1bcc0d1be6c0b3eef04e6085bbbfbde8002a25050dc2e8d32fd1fdfe17
+DIST firefox-156.0-ko.xpi 546731 BLAKE2B 9da9ff28377ca8a33a853b4bac5c12a873321049034952f2cc107b071f4024582cdaabf9486363a1874f466fda31d1fa9ecdb679506d892b0d8856c69fe7b67d SHA512 8a7e38cf88680c3985c4f31961b3a153d0dc1eb9e13dcf2001ce05d6070e1157bd3f348a6bd5adf7855a859e362715fed178e8dcdb9ae2becac84c7b53f10af3
+DIST firefox-156.0-lij.xpi 391394 BLAKE2B 1879049b04ea0e59d9c36d1ce0f977882f97baf0b0de231e74bee536c908ad7233153e7ddde89cef7f4071f18a443598c3e58e24b9e18d3dcf8383ae35e6cf6d SHA512 b923f5dd0ba97d059be100b77bec57981b3ef641b35a0cf6edf291508a79b3a0c193f2f622f4cb4b805d8efdb8e5da135588701b3716977025f7d7acd5df52e7
+DIST firefox-156.0-lt.xpi 431938 BLAKE2B d6218f3aec07231ccf4e7a8a5e40f3655b1b98f63ed154a5e4cbb72fb6dcba8c9da7e94cf311563a3e63b8d8257dc39423ea9248c4215a7b793b6346e910dc91 SHA512 5d17e6f577f23111ae38ebbe611861fcfc9edf7433d8402b0c6b1e975b8643c15e6c56e2b137e596a2af061878cc7e7728391c3e349298351893fa7ce16dd950
+DIST firefox-156.0-lv.xpi 462190 BLAKE2B 983ccc4aeaf93367a06855ce6edc0d1ea61e6693184b8ccb389d466e0d1dd73fd0d8ae57baf99b1c716ef1d802da645ca0888f0b9ac8604ddd4a0fe6e91224d5 SHA512 81b4ea123534f62ef7164f7af18e810a2ff4f9778e75f8f268dbe79c23f8f19480e3b6b20ecb7cd2a3774f5b5c92ee43089fa5055d9263d19b6ce963e9fa8465
+DIST firefox-156.0-mk.xpi 445733 BLAKE2B f66ab78be16c74c04e4ff1384fc8e861cb73c53f1c5f3c8a6fd4defb7a3aedc03cf842170dbd4b1ec3570a8b14a489347bfd3901c7b520062b5e59fd8d68696a SHA512 1fd6a8b8b748491af6777b38385774e13e56ab34f29645285e0e8ee088706253ffec34bbee7e77a53352c8ce5c180d77b7aba08f4cb85789d8581047622f3d1d
+DIST firefox-156.0-mr.xpi 427574 BLAKE2B 2c73de98a621422c7b8c522be960bda7bca982edc6b193afe5b568df0135cffe2877fcab96c81b5e0a461496a39f44737590260001c876eae4243c0f18765fc5 SHA512 6d589f94500f2baf9dfb509e60f9209c9bdaa906e2c6b290fbe0946d9ffb0ad8d7375ecf149c4c37273df20a8801f67ed1d8bbca460dd5d9ea0aac820546b909
+DIST firefox-156.0-ms.xpi 389819 BLAKE2B 5c47f910d2975f40c1c5cd2c573adaaa8ffc687435b5e43dd5eb7743e23409a96ce84c5235fbc38f967817d8e81b81c6219d7ab2df31c1131af495ca948cf50f SHA512 0002a3988e07a467954fbae7563aa8b1ac611f083a3eb9b7ad0fb3043118ffd4cc03ea368f564a9786a2bbfe1be415d7ebfaff3ce6ca99cfba5db34c2849cc71
+DIST firefox-156.0-my.xpi 424231 BLAKE2B 1df1934c1411acd897a9c5c8b8be943f7d65b9b212541211d64a80186445abf7b83b944c4daae0a60d6ccaca8f84e4c17b29ecaee605726b66668513a4bc454f SHA512 7a8c8538913a7fc80aca429c703229b82364962b2fb10e8d4208a2b3ee56deaade19b7408423f0175a2023b029361f53b691ea25652ac86434daaa6b176d4187
+DIST firefox-156.0-nb-NO.xpi 502702 BLAKE2B 6c4ac3b64f14046637f0c20886bf5de4d56edbc3f2c036d5f7b58a34ab5700574bab00ecf3f1c4748b8274e2e90b239e98e3e2a57c8f9ae535003a0ad803cb2c SHA512 b7c3acce028bd32282057202389489cc658c47664533b9048580c18e31fdb895de62ba62e99cad8241e80424c104fad4e8d7778e5b9dd932d8172106f854d04e
+DIST firefox-156.0-ne-NP.xpi 425406 BLAKE2B 1b3909df412a037a73a14ddb46b53c6a9b679e8fe6f672583e64d6b0401aee32961a4001e85b5938ebf393b2af445fb036d298dfa5bd8dab0ca5998936e05fe8 SHA512 30f6c26df86c0ff443e9b08ca8661ed2f97849136cb75eb38f87e0f8018c54be83ec5a734a196f5d0b91546f12960b44091c1a2738c162525d87bca5042ed14d
+DIST firefox-156.0-nl.xpi 510995 BLAKE2B 13f015722028a2bcf397bee73c4823ed6b40c6fc1d70bd8dc91d2e2048b14d03cd64324445390103860cc39998bae5f487d81c993a3810944418fce2b1e9232e SHA512 c07ff7c71067c0473370a05fa2423ef134673cf01cdfd884054b485ffa1d56cd967b745168de7d4aa4d4b3e6bf913edb7c656cf4d5053e83b0f3e0121dfafc05
+DIST firefox-156.0-nn-NO.xpi 506447 BLAKE2B 9f8988b9adefa340d6eecddf5c4fadcc78ce933aea9a2120fb1bcd093674cae378c43865439c0728051729eba72dc4599fbb77459f2607b4c1681ca96befbd0b SHA512 6f1d49282b3a780dce4530f28d2cdaa3d123f7fd487e7babea04deef74964049b62b3658af09fb9efacceba9fbd24e3121da2981549a7e40f73cabf880f7e060
+DIST firefox-156.0-oc.xpi 455066 BLAKE2B 1048c0cab31f87e0769910891a3708da1032394cbcec13ae051ca9b1053e6cfd5ca3a6bc2673f5dc8ce5409cab50af4c43dc042be2cfe1f853affcf07b7e8e39 SHA512 17d0d7c60415ec61ab9bef579ec348ac796c164e4e21a265d95df7df065073094cdcfd8d825476eff3451c181f37be2593f8028bfd113cc4a149c581764fe5d2
+DIST firefox-156.0-pa-IN.xpi 597582 BLAKE2B e2895d5031e806e02abf5e17ecd049b7f04cd501cb142dae57688503e5cf7bf1916e64727c9161195718992f412b25b75dfe494b9f5405bd8302afe89aeea151 SHA512 bde8143ecbc81ece48834f7914c31c5f94cf8ba2b87bbb82efd55fffd2b802ce7d89f4c882513f3bd7df14a4dc48a58a99f58fe280d550971b0f9494ee9594df
+DIST firefox-156.0-pl.xpi 544761 BLAKE2B 52c97eaef8476711cb848d0e19e4bed585fd7d4ed42f04df5ce5d7d8fdf1ce5a2aa05a07f897304fce30384163f5f6461c613c1c264822ba6670efdc74839abc SHA512 5edc7821bdd31cfd66e8e4f8abb521ba16ecb5312953d2c4bc933135a3aee4c256d26f448ad232b57f3a17ae6120f30013fcfb8e16b2c5d302dba21575b9f2a2
+DIST firefox-156.0-pt-BR.xpi 515942 BLAKE2B dacd27176fa1af936d8302b150cc04492dbd368e624c7d7e47016fdc21e6943a11c9d24a8d73e623c313d667a6b604e345a4671f7778cd0779555ecc7d889b22 SHA512 105434d0a765d1d1b5c7f7b3bebe70bcd2b4264c649298871c6eb244fbb920e0e10f78a3d071f9203de5b1bd548e10c17658f16a2276c1b148aa1e7f05e5a665
+DIST firefox-156.0-pt-PT.xpi 523613 BLAKE2B a4d6ad74cec7bfaaed24283061c59c0caba92ed1f776318ae5b3e4c5c2dd890e28e97ff3433af19e28d88f8016d3003282b94ec699ad31efc837da3472395b8d SHA512 03584e280bc9fe528f001595e5dcb17c8ff084f4e7d17e9e1ef954cdc17bac500ced5e930e280e3458e5420fab465b6de81ff3aea84652ac41e9228c30cf9f82
+DIST firefox-156.0-rm.xpi 481995 BLAKE2B b5e86c29f19c1a3697a6baf2d1980561df4c9e170cd19c1e132efccf6a2059261c60f57c5898246f863cf96a6bb6c83df62db1235ff4590dc288710da74e8fb0 SHA512 df78a9b58bc44942bbc2d0168260ed4c8f7d7d26575d14ce3a387e56916260459e43c55ab11e31473a2cebdb2ee6bcbcca27d69340ce5d99f73907fcd9068282
+DIST firefox-156.0-ro.xpi 531095 BLAKE2B b40b7a101e1ff81590931a7ce30aceb880bb5935fd3d2a488a003c053f6d58313648498670fceeda89fdf50d254d72a33f1efb7184e7e10ce9a61ac92bbf5b62 SHA512 aba956fb452b8b1d0ba12bde504c4c4b4b84b657e56deba337abf4c37528f5cbf56ba642b57959049f3a825135f7ef2aa10ed095e85523baa905dd2fa3f9f831
+DIST firefox-156.0-ru.xpi 617975 BLAKE2B 9c4cb1b41929b5cf9ab2af3467375afa5029923ac7ec0ed308f6da5c32cfa568d413aa50014a77171e1f68c39ec6f6c987ce42ed55be47d98236dbb05eaf5fe2 SHA512 ddd5792b7878f67f824dba3723a267e6d529177c425eb5a29a40c824c36bf670352d25a266b7c3dafa5be18acd63af2e186bedc2a94757d85bf96e66d93f66b0
+DIST firefox-156.0-sco.xpi 394798 BLAKE2B 0c0e95b2b4a096166cb4195750f6cb070a735103b6ee4ed721901ecfffb78bed66edee650ee30ee112f3195ddc95196158e32deb686164eb229154ba54efc315 SHA512 b673d4c6e77d83809a81f5274c3ae087a22a5eb4a834f8f5369ef80dba0c57347ca8ddfd7abb658770381a1b45a96e15128e22a4094d342abc3963dc7c87adf5
+DIST firefox-156.0-si.xpi 472440 BLAKE2B 2a0ea9651c69bd30e60b05f262f476b75e905d33d15386888f7fff477fe5a50838cf242b051399432795e743feae81faeb58bb3e61069fcc9102550d8b8bef71 SHA512 8ff9cb9bfad1cab20c74bf226b7d9a3d5030027496433c83758dd8308d5026e7702e2efd8aaa5a4ba31e0f237b0528bdf0783ea2c537cb02bf6e27d71675968b
+DIST firefox-156.0-sk.xpi 551704 BLAKE2B edac2c5b64e6feb91862ad63859627898d6a159d581bbd031ff7121b5b3909d11aa589854e1cdeaaa382bb9354caed6156612fefd039c4265279807f7d7e1cb6 SHA512 9ba42cb3388feb2df116b0b99c113f0c9b0bad2e05e3e9c47c97b3c8f7e96a4beebc5b2218fe600543cd83d6cdba4dc7c5b6c4a8b1a5b4ee2a8e7a2505dcbe5c
+DIST firefox-156.0-skr.xpi 519644 BLAKE2B e313fbffc9ee540dedeae56dd78b388f7f98dd8bd867921aef2f7738721aa4c21e8e9e1cc72865a6e8fd058d8eead7a98fad59b5f1e30fe094e09e0d8ca6776d SHA512 064f0d7465f328cb6c0cea7ba9c8c1219f75709e3f36165d541cd66604a7a5921e1c9a510629da7625bf2994bf9e6769d76e24485ac4a74564db132d21a18066
+DIST firefox-156.0-sl.xpi 516521 BLAKE2B 944ef90c74fee79b89a1dcc5d461ff0f551e33fbdedb1288496c816f7873d855b656571af8334ba3a13cc64b27ede8e121d6e85209dd122bd379e7311a657aa9 SHA512 cfe5decf75fe8b3f758cdd7a9c53156df61f1f8e0b0a33962d28c27c256ac3d72bcbb38f029b73dffeb35a8691d40c91dd68e4b9792e93b549407b354ad04dba
+DIST firefox-156.0-son.xpi 356989 BLAKE2B d7b888d0b8cffa92ebb0b7d375bd760efba99bd56b31650b2aefb950e918da47db9374412e71dc2b307b2eda8a06eca85600d94bd68685f08f7aa4ffc4da0d25 SHA512 65705b903adc3688bb202b168b857b4bf74aa94d5e8030c3309df068f7dce6e22f9967694f6ac9d2e5cf6a94874ccaeab4ac514bffd6e4e257e75dd43cde8dbf
+DIST firefox-156.0-sq.xpi 510325 BLAKE2B 5573bcca00ddd87696066fd7746ef606ec81b288150bee6d94da3670803cbd8929a44c7000b6c789ae608d9f2778197683203b091f372c405b673f8b1653101b SHA512 55b736ae5b00f2321e647b5f0b47dc0f91b6dfeef124c654c9735926bd3c4db9676c1ec00fff26cedfe2d7fc12f15da39cf9273d1529c1c3d107b613e3655948
+DIST firefox-156.0-sr.xpi 586963 BLAKE2B 458017c4afb351c2e750a8f1eba728db658f8d9eefd3d076800d3ed2b3cb3b4198ebc9b59354195983298f2b796a51362b1e05fa5cbb4895b11880db271dcbf9 SHA512 6a00588a2e78e7c26b8c76851f6ed4cc488e13cee25fff43a064b186e6770267537001f8e9248372b721227f3b6915732616b4ee692b5206b6b742dca599223c
+DIST firefox-156.0-sv-SE.xpi 510210 BLAKE2B fcee8167f2ee7beacec6b14a09dbf808636ef126af35c8f096bcb4f0e236fabeab1ab1e8574b31f9ee611e8da60d6d3d5427f4732a40dfadc8c58d1b87981775 SHA512 c95b606f0364bc147197668388cdbd2a00aa5f124cdb00b88d2259bed6ca4f121602c747b394a7af8b85f70dcf88b5735a5a73d56eac39d915d2b202319c4c34
+DIST firefox-156.0-ta.xpi 415987 BLAKE2B 8cd5f059ba8fb93eb188d37c22c4ee71f9a74d8f1a13d4382bf0f5311dd7219a1cab8a94bdf5e094b1fa0180a4e06a599394f66084053d44a6db5d09608e8881 SHA512 0ec99987b019cc4096cff16079427a487ecb0b1f1267df0163ee507ef4e4779db731c4952d6e1d9d2e3b261d50a7f4a107212d02fbc892c93603df7520f969ee
+DIST firefox-156.0-te.xpi 454878 BLAKE2B 4ef88e1462ee2f49adb131bd48ad6f4cdb7592a1874415e5238ace7dcf48599ba6c5d15a2d1a847453bb2019e634b3db91e0aed295f54cd23c93f2eada9b9b08 SHA512 cffa28010dfe5451432e32c39210f76a12789a2cdb375947925f1abab0189fa78823bfcd042bd0eddd03e3ac12985d265f599cf4017829b8947651be8f9f9e78
+DIST firefox-156.0-th.xpi 578263 BLAKE2B 56e77e518cc95beb2938757626fe99d900ee3fca09e251f789e737eaff9cbe357e54deafa7a87e553a37c59b5a07e942937bf07cdcdc86add8b1b2faa416df62 SHA512 c1432cb7f5c056d5987705f4c4ede1939e6e7351132f8d3a2e404364f4286c9c2d63f952e3b6cd2ee16ded814825f4c49d55fc09f5071b337b3662a31f178310
+DIST firefox-156.0-tl.xpi 411628 BLAKE2B 4e28fe3a308a89ac35399a52a3d63241eb2f33b1b8502c976da9a2498c66cd203f3c21d4069311fa3fc190e397a34e670a707147cba28397637636ffb48996b8 SHA512 dcef17e7b626efdf48dac279a72d76db3daf9ff27f0138d503d480ecacc056a527dcf35493c48599512401e98f57443e159d09cc3e322a6947d69080449eefa6
+DIST firefox-156.0-tr.xpi 526101 BLAKE2B 857c60811d913e5be77552b76ab79b53c21d0c7694bb19f691697b2f48cd9905ddc6eac4dd3d0810da402e4a93e9697c84f33378b1b4bee4ebe6783d079eb6f9 SHA512 196fa84e28ae9939de74fb3724395769b227cc43d31829e169ff8425dc1dc597e77e816bd0653f7642225363052a7f946cf073dfed1043c08c8618502da7afe6
+DIST firefox-156.0-trs.xpi 402163 BLAKE2B e9b5c35c7b7d0d780627d8484f8a6b40fdf66c079a089605042c79e5aa3997b18c87acce057666b1e48397d493358e8067e80ea30b2ee09ef3809de041f2bffe SHA512 d9f3cc2a8319af2805b50750c25a8f6228cc47981bbf660b417ccde682429a18a1e4143277b32dfb68a09272d034d7f635a74a745fc3067647c5b89fe8b3e463
+DIST firefox-156.0-uk.xpi 593711 BLAKE2B 5b80bfd8e26d84269cadd43c80971a9510257dba043e810eee1e06471188763a6693982faeab7a239cd1532f887907d315dc90863846123d683033acb2710a69 SHA512 3bf6a0a6ef3721b0020d192cd129c70a59e92fb5462785f64b7dd5d39b936b38755ff7bf874fb0eea438447c3719878f0c6ba8ef9ec6263acdcac8d45616d7c3
+DIST firefox-156.0-ur.xpi 437156 BLAKE2B 2aab9c2ef07535012c56d2f83fde8bdcfe173ce8c3159cc53651a1c0be34489a57ab9b81353960964d7857cc3870332406c0308c68ea19c624f73b5ce0323275 SHA512 19ff65f00dce20cea29666a5bea02058914bb0d77311d991473b9832b4d918d57d84d54c25ff53b81ec32c6803d87cf736e666c226a6c7562e7ec94da7d333d6
+DIST firefox-156.0-uz.xpi 384110 BLAKE2B d6e9efc545b5865a5a02bb942183ba4887206728253c6c78118297f195b928601df149859bef8b7e0d83f5bd6c1b73381ee1474b8317935f0ab1b23a74995041 SHA512 f6242cee76058d5e81c673065e516c335fae656ec0954d25b70e6bb5f6cc0faea2a980636d31e75ee16b6aa589989893479ebf38f9a1322225144c62095e8e9a
+DIST firefox-156.0-vi.xpi 551897 BLAKE2B e1b06b701bb9ece69e89777609319c282653d0ee1d36950f10d83eebb6774953130fa4e149cff1444c3988ac52b4ae2c7428b525f8644290f779b97e8d65065d SHA512 d30e142ad47d4b8bca5073e22f909cadcb64104c864428423d02a659198be5aa9acaeaae50525235e0d68da6a7f1e534ca90c13f04fd0f95c5f8c5d0b2a294ac
+DIST firefox-156.0-xh.xpi 362670 BLAKE2B ade66c12922178edc3d3dc240c8b30430128eff47e71607f59a4d6ec8633244e83c76715122c432efd287689ddbd01a60f5361fad22de5f0a4512d1079b399ee SHA512 8a12598c2e1abdbd566b595d0c4374d332e4ce8e5536424759d215aabad6fa4787888c56c15b5fa6b23edd920a21610575f5a6d69f89e724020f3bcc5e0675f3
+DIST firefox-156.0-zh-CN.xpi 537329 BLAKE2B 49c20a578e5b245a114a7ec62b8b2d0c93df61b9637d8f10b764e653d9c3c5bee60f4f1fbbf37629e90a66a46fc1901c009c9fad8adca3123eed7d18625d80c6 SHA512 312b0ca3696c8f98e00e2a1d956108c790be71398c66465a92a16353426a2fa87f45ac4dbedce2fa68c69e19538e31dc3db2ce2964c8acd6f35a566cf3d726b9
+DIST firefox-156.0-zh-TW.xpi 543188 BLAKE2B 2c573f272e0bacc23b8dfb6787a87c24a5da156bf35256e36f481e8f1753a32dd7e5d4537c7ffc7c1843b048597ed072c165bdecc1ce69830e5c657421d0d41d SHA512 5393e303f828f795bce5449b6013c0b1114ca52c45168fcf061fb7eeb4deb48a7254775c39d5faa63688c6cfb6ffc914db520d74e1adb1a935af025deec38e77
 DIST firefox-bin_aarch64-140.15.0.tar.xz 66819792 BLAKE2B c83fa3fb04ac27df6c128fec293c6e2d527d9f3f9abcdf57fa9db5bb9f528b6481a8ea2b522d235a00f898c1fc5b167f4ce11ecb5a7bac434269ea8a2d49dd88 SHA512 075afaf07e96cd1715e243dcbe442d5ccb56bff92b845788d547df09b281bfafb894cdfbb1fb81d358a99d8b9612103d19c0bdeda16f530523a88af5e06589a3
 DIST firefox-bin_aarch64-153.2.0.tar.xz 74297348 BLAKE2B a777d8173ed252902ec477096e724885a303cfbfdfc1a4e3b904bb6f9962f6689452fad65c7fe795aff565c2b29048e6a5a88467addf11440218b06f70776295 SHA512 6b91d4798e5a25a60c0852dfbc6fc43a5811db7567630f75f6ecbfc0138bfc22d474e42f4173fc58537aecf616569e20c915df1e1baa32b4f1183fe12dea033f
+DIST firefox-bin_aarch64-153.3.0.tar.xz 74221148 BLAKE2B b9eda0a5e59b0a1933811600509ed71f1811680da6ae4c1abe15ce9447f13ae76ff43c36ae6fe1bd9dc4ffef1c3b1ddd701d04f26b6f938372d31e57bf817e8d SHA512 8c29628c34024bd7b96953840bcf93843dee23056b46aa574da749bdb10c26129c967e47d8ebbf8f3003dcd79b71630d0190c9f841b957e09d48c7b6a6eff7cd
 DIST firefox-bin_aarch64-155.0.1.tar.xz 75158380 BLAKE2B e09baf9d826188594d3f120e68da0f4ebe476b44f5f7dda9dd56236d4a19c522f6f29c13212016855dd964ce40a8af167c37e911cc117b9a0ad1badb7c01f106 SHA512 6eadf4b726f6f8eb34567563410c98747710883fe72f2f6ee3d5a2390663d4f7d47ffa593afff604293481cf6f00bc88c44974da8e58168cd1e56c64aa640b4d
 DIST firefox-bin_aarch64-155.0.tar.xz 74854804 BLAKE2B 574e028f6081c28a73b58432c3a39fcf651495d68909207e24289a48757b4fc6ba5b13299601eba76997dff9915fd405bf62b9239e8ca56c548b3a12f448b67e SHA512 5663cc174a7e90b9c3d926d78bbf99682b56344c3f02d1f2884619845cd4327eb8b7380301234fbaf378a20f4dca7d719d9424bda793fb5db367b00be6b5a070
+DIST firefox-bin_aarch64-156.0.tar.xz 75681124 BLAKE2B 5a12716fd738e73f1a0ea2f4c34cc41c31af0245025b4b51cb1788a16855387a97a6a09b0dabe68fc0a9a513a5428b5de9a8eaea7b4d1a881cd02bb7fbdb575a SHA512 1d3eee6260ec477bcb25cb2fb41391265c2b54e4039de04037f207c70a12a28d7c341afafcacbfeb2f2a467be463408c0df50f6a63835d67f4abce6ca4182f6d
 DIST firefox-bin_i686-140.15.0.tar.xz 78606748 BLAKE2B 229c8009d234cbf1ab0f2e17191df6846de2509550f8d7eec03d7711d67ca93fd4af8d5208ef3efbc2d2279bdd369341a927072824a7d629c78676300e6765cc SHA512 af575b9867fb209ddf23529849a74d63d8c2be7a792f4d6c03c8b0082cd8e7a6d202bbaa34b82035ef87fdf36518a9e02a253428fc55246ab539b6fdeee2a535
 DIST firefox-bin_x86_64-140.15.0.tar.xz 75872668 BLAKE2B 88853b4e20a88d80e0127aa911080345927ea0887284ddd1bc67c599131f5cb4e1de0b424afaf59c638434b917de5cf44b76896058c930ac0de74a7b190c2aab SHA512 46f19eac00f2ac396944158524ca58031996dc946328383160af454140f76787cbe6197cc3f508cb7321b840527afbab0bcfa98a290a63adae657ab28d09c897
 DIST firefox-bin_x86_64-153.2.0.tar.xz 86341504 BLAKE2B 18be55fc9325a2b6826f3be20859d64e7385ae23e4aa57578e59df75840007553adf5b338b69264b774e1ecf97d73362a8a06d298ecf8fe90b85681394de9380 SHA512 80e870ec403ac6913216c6d1f7957153f94b1d8021947170bf23a269a110c617f9ac8dea50aac8f37860a11dc441d785a65e87ef7f60feb312e2ec1e720be400
+DIST firefox-bin_x86_64-153.3.0.tar.xz 86440152 BLAKE2B 0342fd355e8d350db641bcf739761a3bf477f710a6ab696005ba7687dea7956796aa82482cad58dc992e878b731502443a05a56998882afd30b4d02961a62de9 SHA512 8514dda74bc79228f073e89afdd93e6f69bbb5c38ae3f8ebd4e0e58c1cef20c6a792815534f3fcc371018792541a396949bce396fbbfea31ea2bcebaeef65448
 DIST firefox-bin_x86_64-155.0.1.tar.xz 87372544 BLAKE2B 5e64268c1968de7ba9f2b1f63d326762d455560db318fde3e139919fa93d837e1d70557c190c9bcd5d9d94fd1bcbb9b922cb591eb9891870c264c06e20b8e4aa SHA512 da23025495aa3a2b154cff7c6464fa8bc31ca0c683b378c34b9dced9f33b6e657537c0b5fc44e98bce742bda8e3c58a0a571d1ccd849bf41031881cd36dfba1b
 DIST firefox-bin_x86_64-155.0.tar.xz 86978904 BLAKE2B af733bd5f62e3020762242ece38c248978a75a83ca353d63d1ff19dec328ad2e71100af5d072ada5d3d4b21eb00d6b135a7fb4df8ee2eea8d36ec489ea178ca2 SHA512 796896d2c8a4ae1260378e8a48c526a4e0f88f32599bcc83af1147a974d26e5cbc9eb0d9bfe392fffd9b14d54007f51f1ec514b5d9db396975babb38e5e07022
+DIST firefox-bin_x86_64-156.0.tar.xz 88279348 BLAKE2B f33d8c383694be578c6bb451d66bd86a1e6623047fddc471555e6b03f3dcff4f5d4daecc2e21c478b79389b2a466d84d1f5c2d759d51d09598fd1267e758ff57 SHA512 0d412c90b4ec2a0b0690790a864a17e32187a32ecb2a616fea49b8b9f193f4225ea220e476cf220fc362d5322bee5e9f515a3b2d52e224c9ac659980942465b9
diff --git a/www-client/firefox-bin/firefox-bin-153.3.0.ebuild b/www-client/firefox-bin/firefox-bin-153.3.0.ebuild
new file mode 100644
index 000000000000..1c4847e03717
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-153.3.0.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.firefox.com https://www.firefox.com/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.firefox.com"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.xz -> ${PN}_x86_64-${PV}.tar.xz )
+	arm64? ( ${MOZ_SRC_BASE_URI}/linux-aarch64/en-US/${MOZ_P}.tar.xz -> ${PN}_aarch64-${PV}.tar.xz )"
+
+DESCRIPTION="Firefox Web Browser"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+gmp-autoupdate selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	!www-client/firefox-bin:0
+	|| (
+		media-libs/libpulse
+		media-sound/apulse
+	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	media-video/ffmpeg
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox-bin:rapid"
+else
+	RDEPEND+=" !www-client/firefox-bin:esr"
+fi
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk skr sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Prevent auto-updater from popping up.
+	echo "This installation is managed by Gentoo's package manager." > "${ED}${MOZILLA_FIVE_HOME}"/is-packaged-app
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN} --name=firefox-bin"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230, bgo#941873
+	local apulselib=
+	if has_version -r media-sound/apulse[-sdk] ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		ewarn "media-sound/apulse with -sdk use flag detected!"
+		ewarn "Firefox-bin will be installed with a wrapper, that attempts to load"
+		ewarn "apulse instead of pipewire/pulseadio. This may lead to sound issues."
+		ewarn "Please either enable sdk use flag for apulse, or remove apulse"
+		ewarn "completely and re-install firefox-bin to utilize pipewire/pulseaudio instead."
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	# optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/www-client/firefox-bin/firefox-bin-156.0.ebuild b/www-client/firefox-bin/firefox-bin-156.0.ebuild
new file mode 100644
index 000000000000..dea9320c7c9c
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-156.0.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.firefox.com https://www.firefox.com/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.firefox.com"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.xz -> ${PN}_x86_64-${PV}.tar.xz )
+	arm64? ( ${MOZ_SRC_BASE_URI}/linux-aarch64/en-US/${MOZ_P}.tar.xz -> ${PN}_aarch64-${PV}.tar.xz )"
+
+DESCRIPTION="Firefox Web Browser"
+
+KEYWORDS="-* amd64 ~arm64"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+gmp-autoupdate selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	!www-client/firefox-bin:0
+	|| (
+		media-libs/libpulse
+		media-sound/apulse
+	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	media-video/ffmpeg
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox-bin:rapid"
+else
+	RDEPEND+=" !www-client/firefox-bin:esr"
+fi
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk skr sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Prevent auto-updater from popping up.
+	echo "This installation is managed by Gentoo's package manager." > "${ED}${MOZILLA_FIVE_HOME}"/is-packaged-app
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN} --name=firefox-bin"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230, bgo#941873
+	local apulselib=
+	if has_version -r media-sound/apulse[-sdk] ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		ewarn "media-sound/apulse with -sdk use flag detected!"
+		ewarn "Firefox-bin will be installed with a wrapper, that attempts to load"
+		ewarn "apulse instead of pipewire/pulseadio. This may lead to sound issues."
+		ewarn "Please either enable sdk use flag for apulse, or remove apulse"
+		ewarn "completely and re-install firefox-bin to utilize pipewire/pulseaudio instead."
+	fi
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${EPREFIX}${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	# optfeature "ffmpeg-based audio/video codec support, required for HTML5 video rendering" media-video/ffmpeg
+	optfeature "desktop notifications" x11-libs/libnotify
+}
diff --git a/www-client/firefox-l10n/Manifest b/www-client/firefox-l10n/Manifest
index b8e79d540ae3..a734b78e4a1a 100644
--- a/www-client/firefox-l10n/Manifest
+++ b/www-client/firefox-l10n/Manifest
@@ -98,6 +98,106 @@ DIST firefox-153.2.0esr-vi.xpi 527407 BLAKE2B da36cf6bebdc37f250fcfdb978fef28db1
 DIST firefox-153.2.0esr-xh.xpi 355159 BLAKE2B a2dabecb5712fc2adb546f0f4e595b8f24bd802e3de04dbefbb66edd70985ffcfd92477bbf16553bc3bf979fefdd402c2a91173a1a79c467752cf0d0fae5a6d7 SHA512 3ad49a67fefb3ad2d204adb71f8a280df8742cf32efd507e026810fa17c22099796f6c82ed487e7fcb55f297c6aa99c1ddf7f621a2b3e9081aea3ae85921cf3a
 DIST firefox-153.2.0esr-zh-CN.xpi 514271 BLAKE2B 3952dd563e0d756a6e5f240b938f2efbd7d7b3e693a38602e10041f58eac45a76d547e345974192478e25560f4c11be9a9cb74d4f13070dbe667132ff39290fc SHA512 a29d363ce4134fc319a2d50459f8548d1adf93d537e9e792286bc2011736fd93740458bee81a80db0f6977c5b40491c05f43817955fc05ecb5b33f0ddbcb6a4f
 DIST firefox-153.2.0esr-zh-TW.xpi 518964 BLAKE2B c7d24b780e9611e19f99a6439bc70d1bab3e83f54649cd84f48b80cbc58a1206956f0c0659b4f0980743bd2e58ff6597b761cb9936ac68ae960361880b62b214 SHA512 4da9300c3cba6234b82fd7f7a565cc0471f5f4167665022037ae847cce6a69bc4bb6358331774279e03bab5c8fafcb533d6f4862bf6e424c4e5a4ece8e7df4b9
+DIST firefox-153.3.0esr-ach.xpi 363866 BLAKE2B 0ee439fc2942f88bfde7a6588e9d6c6369844d83c38b0913f5705d4cd046bb16bd9828a6517493108dec2477b522afd96db2cc6057368fce648f75becd2dc87c SHA512 2c5380a03e89302a89c016a8d3d6ed0ee5fd50a67dc27f59d1f64067fb24a86c24168fd665ee0bce616858fa7404c6d8214d4b11e98867e22b22aa0c0fc45975
+DIST firefox-153.3.0esr-af.xpi 349901 BLAKE2B e341f8f00a9f61a2be5ef0cde6dfa9694cf6b2e684f9d79abd9464410c3e9972384a42b1c719dc59c2b12d7dc183fba9d3eb6edee2cc27795b483f5e490aba35 SHA512 757381e09e500b9c51775e3f8cb4c509c70c152f8d68594d849b4c702dc2fa9332fc6b38536ebfb59109dba2b054c7dd11dcd8c78a4d185650d9f90828ef79e0
+DIST firefox-153.3.0esr-an.xpi 392245 BLAKE2B df9a4ab61d6de2fb37042218dd77a0cdc3aa745c25014807d44ff65f8743d6eff1883bab00bc33f59e36b86021e34893681568c7ba12ae4ac53498b8bf1e45c5 SHA512 a872d0dd27718879f57a3c5ded2f3d4fe405bba8de2f808ee0dddf1bf01238cb697cc49208ac259b3d6b77a4984cad91d541ed5ee33df33e2b8a56f9e54444d5
+DIST firefox-153.3.0esr-ar.xpi 532669 BLAKE2B 382d4f2f30416924706aaf32775f8c49459e0789d0d8e77de39954e92509e827958e67743a87d6cd5c589ed16610216450ab46b95f46ef5f988907deaeb5dd75 SHA512 7d49537714f2f83364259b071418d3b21257ef6269720f0a45cde3660fb5c11074fef99dc4659683917bc9d6c11489ff1f8d5504ee9f597ff40c942ba224a017
+DIST firefox-153.3.0esr-ast.xpi 387194 BLAKE2B 41ed7aa3939eedbeaf183ce208231070ea97e61f9d1691ac772e3d3e7e6610d30c94c66106d99c9de060ac369dda314305f6e4e5925d71fdeaca966e82e608f4 SHA512 78ab433c52fb0a7003f1f568f92762d6036f99e6d3bf0e87cf87cd679752e774c2f8ef52a67f9a2bbbde8dd81c5596160c15896d86d29cb25441b4dae49de1f5
+DIST firefox-153.3.0esr-az.xpi 401947 BLAKE2B 505f945963f7b208044a54a05ef20d61aa29150fb36b191c5c0f9dcb4fc865e3b0efbc5b0bc19e0a0c651a4fe6cc98447141615e56378f6d89dc19c3df7f3d64 SHA512 db15640a1789d9b7837f309b66e292e9df962a5b0ebf4b3c2b00c29f127f66dc2c42ababb135a00fe20697b595b9c271389eb1248d2d2c9ad00ea0942ca396dd
+DIST firefox-153.3.0esr-be.xpi 585963 BLAKE2B a1c3ebb146d72f9b42d93e891830739e514ecb6060ada93679e656a638d3c4a6a8592180414cbdb999b78d765cbeb59bac278eb0f27f783fc51103e62622b8c7 SHA512 d36b9182eb59284c845839b4e768669a946b5832eadeba1378a00b0e39035440f873813b60fb28d9cb5288fe2e77863ca379d37286fa5efcd27e63e3de57a70b
+DIST firefox-153.3.0esr-bg.xpi 512454 BLAKE2B b56deaf9e1a0eb1e8ab1f292f48386b650ab265a4470ba5186616ca50559af5a8f6add37e3268edd548a315afad9593f0a3342cbe0176518c4cb77c66474b020 SHA512 9297304b94d1f85b4ee96b17b9c676a29fa5c5414ffefb3d7b40233743dedd6fa43e61f123f2d683d5a8163dea4d69a6a96d99031ade98cade296cc65da75ff1
+DIST firefox-153.3.0esr-bn.xpi 463529 BLAKE2B eb0da6533caf3b91ecdc5bcfdef38d4eabebf1da796ed383edabfd13780430f74ebcdf770c91775fcddb7f79ca9932e9d95a182b79c66cbfb9835783352de2c6 SHA512 a84a4899ef09d12e01d871df73d8a18d1677fd2509052dd4c9f05654175962c9d07c3625947c320bada6f7013d16453bb79d63ab6444046f550ed6954997f761
+DIST firefox-153.3.0esr-br.xpi 434129 BLAKE2B 7c39e48d9cc2a3ecda65babd4f2e3435c864b2b04251e965db52f21ab36811a60be5e396440f89a6bb1c7f21197f36c10cc2681bb1b9af729f45934172530e78 SHA512 a0b6a1b0ecc5255dce5c9f7aa142f5e85673e1547efc93ffaaf6cd2fcc14b3c24134428b105e538187d0393bd4e788f0c0e49bd156f4ba4c80077189d2081426
+DIST firefox-153.3.0esr-bs.xpi 470326 BLAKE2B 4a00527c3d076d72df2ab559d96d5d51b59e24266d4a8dce760b05ce43551cf06124a59f591ac02fbdb9c0c16be8e3b417724e0e7de35da8ae20a45052ec7f4c SHA512 64e0a5b1f4cd28d84fa5ea646d4e53443062f14a1235ef4fd622c690a51361fb3cf474425df81bb837460a5f3bbade398cf2db0d3a80c4e81e6970be999153d9
+DIST firefox-153.3.0esr-ca-valencia.xpi 412838 BLAKE2B 2c521dd0a532dd245ce910fe7f1b6c508b9313ce455216612320f283c4ab7f32757aff6b5a2082f0bcfe316d9b08a2e2bfb744b0a4541aacfa8d69fa067a85d8 SHA512 2037d4fb2b5967351e0380ea00642a81df4cdcd0cd00fe673d7a7c45c542ca2b69cc726b0a02c484f98fde088fc5a8d6b12c077a6a2242eb3819cb977d92c195
+DIST firefox-153.3.0esr-ca.xpi 484067 BLAKE2B 2de85bde8343492ced2d6fc43f6040cd3c34fa3b385e1e3cb4227a5100e8f41b5dbfa482e2124791dee82ae233907c374877672b853bdf0bd370badf7645888d SHA512 f5f5cdc9809f0c64584cd76afb00f0731c9a024dd845ca4208c690bafa293ded4f463367986cdb33053553a1beada7e7353b4bab686de6e9fe71af9b9df0c793
+DIST firefox-153.3.0esr-cak.xpi 432909 BLAKE2B 77af2069692d04df2b24049b5ac3f7e170aaee65e3b68ac1a9ab6b542709834aa1de8a297d459e56c757f7fa2ce68c0abbad04abdb6ea9f2f9521e054dea2c22 SHA512 98d92fc5f8c38cca8658b03b6270599b8a3f2aa678cdaa89281a62fb4ba49cf1b21b3805e33a5baac7fc15cd62e09db34c70c43d0cecaff20252933ba954a82b
+DIST firefox-153.3.0esr-cs.xpi 536306 BLAKE2B 1f8b68919219a8b4c33792bcbe6afaffaff3afe0c8c9e632dc07406fa44100c0d2b2a0aca3b498c60779555753cdcc3f1d66fc0db38dc4c543035e799ddb1608 SHA512 58587f51c30495834601d2760a99896789f4101413cca6a537bef8ef55484febe9372809c80961a4bf54a75b2d97217b355ba7478ff7109a15b1c26199192423
+DIST firefox-153.3.0esr-cy.xpi 496720 BLAKE2B fb0d5fb309338cc259d5bb7058feefb7bc1225685169a4de157364cc564b38bb30c624dc19e493f74ad3fae697bfe8985cc07d3d586ed7194a45f9cd2e3848ed SHA512 bb17a0f626b56590187364cde57ee6be80150569e8bc96884b262c3e0bc69cbedb4e6c0e215a9d40ee6e42624985d9c01cb07e9d31907dd0c7c33f59a067f11f
+DIST firefox-153.3.0esr-da.xpi 477878 BLAKE2B 35f849b932ea5a2b77ba7760e388204277129e6307e6ee53e01e09562203762607bcd39126639c6938f4abd1884b38f3864823ca9744d4b62955f70ef0b3cc56 SHA512 a4f2f721310c95e7e7168bcccef3b8563d7ed8462d7b050f4721512caa3006552779c62883839c15e96f3702bb294bf442d0a4bdac62bba4e7ce798f7457684e
+DIST firefox-153.3.0esr-de.xpi 508058 BLAKE2B 8aaae34ff9f63f26d2230ee56300d0bf02c69bc4de2fbf04a460cb2fe0df48edff29888198b16a7e8de76ddab65d61736c28a479d20ea891d71b85d0378206a4 SHA512 657579806c60ef25d09131df434a488318a4d8322452a0fd497ac3e480ea542d6a7f10c23656f7729edd8ad37f22da14c49dd5b6376d558084bbffdd62d498ce
+DIST firefox-153.3.0esr-dsb.xpi 522604 BLAKE2B bb4d3be6a062d4a614f1e0c04a9740b96acccf4549e716e5845804bab1f053f18d74d4ca7be96210188b922e3e0a07ed09825018a4d5e97a7cc406701ce9662e SHA512 4b3313b383e44487e6a9ce8c1844403791f89c67424f07626a5be6c43c096e5c75093d0e4e79aa6d36c27da3b6bd39e6b0371008e29538e2fe17a0234e185cb3
+DIST firefox-153.3.0esr-el.xpi 601826 BLAKE2B 45494ac53b6f9371b315d51a9d5812e28fca64cc0be2c545499276f14ec6f7c4a52c541b4f22ef9553b8a2f04f811c8aa41b509a132ef354c75211419ec89aaa SHA512 97bb4ecfbff1a254e1c2bceddb394c9ef92d4d38d758fab552c0efb6b0529751c4854e4813c8e50ce097930e3917f6559ef88d868c963f58e88935b863c75d1b
+DIST firefox-153.3.0esr-en-CA.xpi 459470 BLAKE2B 87073ccb54f7ce1683b62c922c1554715cf0de77ed0e28f0b5534e172bc886ba55c57ce34ef906a04960fe696fd06fac32ee317cf90c49fb19d17101237cede9 SHA512 db67f6da7da1b9e396b6b9b96bb8787d067531dd3d88feba5e4fee8fb56741618fffd78e2d11dfda67c1290d9b3d61776ad46cd9dadadc7a48b8275422b8b59f
+DIST firefox-153.3.0esr-en-GB.xpi 459801 BLAKE2B 97d3f025e0d1316bcce9de85778d08d6ab2fcd317e05d7bfb174c3645b66afdb1a7bfe7bca12517f27374387daed2a63b5fa9e75ebf6fcdea39c0629c01ab220 SHA512 c992130532b5d79fd0f1e266865b757b827654acbed81a49e144abb077d32592c9f4e293afd705e07e6d130efaa575ab9a5ecb68da731696892aee89d4a4f09c
+DIST firefox-153.3.0esr-eo.xpi 485816 BLAKE2B 7a3ec9692b416e8b45d08bd26cbeb7d013aaeb5222db1202d95172e356eece73ecc63c9c6bc960e05dc733d3030b7a8bd39be143759664e6edb4f48f0cfaa01f SHA512 8817383d33a90324c8316a11c4a68ab1b173747dd1020818a9bc1cadc55d81fa1c2a0f4301d99264f093d8a3b8b148d7d2cb9679cb0d6710b2a4ffb7c2036ec2
+DIST firefox-153.3.0esr-es-AR.xpi 498463 BLAKE2B 92cb87941809ef925f240c18f827e77a942b817b5d20512cc1adc041ca6834abe01e171d3f0b10abe07945cb373d6b12086890ff0caf2ab3f41f678d214bafe2 SHA512 5e82be7f64c06c58d5fce3009d6e7a439f369ee41cd3f52352f02141cfc084e2b157481ee271dcfa40e36b2229c77c00483f514e89eaa3cbcb03493b36e6fb78
+DIST firefox-153.3.0esr-es-CL.xpi 500129 BLAKE2B ace7359118b34bb48b771605d3ac2fd1b66ad229a3a5f015f828693e1fa7797c7a2632142d4db9546a45885a5054883124ad2d15e2410a95adc9f122d2dc7d80 SHA512 44e07104f3b100e93cbca03ba69f98344d1ecd645163c5efc46053dd8433048181a49e625dc07f7af63d5fdf6c9689a011a1e9ebc7cc46edbdeb3870cff27a18
+DIST firefox-153.3.0esr-es-ES.xpi 500226 BLAKE2B b69bea75e85d9e2ee322afb82be4576229f174bb34d089eab792cf2a655eaf328c20dbfc285d67227f49aa17623f5b7e18b57cc46ae9c4e337efe61eaacfdd89 SHA512 c7de7e05f3300616dac58a5f8edd4b9e8753dcba89bf72ed2e644f9235d86bf219dd1f0279517d5242337c408ec6470bec98c5239e889a2a0ad9821aad266a71
+DIST firefox-153.3.0esr-es-MX.xpi 502978 BLAKE2B 8ac49e51ea79b81ab17fac52ae9c5a88adf3fc90ec8fa737545373a7dd272a3b4672366c0291ccb55305f45d99470d2a4ef8e1f047379f50d2686a0ca479bfa7 SHA512 61b67c726806c2083acaaba905be9fa5fa2ec2c93f8095db0caff30e4e4f9f4998d6a92a59519fb136289d3161861261b4dcf3afdd090db729611a94ea6b5f68
+DIST firefox-153.3.0esr-et.xpi 402847 BLAKE2B 8b355dcd4de03c0fbe7a49a6d099d13bb4daa03853dbc3083530d0bdba46f003235b3f646fd3c045def16a43898cbc88d1856cba0c52c81f2e7f9e468c4053c6 SHA512 c72626586efa3c7a670ff7b03216eb9fb706e9f454b6171ac62f5e1bd1ce4ca6c388b92c5faa13fdb03a630e96bc77fd5c771dc52fa72c5e662a5f0ee216613f
+DIST firefox-153.3.0esr-eu.xpi 486065 BLAKE2B 39a549bc45f115972fec10e89fb35e90fd5aacc2bd448cec5bf9e9473b8e4000f62b76255fae5d0766ca6335e6d1a1770c8fa20dd3cc388f6398d2c59b622fdd SHA512 d2d02db7aa1c079aa66917aa3742a0439f3ed052ad6cb22cfa4defb842e3663552e99bd35b576609508061d08e16c889eea01cc93a0e48c3b5dfc7bddf8cbe6b
+DIST firefox-153.3.0esr-fa.xpi 470119 BLAKE2B c8fc23f27997674d8fe47cc20e9801ef4e53b1b79a72751d59683b231a83c994819b9a087b798f9c26cbfd5b4156ef5aa517761649935929d472c919200ede41 SHA512 82b0c3f2e5b9bce2c68a302b7fd22e78f9ff8d02b6db228d244b0e76dd4a08f8b32399db291b4da666d6f5867a72886f2b65c000c34adbdad758b0952a19badb
+DIST firefox-153.3.0esr-ff.xpi 375197 BLAKE2B 5dac2a9567f285ee3635a62cf95595692d8b7938e1a29b246ae87db9e9b94a958516d59e0b2193ed07891297cfede57adacd80eed3c29c525e8ac04c2b0a7495 SHA512 2670222f4094a0d84a05a7bf9ca52c13f7de449c81eb32a5b567448d903faa2141448011c1f7b79fb902c4f96035b5215689806c4847ea181864f4c49a5ca4ac
+DIST firefox-153.3.0esr-fi.xpi 487360 BLAKE2B 4ffa4e755daa334a69f7f428d8f6bf12cbee8e26d41a0de0bcb9bc8594f2714546dc1bb7cd1eaa09167e6b9478395d802da5430013f657ab61c720bbb2820c73 SHA512 31aedcc43472cb2f9ab5375f85f1e160dc10a3dac6b23953732a7b68f7dca80f672fbc82495da1e6fab0ba38b6af8808176cf68fb42f23e5e4113fcae19b75b9
+DIST firefox-153.3.0esr-fr.xpi 513909 BLAKE2B 3e4a1b024bf600e7a64ab164a83c46a792d92e6aecee5d97180b60ef5259796a24dcf9410467ba443184d6765a94538cae58860c73554aa502d3b92561dc49e7 SHA512 e6bfb85ce0d87c44a312c0db0a8b4f49892946fffb907386e59c5492e7cf38496c2c17066cf0c1c49d9aa54a2c6e58e049831fd27903b365bb865d5edf1d60f2
+DIST firefox-153.3.0esr-fur.xpi 502492 BLAKE2B 5c83b9c97868bb76f963ea63a2672725615df1458f92c7276a5bf493ed482e440e31fc2248fb9a610082df3cd2540138f014d2f35a83a70fa72eb617ef586b6b SHA512 e945f1904e104e95b51e85bd784503b445374af6fed8deb8bffd0d57bfd31a45d0928550ad4596273bf30e1c412fced98b9b3a4e6d15cd458ef815b590e8954a
+DIST firefox-153.3.0esr-fy-NL.xpi 495025 BLAKE2B f19258c40cb968c457b5e71565f6e42380e3c1303bf0e0426118b620469047bdb199bac86f76cd2fa73f4dd331acce1c21a5f5c802b48e00f8c281ad6e8c909b SHA512 0700803d32119b78d3440ee7b1621c4c171aff4ec4702dccd505342f40032690d9080879286e0573f5b98dcdfb57ac692be352e236c3b9180ff313ae5aa88791
+DIST firefox-153.3.0esr-ga-IE.xpi 386389 BLAKE2B 77dc50c9a0da441aed0d5845d2628ecc06517498e69c9e5d844598abb0f04cd70d81d8b3b3778cab0ab32a92d8b0e737b164bbaf5968407a7db1df909a80ff3b SHA512 a2c89a3f145c6f3c5022060eeec1dadec64d19b063309b968d3c24678b7fbc31a0a999694fbdfc10a6f4443152c90f3e3959286bd1f1c80151504587a8c8e921
+DIST firefox-153.3.0esr-gd.xpi 444732 BLAKE2B c8c07a584b85ec3cc64ac52f121a3e53586030be39b6dfabf3e06c78a2dd3f90c394a070a742f8394fb751912cc0b23b2468e6a32db598152387fd74a168ff5b SHA512 641ddf471cebe528a51098c8de19b32e87634e28e24fab413e83ff739b11e61e8b5a6c1aeb55c946b543a030f5bc62dac3c45cbf4d7f87680909fcba75fbadeb
+DIST firefox-153.3.0esr-gl.xpi 466593 BLAKE2B e567924d27cb0b8f1ebb2548b6a6a47f6181b36e03335b15d28ac434613e292458f7f68bf44ee0e7d5d7d8cb3ee977af0ef65fd8be2f00f3a35135cc8953fb51 SHA512 25585b5bd8630fdc445ac6e013ab58ce350b816dc3745c529e2ef928fdea1f2febd3dae4ea37bf13f51418e3f547d6bd63be68ca2ccf5b1df0a09e40bf97c2fc
+DIST firefox-153.3.0esr-gn.xpi 504531 BLAKE2B 482d409e63296d0cd5335f667cf74bd2acb2cfc8c42872640c6369f943d82bfb025d21e87076f422c7d001923e442aa59af77e823e0bf7ac309323d19824067c SHA512 075a8ab8a84501c136d3ca62bcb0e625e8be72cca25964a3fe38342a36f5923d8368736481226d89f4fd5e13c68f80fba031ac63c0b85959d8a4e0dd434db559
+DIST firefox-153.3.0esr-gu-IN.xpi 421844 BLAKE2B aa6da03cb0ee01233dafbfade777d90a2938c90ddd42d19bb73c0dc4ccc71f0e73194db1405f0e9f682898498adf3aae397ab62d52d3c8d3e757131528bcaf12 SHA512 7388aa1a38fb6262c72528633c3278e3bc2fae5b64dbfe694bed6b84161897f1a9a8e7890f9500136b410d8ec4ba04090feee719a5687a4b1f2b2d7b6ccaf7cf
+DIST firefox-153.3.0esr-he.xpi 510786 BLAKE2B 4f8a7f3b05ee9a63bf414616f32908d3d5472819dfa0ebc339b5f36c69d10a18c7562138d9c33ade3df9d9fe7455709cd556d49427c17d1c57f6774b21185f86 SHA512 471be466b4a215f2c9bbc47ca166c8ab02f3fbdaf46cd0c36f3e7bce9e651ff21d20adfa6b83f1d5c629cb7786e3e732e8f2d37f6a9727bdb8a60cf37728a05d
+DIST firefox-153.3.0esr-hi-IN.xpi 436543 BLAKE2B a6fbd9db743853cfff2847fe6c995280585280ac853a21945ce91ae85f2e833fc109e534fe69de35b6dd7eeaa8dcb36b48d3b2e40419561d255dd49f4b9d9b96 SHA512 3f98f662a1b9d845b3aa46090aeea1434e450ef2e2214bfdc9aecb9f3cadb2ae48132f1d113ed4895e69ffa07fbf926bd935b5c07786dd00eba3b9b233f5c714
+DIST firefox-153.3.0esr-hr.xpi 490913 BLAKE2B a286eabcd5a59275285df3685733c77fed32abe3c9411b1de266d0dbaa10087a757da30789ac2d80d5a8dca6ed9a8039e508f30d52da5e1be5a837ff064cc48f SHA512 6d3b9fd6aa446c7a6d4daf6be7e64414c2620e5b9478a688d63bb29d95823816b07b95d7317685aade1ae4e9bd14c5c88731343448ce07115716b9ed768a756b
+DIST firefox-153.3.0esr-hsb.xpi 519218 BLAKE2B 3e3b164ce3a4852a63afe91357ce076b2a3a24ea4419f0e3b7ab4f55d111e094e520e96ee116af96972c289eafc7868e893300362dd69be184bb48070c23fbce SHA512 3efbaebf4730e5473a625da713daed03f51805524e19c8630f2ad695280b8f32f3a7504244c0a52684fdcba6aea51b988efe24476d1d7d3889c3d61034d9ba82
+DIST firefox-153.3.0esr-hu.xpi 523515 BLAKE2B d5db01cf571bfeadf9dc73e60af4dd3fdc425ad60c17f2975767272cc1f0a1f17f02136b3ed364706f0512e649383a8e8bee1a694ee74cc684a82c87e0e53d4c SHA512 69d0bb53c87401e9c8fe03cc77d31d6cdd7a938d1c183c99a8ac2b2b78767b68470bff7756f01ca3c6cb28662be094290ae927119c265ac3dc949fae67aaf09d
+DIST firefox-153.3.0esr-hy-AM.xpi 530423 BLAKE2B 6ee4275f23fdf9f3db58cbaff2a7d6aa9925bf5aa51d7aa310f53710073ed74b4980210b79f5895bbbc7c4fd65bb56d26aba13efbe0ff341bfc64872ba16e43b SHA512 e4bd1e5ba893d72a525540d5d24e6a04d5baab2e5cf385c240e81c2fb83205cd374b1b73853302278e5200300b6b37d09c6b7cf62ea156601cf334a0b3afbad1
+DIST firefox-153.3.0esr-ia.xpi 481814 BLAKE2B 92ce21fc627675d8d83d66dd53228e0b1018c0a70e9333ef79c4df252dc4ac36c1fd9a6382ce5edb53dfed1dd9da284fda5ffc3b7195a7f7e1f155965d5fba87 SHA512 124f0a9958ec789d1895dd38697ac08e2255b836112d3469f78bf0b39525248ee6858c3c4be1abe6d5de028edae82a7cf4f039abdad531abd282e1b18ef6a5be
+DIST firefox-153.3.0esr-id.xpi 453535 BLAKE2B 74d5884f96b9f8a0edea2e48bcd7953b5d45db951f6c4b201b5cbd5074c5422f6b959ed30f1a0a6c881ce05523156b10c25d70e6f2d199df06137693b14e8d03 SHA512 0312675cdc3570d09c997246f6d44ac953e9a5851ce143c9c7c3d373efdd091613a576f2a93c465c5dc228da9b0d32939b7f5f104121ee299d88c26d42d50fbf
+DIST firefox-153.3.0esr-is.xpi 470190 BLAKE2B 79f5bcd7e9b005274f8806d601d63199da697db7e5991a9c5cfe9cc4116a83b25cbbfa240f3f505e2d882968fe618a0e4fc2e3b315b3495594757e5451a11d07 SHA512 d4ab28820bd002beef508d94ee76a246bc0cebaed3a6cc5f4980b5efd4018c52c63ce9308d7e7b89cc19c73e3363ef295f73e07431247b522e4ea17915d32fe7
+DIST firefox-153.3.0esr-it.xpi 494086 BLAKE2B 58a814ab5c97afb731b7da1ce521b228f5d9e119f33672a760e411fd71aafcde3449071d07c2ff16e41c4d4d90413efd4cc9b99498ab4cdca9efa1a4e6de404e SHA512 29e4b99643b71fb0cba53c817e832db68c66e46812b608af11bca408f4eb1f1351fddb95e6a1e766d762fef3fe63aae6df914ad09a30c7c8c13ebc7336d6a075
+DIST firefox-153.3.0esr-ja.xpi 538002 BLAKE2B 84a0b146a6cce3c3ba4108ef7c79e31c935988f66ca6fd0900981cd133a25a1ed56b1dc6290b7887718c96bec807225414820194d360633d8ed65e1798d95de4 SHA512 0236c3b49d2196c45166ee95cd9bf8a5af324da7c7b2dcea300e484a629b22884420efaeab70e48ef8871d03e2e0346efb7ff59c21ffa19f495a5310710c8357
+DIST firefox-153.3.0esr-ka.xpi 557898 BLAKE2B d6026fadff9735ba4c624745f6169bc031232ad8d0543966adf882a9740630ddcd257621d4a2de80a8a23b678ced96e62312308a4c56e9efaa95b4d602986e58 SHA512 bf17d8244c9f9565f4a4e2c466a86d50c5793c8c4fa36ebc45f187014f2489c6e1ecea50517e8c1243eab60727a2d91e72372363a2769e6be24bb2878edace7d
+DIST firefox-153.3.0esr-kab.xpi 454985 BLAKE2B ca28aed41073cd45cfd0e1b1b14459ab32caf6c7acf882eadc913707d6bfd4a248460efc4ee90d26cc8d7cec547e296910e5f043d8554f80e53c5c56f22802f5 SHA512 a380bc30f25236fdec9a40ca4bd8bb09e5414466c760d8201dc18b5edd0ef2c7f22c6f043c269304d8590b089d253488d56a5827d72d9f28b3dc9f05834b432c
+DIST firefox-153.3.0esr-kk.xpi 577024 BLAKE2B 49cdf74bd009075f276d2bc3880b48fd8ceb265c25f99e3f77c329c9af14978447c84f21aee9db315131e180043c371e8c380e947077258a966814cb617bb2c6 SHA512 51b0273135b89a1fe9092a256c79d8e7c7166b9b6feadda64c911cb6d10fbf9ed1519b02565beff993f625291cc577a58f37aee98d78a5c62e14a8abf817d303
+DIST firefox-153.3.0esr-km.xpi 441064 BLAKE2B 46c82abe9e2bd518f7b337ab1f9c08f351fabf29fa0aed7d645065f4effd06dfda80e27907fd2d5867a3c5854e635501f3eb3ae4679e8944ea3fc2fd70c550c5 SHA512 4f2a8d0ad7ff123b4ca60f9a784f2fda63c748a9ca65fa5471d95acd03906d5004f04e85a8cd1eb150e4a299574172154879b337518cbe59f308b41e61a2c52f
+DIST firefox-153.3.0esr-kn.xpi 404822 BLAKE2B d31881f9694b55f97f6c16fc1eb77642ef3b997a0431a62ae759767e506983616398e074e7526384e3cc4c2fd06e4a6b13a4d656bff37d5dcadc4ee126e3d380 SHA512 b09bcd5dfe3f3420ab8c9671284f56c82540a778e3e4e8febe727817e99135a78f38201595f28b65b3a487ddb6dd865853120c5ad05dd2a235fab2717869403f
+DIST firefox-153.3.0esr-ko.xpi 522215 BLAKE2B 89751b31664c45c5e25277e67ff238012a744b1e33931a9a252294198b42dfa8786e6384d4a41fb05142e365ba44107831d51366a0af1593a0f8b62919d9d57d SHA512 3beb085eaad3480d6cf8de53341fa05960aaf69b0f8ec6eec4a7c6de52914942ecafaeb8fde5754c4ad1f315b88502ec62a53fcf794a2e7af23296aafd44c184
+DIST firefox-153.3.0esr-lij.xpi 383791 BLAKE2B eb0490a46babf80c0e86e59fe3ed6f3629f1335cc3a9743ccdbccde76fd79ac9a4d94b172d82b25f82a1d5e21110056a3b9270581e666314ada5587ab5ed1fd5 SHA512 d6880f1b25675b0a21c0ff2dbdbe3467d324fc915f3cc3ea16599fce614ef0afc15f571c56fef5efe1ae03361446d986fbc1a6fed7538ac2e7b9325452e8a9fd
+DIST firefox-153.3.0esr-lt.xpi 424311 BLAKE2B e8ac8bdb09ab86c68bbc031b10bcae67274ba47e5a112d5a467c61275ee45992875545772d9f3e323d3e46f6f54983740ffb9cad42c37a1fa800cbc6bef8c3b0 SHA512 4d9c4b11cbefccfe20047028ef17f7e5da801f8db4d74cf00dc99d0e16845b91418deba2920d0fd82d67eb796abe85a3bd70b4a688b276a39df7f6df8dd88b0d
+DIST firefox-153.3.0esr-lv.xpi 446547 BLAKE2B ac12bd928e56efe00fed51c15155636687db3568be080afe58d21bb89433644b138e3f0c92b727c3a5818b65708633b4997f8e07ed4e7b9a699b1389dbbe1499 SHA512 48d88ce416e0d9d2bf6924dc097c41e5b5a31bc293eacba832e407321c22c0be40508a88a89462dbee4d11df5e75b663143a29b26bc5e39039c7be741235b10e
+DIST firefox-153.3.0esr-mk.xpi 433500 BLAKE2B 84b125f6b262552a57153f608713d8e5f730da10c883975c35a333829e61ac7b4f3553615a0dd3628b70639593d6728f85b57e7ede185831f1e77c54295a00cd SHA512 4b607014eeccff5b5a40c0cff3bb191443997767c0409048c450535b355ff4165722ca487c9d9e4da60b230d584efd1154bf687419cda8e80e2d4fe64c456b5f
+DIST firefox-153.3.0esr-mr.xpi 419488 BLAKE2B 1dd9ab8f90d7079b8d2a95d53858620250cad87b58b862c622a7eed4d1239c65a6e3e69dcd54d0fb1ca9b7825a9657f4427a30283cfe68c7241c6d173139c52a SHA512 a11cf79ff958b7e1befb810778e5735a9bd74d6005348c622839daf3ba053654cd2b400974e8401d3689cc69574dd10812f35e23b810539bcbf176340bf07a49
+DIST firefox-153.3.0esr-ms.xpi 376923 BLAKE2B 566f4dd0079032aa4aee0518f0d3312b8e69bae0046ec8e0a3348f01f42067878649523d2386c83ce685b8e7d03e1bc112b1de613f3b7463858803cb4b4938a3 SHA512 5f563c3429577faeada603c73f1abd8ac69df1fed85196fb2d6f5eac5b09697cec56b1d13ef4bfcfadb1ffdb4694efa090eae6445df2240b4ac9efd8abb37f5e
+DIST firefox-153.3.0esr-my.xpi 416127 BLAKE2B 8b38f7745eedb9be6ac7bf6a725d76eedfbdddb6c6a97e5b8919600e8dfc8044cc795b87c39eebb83482865dd0f5276c8fc5a8f7c79771914df28c5afa82c7c5 SHA512 df7b5de2528c4e07320c512bd9104c9a1ceb8c3f7a3fd5ac44c2fb91ab6c38f025fcad80e295d76c05c9fa5250556dddaf0fb93e278273110b38baec61d8d6bc
+DIST firefox-153.3.0esr-nb-NO.xpi 480797 BLAKE2B fe5c63ae0b0f24396092dde6c32da6a67aa63e2b9653062ff14dee3832402dba4f26d9721bafc6603bdb891c87d452094f284b854f7b7e54fd9cb5d59b663847 SHA512 a2448977b03fa63f053ba23f4233871526b7c7b96bef5a0c42d9cb420be49f1c647c6fa4c7d5cf38d15d2ad1d7c3d156a4c04185e68b369c93d0b679c4c88113
+DIST firefox-153.3.0esr-ne-NP.xpi 417394 BLAKE2B 1cbf82b83884696ecc016eedfd4014970c45bbf24dbffbda4e5fd4813822dce26b1576b6a07c87efe8d969c47c52ccc061df2c00d6c674b338d162de42a88551 SHA512 c37567557751be44d037410841ce2722c3101f9b226adef4ceb34227e019acbc3a5e80e2abc994c3b2b7badae10bf70b7a5373a58c1a14f1f7909e2c67030635
+DIST firefox-153.3.0esr-nl.xpi 488737 BLAKE2B 52344f8fcb70eca155d8cd1610df9105b1731498ce522f3700139382aff127e9a265d8bafbbfb10608616a4390297c18b2f096d563ed0fc4ae4ff2a7afde27dc SHA512 b4ef840dc8718cca4093e77c5e4cb721904bd4a4bfe7efa18b95f9dbe3c5bf353fe373944cc2774580947a8d0caa693b53cd1c0c21721abf7c25b7f29fa4a335
+DIST firefox-153.3.0esr-nn-NO.xpi 484308 BLAKE2B b0f44da70881f1fefa709677e1ab630f5151835893f3ecc2ae4a1ee4c1c9da99605cd13e05fbd24663d5d3154221f8bc4c9f86d94f2c07c0345bf9d9e8c28030 SHA512 ac53d9f225c17e0e7a143f339a4797dbb9b9435f479ffc3c23bc95f0fb1eca91f9240733733c749ca73782513f257f3a5aef1f1a7d1e5f54bd2b3e15c1e81267
+DIST firefox-153.3.0esr-oc.xpi 448022 BLAKE2B 1406b2613b5aae9199856ac5af0ca020c83240ffdf61412d655b948d83a4a77b19e81fd09148c4df878d83cf0b93db1ec2e2fad6b7069c3345c8da1dcf9e9bfb SHA512 d0040cdcc3922c1249779d5eec7e43e50c24b2994746623cc0ab6bf7e28ebbbd0765d98da58803f71984cad3b5d7e9c333821d403b9a6de8d729dbda807f389d
+DIST firefox-153.3.0esr-pa-IN.xpi 571728 BLAKE2B cfd7a93768fd120fe64ca57b3e068539c3fc933781d2ac3aff365ac7540f0134e16f4dc81b998627c2db7264e8ec375ef0d69814b902fb77786edc165d144a20 SHA512 1aba4f146afa610e832da7fd89770be9391c69b814d060453897b8b34dc0df124c9b71db094e603bb5ae1d748694edd33faec5d0b317143571860544043f2ed2
+DIST firefox-153.3.0esr-pl.xpi 520270 BLAKE2B 912c5b1b3075458076f75d779b0d3469404fa6631f64e7437e265f6bc71f5fe945b60abfe0363043de4e3602e23d7d815395a27a95125111c55266720dff341e SHA512 c949d815438af124eb7db084f4a4235552c8bed4673bb8cfd72337ed75a6e8b328e2cffce2b88fa6610ffe341abb98dd0eb0f058975f1e80c569b7d4b7d1f3c6
+DIST firefox-153.3.0esr-pt-BR.xpi 493483 BLAKE2B 72fbed87485779194d74968475f0a2bb318f594426767c764f4a0d27abd6223910c835e7bee84261a2ed671ed893c9af6f593ce9a6cf55142452efdf517a0507 SHA512 dfa5cc001ddb432d433e69454a8896d6be9f6ce2d89e72349d871259ec8718fafb0d08031440559c18c4230a7ad0719b7f519f188a16adc9d9433d7cef403f7c
+DIST firefox-153.3.0esr-pt-PT.xpi 496370 BLAKE2B 8f37e2b200c91410051024aabe3695c4366395d5c983ccadff8d78d7bc4741215e0c24ecb4125b1711002588c71875c033adf011beafdead5375a1587a5eb6dc SHA512 2b4b8fddec1bcbe1e7eba0b50332cc61fc0b86b997a9a99928cde114e9998565d51974e30f4cebb9e88ed3696911f2170388dc074cdee7e1e1670dc2ed56b4c1
+DIST firefox-153.3.0esr-rm.xpi 473901 BLAKE2B df1505bd184ec3cdfac5b50774035b9abce38485c39927f050d84f53df7ea33bdebaa032e1581e38d53b916c965e42d8b6be823106b49f68978f041a642b799a SHA512 73c5d5b3cea572f18a3acea6d4f6babf0e2645d852a4d6b52bb9166ebc8e5df3aaa2065aa9807ce1ec3cbed872602dc43102898d9f2d3f5805db36a83e126403
+DIST firefox-153.3.0esr-ro.xpi 507663 BLAKE2B 8cac3cadd6851b33a4616d34700e5d9fd485907ef94d2dd29df5c88be935950cbc2ca04dee1f6d320dfd516e3f07fa2419325f869571beba3376b953ee64f34e SHA512 eba8f2fedfea9f05c2eba78d79f289eaf3765a4673888b1d4510575fc286603948dc247f046f9890a5f53da19ccaed2d98a4ff630c25462b09aa44a812811769
+DIST firefox-153.3.0esr-ru.xpi 589739 BLAKE2B 31b5e694e941685170387b118e4d470ba770a8cf0273ef0ffb989684d9c0a325557a45ae23f70ffb9a10203d37d80ac9292fca41205b8d9409b46b878e7c125d SHA512 bf26f7b08c8053966f8c331b9166fc46c0a31b485e1413b4b91543786d9a32f0b769e2de29fe9818acd9c557a02caaa762a5e66ae5427513a9684b6fd6e92cf7
+DIST firefox-153.3.0esr-sc.xpi 472550 BLAKE2B 4622da5aac838feac74c86b313ef96f3d07758a0c064fa50316de92914acb7c80371601ab30114f3dc7d427a7c3750310c2553046bab98eca48714a87a343e0a SHA512 ff396060117a9bc9eb93e7e860a1947c6deb4dbf8eef77c2bc8d227415e7bfffb95223672a7d660761caaa7389678ccb650448af3f44a3d558212e97710689bd
+DIST firefox-153.3.0esr-sco.xpi 387153 BLAKE2B 0dacb7491b95391dd4069bcac916cb9f9ef827fbb18cf5c18b13f9c8419dd0a2c573455ba136fda16b10f3f826b3880389741c5c697ac56748738d29c7bb0315 SHA512 c2112599645e76ac7165686bfcafa91825ab6a2e72776d18a689d2c8cc9b168fc8ab8b718237748b73aeae3d06b34e5426e017dd0d032a9f6106e0e000fb25d2
+DIST firefox-153.3.0esr-si.xpi 465594 BLAKE2B e6aa85eae47c52dcc59cfb3ed7003c7a9cbe3b3bd23b68f9be691e14caf9b04b8addb2904a208da264739c76d4bd1f3fcfed59245d9403a972d33b46de42a0df SHA512 9fa50f9e9310ef37de28b5c7980b68a4484d021c38d3d9b7d8923620c552b416c79dc4629d8f9341efc0ba3664e26509863aa3b4fe3a143c2cabdd735c26809e
+DIST firefox-153.3.0esr-sk.xpi 526450 BLAKE2B ba456403e41879f0381e1341811e9ddf7ac32241db55a9fbe91a04c8a19306f63ac2c25def0d08da03ecd79f453b9a51fa9cd98f04f666706e351288ffd307c4 SHA512 7033be59d159cdf0fd0a5c81cd32ec4f1164023c7542775869f879b1ba96456e7615ef524ad2e11326ac1a33f93a1515a38d7893d31d14a481bd833ef2d1d0bf
+DIST firefox-153.3.0esr-skr.xpi 513165 BLAKE2B 834c37e1f2bc30157829fe5c79f6fd0cd4a7c62df2b5407ff1abcf31df0997b5bb84249fd553a6cba458b43e74aefda70951eebbcead1e75211a9244f07130bf SHA512 c1f647dd36223bb4fa42f8a5f27936996a53243d8bd8b35541d3f3669d3ead2441abdd4218875dfdbdb4f066a7e3919884f1a88ba8ae86d95985b8b214f67356
+DIST firefox-153.3.0esr-sl.xpi 498004 BLAKE2B 21a59d4448041c19e4a5960073ed3488a5a6e7ef9cf3e860c1b294d59304bc44f5b7c3e38ac78fa7ab9408b60e0b49e980c6fdd2076c4c67a1b37753805c45cb SHA512 9731c2e50b79fdf33313ea69759c5549f62fedfa8dab87eefa5dbffb96eef4513f295da14a129892f8a43be65bbaa999fa31e0cc81c170a46e7af8cc40f8f80d
+DIST firefox-153.3.0esr-son.xpi 349734 BLAKE2B d7c9461cfca8eb209ac8e196d35dd5ac9996ac8dbeed5b0c223ae885c6d116f2c16f44b226c4d3b9cc3b1188607420e83034cf2385d29207a2f4f66a851d06d4 SHA512 3e14efc290fcd1347aa0d43fb3878952a2cc259078ece550bf20050053563e164a0725eb85c2939bf3902f79aa769745d3dee41f6599f23d5a2baf6719b1ae1c
+DIST firefox-153.3.0esr-sq.xpi 503774 BLAKE2B 1332e35193d00dd597706f241b7588eedef0dd7465eada35e71ecef8b05b7cb73f5a8800a509a85623dd8182f0cc0c17fefe13b110f16b546bec5ffcfef1a256 SHA512 01c9a6809715d082ec25687ce7e23307bf79d8cb254adaa1d278659445aac62c2a3ef543d9ca57c0743680a81b8e7b0a76c9331c409ab852c31e3735d15a8f55
+DIST firefox-153.3.0esr-sr.xpi 561301 BLAKE2B 1ee9bbab72107d3bff8c6c756d88652c019c621ac32cf0b8a61807d5a416427317350090b529ed0714e2097cb753c19b4ba5d57c6ba9b35bbb940fc4b740c7c0 SHA512 31f29415a17746165f7f3db0db6362354aa2e294e9b428a1b1c857f96d652dea6347f194603955753b86b62a1082f3e09ceab2c68d1d206c35ee1087911ab50a
+DIST firefox-153.3.0esr-sv-SE.xpi 488226 BLAKE2B d22b77a69e2e9ffe28aef71f3a6733d1464c482f2a5463606534030cd4a4dae341c0e1b5ed58f334525b2b5f67a73f04768e890477d45501dc4f122f266222d7 SHA512 a917a06d9d680a1cbea2137614a5f753728671a40eb47c3bf810cbc7dc79c30f717fa97049781906becd3d96d4c096ac85b89b61f11244a5d1bbc7f4930f2292
+DIST firefox-153.3.0esr-szl.xpi 406383 BLAKE2B 547bc6ee1bb8956cf54a9c103bb818eaadec1eecfb077bd76bb4b5b6f9e44b064e31f78a97707ad8982086d8bd9f2ee986461c0ef5f7893b96c2723d054449fe SHA512 29d16c56443b4d6342c4f63f37fa41e1647459cc79ff3a71eb63e539676ed7a4a714f122a299522da22274724c0a6088d95d50544fe09c71592d6277e8b9c1c3
+DIST firefox-153.3.0esr-ta.xpi 407904 BLAKE2B d3f7347f84aca35b7e30db056b6a8e5c394e67ccb9eb8edc2290490ede13497184ec3afa670350f9552dbb5ad6ded1cc0e2cf5a074826e7053106a29791419f8 SHA512 c8b16a5cdfb3f6e0bf740bf0a11cdcceda863d7891c6bd70c7009fe1917b88da6332f095c8604dce64961861b6c3e2686414036aaeaa15a239c87af4da81e424
+DIST firefox-153.3.0esr-te.xpi 447101 BLAKE2B 39a0a23688040daa46c2a9cf86d8897bda90e0af15c40c89bb44dc0d7f7a34efb596813fa7acf788a817c0433893acd623af02f8312c6b881e681d3dc91df0cb SHA512 36511e17819ef6c8b756d6a4bc02eb81ce3d0fa5cf589db1e5614b15a7abb9d6d30b341e5159175c15d350b3e3c67b9482476ee86b298166949437c45448328f
+DIST firefox-153.3.0esr-th.xpi 565321 BLAKE2B 778a146065b7421c8bfa68ea44455bf1ef9923888f6b5874f03feaaf4d59db52b4f7bda58f02df07e577ee6dcaccb53cc04220c8cb250f72bc5bae3bf59ebcae SHA512 005c86d5016bd42842be29dece5a4c075eef6378b7c859361edc8f2d24998714188212a686f9daf1d03ee2708dea445694f1a53f279955aef62d4c078be7ec7e
+DIST firefox-153.3.0esr-tl.xpi 404043 BLAKE2B 25f93b72b6369427f5b05a6d31e6e9bb84c3964ae2cfb188dff16d8e0d77cfbc6b4516a0ac15360bbc395fc860da9332c8db2dabc81e031b807b21de3f3a0de0 SHA512 0c80bb4f2485c2b8500cdaa36c1875152755c16cadb5c480d2d5dc65233146ea07a1d221d9cce55b79d97859914df3e1cece3c2a7571a5d87e402987c7d106ba
+DIST firefox-153.3.0esr-tr.xpi 503091 BLAKE2B a96b950019a5ae1be5035095f34a170b0c7e547d7e386211aa184cea22469e67e3fe0cb6eccb3fdc5b8af8729555aa98ee176308c5cf367d0877f3a054b4503e SHA512 e6182a4b28b3c5fd8418c4b8d59776f73f88cae1ee8d36cc528b46b21eeb37066a1fbb0d4b3a98ae28063685beadbe2618df9164812217671616bb95c946960e
+DIST firefox-153.3.0esr-trs.xpi 394763 BLAKE2B 7ba54355df40fb9db081f8b6ba6f94e6bd1e8c696f68e7d22bdacd2759f11b80d42da0d79735fdadb50ec7dc04782a2cdcabb1298443435d6bdcea27c0694e94 SHA512 e98b988cd9a6d5e1d1d3b6386e94dcab3932aa85bbd652e31749cd48cc48c6404aa38ec117c1c6250e51dc8cc9403ac8be9d4c5463d85fe784f5e6221b6298ea
+DIST firefox-153.3.0esr-uk.xpi 575400 BLAKE2B eecb7961101c283955f5ea1fcb659bd36f98f3e7b48b919a76265ac227975477aca4932211be1e948148722694c4eae6427169a889b53f7ffa15939fef02c58b SHA512 901bba5e6e0ffa395e07987c4b0c6a5c4ced90dc2f2e7a765310bb3ae9c14b72c3e9783b6b6d7d4543ba99d37e0ccac5df13722befe7281f24fd717b21af82fd
+DIST firefox-153.3.0esr-ur.xpi 429265 BLAKE2B 253f35517fe8d99c0f7a61b05c4ddb02e04e0e4ca6588a97c179f6865fa863ffe3ce3533b2d324b8a2e7a93b4c226b2ea0037b873ec04990266058854eae679a SHA512 6d5ea1d9074810adb029e70237627c56c2b69c1702474675dea02882a55f1c5ce40475c2bc652042f99ff37c3091e12f47f28b50adac8bb41b203014e40f7816
+DIST firefox-153.3.0esr-uz.xpi 376279 BLAKE2B 34b14e375d84c1bf691ba8e8193facf8e611a4666046da07865235fb22fc2825815c57967c1e5e36a63c59d1eb015b40041e248a10934c7685d5e4297aa6443f SHA512 42cdb5e17c0ac4911ed3f2e2df582df19d38db2914ed06870c6602359b08aa01ea017632b6f63f707d2ee968f9ad1c7d291327379f9e7e3301a0e148dfa17d45
+DIST firefox-153.3.0esr-vi.xpi 527410 BLAKE2B 2fdf1e2d3a29077084d64b5db694f86366c2f891ef64f29882ce89805837c55a6a99a83a34d7000b3ff464627b4023d03a246bf4762ab2a8d9fbbe1b405197ba SHA512 e7e38e72a04abbd72c60ccb20ed61eeb826c6260e209445194cb61317da5d823ae09ece95e2dd1c7267081ca42a58ac761141b2b47757cd05f8fddc77725d62a
+DIST firefox-153.3.0esr-xh.xpi 355152 BLAKE2B bb56583fee4e46fa098033d176fbbb6a01ac02b0a1895b8fcedba40003951ed7ac165a5978d4ee55b56bbbe3db75ca92f7561bef2181ff3032da55c4233800e4 SHA512 f54f5dfc3af2aa75de0dc81a85c63a63022c1cddbcad6d285c358a2ab64ec78338ea86927244c0f331d23c96f34465e2f6b328da6f8261b8f52fc458ec3092b3
+DIST firefox-153.3.0esr-zh-CN.xpi 514286 BLAKE2B 8e7d7c17a4b9721d941e28db3c85188805034a81f3998a5887f51e3028620a5b5cd7dad42842dfd797885d91553c2644f165be42c50bb089be9d5ea99c48e3d1 SHA512 7b4d978e388177d7e1183db7507f756beae3eb05e14ebe6d3a3af876d123861b1954d83b9e0e7a043f6642cadd198ce2693a7edfc9272cac466e137a8d7b1e8f
+DIST firefox-153.3.0esr-zh-TW.xpi 518963 BLAKE2B c418dadab092e69fab9881d83fee9fa644baf7ece075ecb503849fdbb53d091c74fe4a74a07b78385aa448fc50e10bde8f5cc96c384c66feee668d4b7eb458e9 SHA512 33d46693bd165b61cbfb05becad941f977c00d8b0e8013a95cc29792a5209f329c1321b4e2a67f045683393a96cc54720e79fe1d162d31cd69cd3e3f6c142a21
 DIST firefox-155.0-ach.xpi 368807 BLAKE2B 8d1f6af5034a7214d8bddc59360a297c2f6da320e2a35891182ce7c23361ff3307c4dfecc0ba336806fc0772bc86be5124e92b6bc8541756ce5a4931f7036748 SHA512 e386a08f858480fb1122a0d39a43b7a2e812614ea6da05b07d6611098469d649036df70efd8306d339de97671e69aa88f5b5dfa4b4a8d89547ec5e9c5261ea3f
 DIST firefox-155.0-af.xpi 355024 BLAKE2B 1bf0c0953888ea402fdd7c81026fe8628b38d0aa0a96641f6f2736c40c752ea36a7340e3efeb265ee7816edab800299e80c5130e153b2ad59940161ec3f48fd2 SHA512 be1d7e85e6189e6ff6738b7e084a6a4f8d70787277a9e2dd7688c1caa4d2815222ea229196298ecf823af2d97fdff6b1353c62916771e686f4b374d788e4412b
 DIST firefox-155.0-an.xpi 397598 BLAKE2B 153418e965ee0540c20e1729cd707a5dd622a7a6cdac3bd9a092ba561a36a0bd682509301df2916891c83117513e6f137ac21e9d9cee98007435882a3a957e9f SHA512 46b6212ab862fe7c0d1551c76533f9692a4a667a505c73b9bf1e5880f560d44f12c0b138032ab6bd26ed58b23f4ac3b7d9795a13e412ea900f2665fba85b5f98
@@ -298,3 +398,103 @@ DIST firefox-155.0.1-vi.xpi 547935 BLAKE2B 61bb455a62fe6f47e74cd44632498d3ceaf41
 DIST firefox-155.0.1-xh.xpi 360264 BLAKE2B 7e9946dcaafc599ed1e810db8036651aa4aed98425fe5a615a5669eaa99b0f884df7659b8b7e4c1fe62ef12049be1142efe9b6197fb3cc6a8402d72d880c29f3 SHA512 f1501f619d9f2b962b1b7f189d52c5259d31f8476cd80a83bc982f54ad45075f60d28bd7979fad6f90fe8d95eaec23de578de9ba031b7ce9e9f595842eaff9aa
 DIST firefox-155.0.1-zh-CN.xpi 533213 BLAKE2B 4f509855878f406d891a52435cd82d3a4692b93cafd1aee76188382fc68e7bc96b4e7e396e82697b6e73eed2727cc4a22d3adc8c1144504788cc3be9b6b315e1 SHA512 0254ea3dcb87bd51fdc6446e15985101984985de26a16b3ad60b69becc885660d1f8a8cde783d0f4eec49d9b75197c7eb135405c2c9a88d9b329ea25868cb0a2
 DIST firefox-155.0.1-zh-TW.xpi 539312 BLAKE2B 070182136cac1bc6e7d27524eb6ae439682c87d149a17727a48f56ef7d7362d47f5b9cb9b1c0dc6cdfa0a87c298686e3a72fbb89fd91bc605eb941aa1d8db473 SHA512 5ca9738a71c97cf5d7538ecd4052d5ec3488bf410a1e36abc6843d1098961744967ceb413cc26a0b8ba12fadba694679c1b0a1b3c303383ee20a8f96e651726c
+DIST firefox-156.0-ach.xpi 371199 BLAKE2B 487a0a026c7f4c9b2ae5a90cca9623e32692722f8283f86a5e0cd68255e57be5820ac3a78c5f0c8259c68d2034e0d0a66fe75c0bf7e1b311709b10cc38f2a904 SHA512 628077283a37ae8f764ba373c2f60bbdb749f867230aaae1040a97f8a43f4a2c7f7d993ef539d013b8b6bdcebdac2683dd9be034766f9e34733bf6012bc391d4
+DIST firefox-156.0-af.xpi 357416 BLAKE2B 13165df29ab56b34a20eac5f20d4b815f9fd80ebf4838807dd444be09a3c6884e7b069fa0f7c35f69213f69e651146bf09d9ca57a370775bd224fcae662f5c93 SHA512 735e52d63f84037ecae2043481eec725e3467ce58cca5c74a97fe2fbb8696bd134ce8c221a564b0bfe52945447deddc7536856e43b229538624ff3aa26228b8f
+DIST firefox-156.0-an.xpi 400004 BLAKE2B a30fe48bd33fb97792dd9ecf41ac07f76c5010665713ae4b379a787b87c16ed7f64d33ac770050e6bb8e0852a36840d2587c1d73a74e1b14b6880b8f8709e70a SHA512 16fca1b3d5755e6d5a6adeaa23a3b078e78f5d5f7866dd167f2c95fd0fcc69813bb78cecf081a179aac34bc7a11eb8b177bb5404f4b019bdb359d5f815e48338
+DIST firefox-156.0-ar.xpi 545263 BLAKE2B 3476535243902c1f314d3d3caadcff56bfb0477fdbb276cebbbc6eabb6cf5e31a7d8e327bdf8b6e32af84e17f700c7862575554ab8bf01d9fee4386ccfe6727e SHA512 725e698c0432513fd00acd3c4a22e8cf890d29f882361eb530eeef540d8ca800204c9c7c56661d8d8e5d06f1198b552e9d26c2518f58a6bda8aa6c2282732dd1
+DIST firefox-156.0-ast.xpi 394994 BLAKE2B c9932eb0e62c3f821e694ac2aef21d1dde2bce4feb6338cb2bb27c0e9eb5acf059a821924dabe4dd8a66c6226f0d6efa983a2342f6d807b32baf1f227ea33e4f SHA512 2f09bd5c6ee00bd589fa7e0b7a50734aab3b9f61ebac34a0194c37b75e174077cd675f4c14c70ad66884484edd9c68e8424df5dd399aee5bd0b179376a417007
+DIST firefox-156.0-az.xpi 411675 BLAKE2B a3d991694ecc05df7ca9e77c3ab0899ce41e0c6e810900179e20ff996a2fc50a5786de3dc8d881c419ca85ab70e2390a1681144dbc8d9a574b652970c878903a SHA512 e373c35e981394241030752892cf508d2dba143d05a989a3fc7ed0ee7a9b73f47463cda831ed1f0f02b5eb15daa877865da03457fe5052479d9ed32650fd5613
+DIST firefox-156.0-be.xpi 613960 BLAKE2B 1824f39ddb78553c1a0d63e44531ec4f68dbd8fdfa5b4d69d293ca230dd6053975de4e95f773ba38b003aee662cb683b133b3661bbb351a39e5a9cc136b4d29b SHA512 9c6088ad20338c6e04fbf3c923a825acfdb17c0b6ee0462fa09517bc4f2427a1bf88ef9c657e3bfa26c9954f27a29031f263284ad587a9590f1e30e161efdd74
+DIST firefox-156.0-bg.xpi 522248 BLAKE2B 65a2667620a80432b425b7d4a5f226a36cefcb66715215d4744e034d14b2a863cfecb2f5a1114bff94dbca316b40b74c94e461d84f55c6e6d9a92531433f0417 SHA512 464a8ec781b73299242e83c03715ae00fd256c651c4c4f27dc25af3e15dcf636062fd5c8d0f48fc1c289ca58fc3b48ae6631a2dae93ddfe7d96cee1b2ad6f253
+DIST firefox-156.0-bn.xpi 471076 BLAKE2B d50b866ac0d3bd045a467ab4a105ed6cd6939ca9d96041ab5571b3cc9e539057fb7b77b7b59c15cbcec95b961de9f2ae41006d31e3d837aa708c7e2ecfd742ef SHA512 1c52a1b7c18d4e90a65eed9e032fa4f1865a36c85b269560aa609cb25d6fc5481637c245dd831ec2fd0ff6cfa4a01cee80ad97794a4faed3bd62d7513dc12a83
+DIST firefox-156.0-br.xpi 442881 BLAKE2B fb58458adcdcd59b95d698ba1697040f27912f48f8b3efd68c3e6fa44b638ebcdf74e4adf2cbd8e742a227f32113ef41c0fb7eb5a7c4d1d13493a790200dca34 SHA512 cb4ae980e899ef8b7396166efdd2364ac08d7c7d8575850102b37eeadedce023af68889d84a36fda140701ca7265df50eac5caa4bbb70027d65336dc445d8910
+DIST firefox-156.0-bs.xpi 477184 BLAKE2B 2aabce4da6d29ec9287f971d3aa8a6dccb0aaa473d1b69f98af4a92923b68bf9bfb718f5fb5312dd93af0f7eadab43b84192e532d44e38874f583e376dbe885b SHA512 4138386ba54d0a28da637bb48868a51bc80b2a656715b244febedae06c459fdc1571fb57e0bf62808c3f0ffe1414d020b6062eabdd94fba24ec460094ccb5a81
+DIST firefox-156.0-ca-valencia.xpi 420707 BLAKE2B 7d3e8f0119ece43489ecf7c5d366667feec0eb3c8caf1da69be44b01d6ebbf3ce3f90ded42088374e53de5bcc30d0f74df1ec3b952b4dee119e8ea2126736613 SHA512 57a8e9e4d3aecfc9601e7ebfb1a5dc04675cb1a5835ae0cdd78782c96b2d60736d28f1bf65e171d49237e5cff4842471c1a83f307857823fa51dec42d5f559f5
+DIST firefox-156.0-ca.xpi 502363 BLAKE2B 55f3d4f1d5bb7af6700b82189b37cbbe7b3a0f6355b0c70d181186ad659ebc936d0172be625200f401a1b285c809c98da6dfa8ba2df157a9f39a9ab070f41371 SHA512 553a6379ee3f2c96f28286de1cd36aef96e4a48915c88b465f8b94ca8350dcd4038b7c3d172627e286fc16dd5ff5126123c11cee5c6eccbf3b82b174d178f0ad
+DIST firefox-156.0-cak.xpi 445409 BLAKE2B 5409270467ea3dd60a421dd7c24d6b02016a0839e09c2ce3ade0d72a8d988292e66f2bbf1dcc057e13185c5a53d13a95b08953974bc09cda5b47ff2d8888c383 SHA512 f9c811e24f00764c7d2e5f49a098798e841f771b868ecd0a571a0d5e100c795931a17b577392d7ad27babb3a550cefad31e1f8d1bcf669fb0f3b130c866e4312
+DIST firefox-156.0-cs.xpi 562395 BLAKE2B 43dbf02a95eda2088e134fa3e0588ec3e77ae3a387d4d6da96e9b4725a4dc3e7e4b1f61a5ac0026034ed0b27c44dc95cb031b8734586c1c9bdced100fe94e16d SHA512 6804873fd11e658c7d7aed5ab71f8df524920ff675973055648f2f48d2c446aba32ff24ef1d0e72dff8b33f0ce5c973d0e8f4ddc096c83299be64ec7041321e1
+DIST firefox-156.0-cy.xpi 520043 BLAKE2B d139a7619a36aebf95aeb7d6c333bdb5dc02cc717ab4368a6a50312de2e9d84310bbc3a48ccbecebea140cc5cd0216c42dd1996cdf372d1c08d424f58f3f96bc SHA512 33e15b11fd8ca9f13431d512e470a0639c07bd763367a37c44d4349e2ccb3bf6254c2d50967c67f3c2250905a07e09c67947798f54507e02fbd90d94210c3c8b
+DIST firefox-156.0-da.xpi 491164 BLAKE2B 449da7063f68f485c697b0b6cb97e0005c4de8bae59a5a2600ecb33ba6f03e28fca14761ac8f791d91d58046dd50c562481d2bfbd70e96a52059ac4e80c9a7e6 SHA512 764f8f200f1eafd1058a56b3c528c9b1409a30c69ed80afb5f5b30794f77b71e469685b86fac382be3cd3e2722e2eacb26edffd4c2e3b72088925c50c7fa8b46
+DIST firefox-156.0-de.xpi 531748 BLAKE2B 71c8ceb259cc5d18c76634057214e9a605e2340a4792004825ec1bbe30c1308e6f9fb2339cc014054791a7903ad22c88ab88b702d6434279db8cf5b12fd154a3 SHA512 7ee6f664577872aa09b8d97abe412a1df9c13cdd028340342ec8235c19fe6e4fed53dee2b73b30d366b2a84fab2e017b93d54c6de5386a18b1f0a11b0453e0ab
+DIST firefox-156.0-dsb.xpi 547083 BLAKE2B 87870af4226a8e9cafe8620394d7ad251cb66edfd2518df1b9d3ed656bf9115667768b79110205ebf90c4465e699143a31055b07490a48fe3bc12cdd51610047 SHA512 2fd73237d36d65ebcf68ec45cfc408dfa10966d6293c547b6c334ce91f8df7635799a9b63d07938c7a35d2b214ee482e9e2504609dbcac8908e0fe05e6e2703f
+DIST firefox-156.0-el.xpi 630953 BLAKE2B 72879f0598f0b780f1de8225ca4fa5feb8eb34b2cbd3217767ea912346205b0d78f006e7b2140869f11c2855285e266b2361da9fbb3997ae008ac409f9a977c5 SHA512 cd4520bcede76d50ecfa327bd483d4b8ab6c7d4a2e7a880fdc470ae8984ba53efcab15df775370d2a9837c028f96c95c16e8df384ec0a8789c93a95857f29e22
+DIST firefox-156.0-en-CA.xpi 479495 BLAKE2B 937ab35af1f0a877393ec41dad587df99e1b2523fde2dfcad2eaff4bc73d76673a2864b0c1b0c8f96e588fc3672a73b8c0c9f736498d73ca56f240beea50c868 SHA512 aa80802b97262295b0ac1dd6d17be141eca205a991ae9f904a4835075b0054d20339ecee777943e64405cee37b1a31dea6c662d000ec17cfb57232747627758d
+DIST firefox-156.0-en-GB.xpi 480250 BLAKE2B 74dd0be80979ed3ff49f43459ee093520011ada77f0459c12e9570815c9062819e714e4edd273d235324dc98de3debeaff79c0fbcf707371bfdf5b7b4d303129 SHA512 36557cd4a97219ff25cce1c259a2bea37ef982871bb23f504805d1a02911138c41284726189cc8f83af6a7c3b0daa3b62f99c90198add8b76fe4044fb26e2bfc
+DIST firefox-156.0-eo.xpi 507133 BLAKE2B a69b524e427eccbb6cc767985dc44048acb7bb95d7f582d5a917c7d5b7d52d4d89d4bbe3d8aa50699fdc1f884c94437942d0499364a4f9d0be3a774e5b4d90d4 SHA512 62cab6b3367f67fc191da4f80de92f9218444850d9ef0c15723ac80b9a58de7806f0d83d69178f976569b8c308440d21ccabf2aad65aa9b0137781413c0ecf6b
+DIST firefox-156.0-es-AR.xpi 520969 BLAKE2B d840522ba69936c57b782ec630eb3d7cea1a6917c250c3858b4c9bf069753d7b9006b7e2022e4cb1b6efda820cc3a160b2a61b572534ca5874cc3b3a0fbd98f8 SHA512 c7262f7a9b08a40d2027900f80cc7f570b7ec8502c19c949eef6a9c07dc18a75e6fb34dc823846968b5b3ef53a16aa6dccbf0a4a143bd26fece2c2e945a7ee60
+DIST firefox-156.0-es-CL.xpi 523361 BLAKE2B cbe225a08da14e183640581e1da532ee2a747e257699226d6f6018565c7cf06737b54349f38448f60c0e201545f67a7af2e635e7497edf99845f58b2d2feeb0f SHA512 7caaaa64a36c2990af42088d11386e91cfa38c48f3cab60b8538f6b7f8e56c14b1f2bac88a7d1d5bff7d44057732675530bacbcb84a4921c799fba980435ef07
+DIST firefox-156.0-es-ES.xpi 511130 BLAKE2B d64d0a5e45e7aad3f244060ba1d83dac330d6379db99f4c2f8965439905a7bbe13ebcccb43da705151038b28eeda1a283ec9a8f0148191d04d858475b5c88454 SHA512 f0eaceba8e3b0f680a04a9afd6c100b277c98c06157cce5476b1af76a8bca53f9e4d8bf7261e3ff845167cb0bf9e33992304ce8afaaa8aeb3c98e1713b1998dd
+DIST firefox-156.0-es-MX.xpi 521219 BLAKE2B 5cb4c41083cdc118d3f1bd597748a5bc01205938dbbb8007100f03f4d42dfeb1dac99c096d6cc1056fe08536e4cba4e033a948dc1826a1454975bdaf30fc62d9 SHA512 feabea574a036623ddba51410784c440f4013f90c367162c90091fcb548f0d0ef2e56c2a25822630b739a52926b3f43d7e3793aa9ab4f5a17e4b4204e3d2d458
+DIST firefox-156.0-et.xpi 410226 BLAKE2B 0cd5089b26985ff0426b9eee3458aca61d7a6d9757b8e9679edb111ef42b6b1f959e06c0cd688598d3d46617901b12511c259e44e039b82801a87fd45f227f92 SHA512 e0538b446a18f27baacac5095e86ddf591ae94e5f7666b04231e560ebe8ade489aafd2baef4c9cae25b8078bee12973f4654708601d2dd881399b878af016608
+DIST firefox-156.0-eu.xpi 505930 BLAKE2B 919ebca65d123cf85d3ac975d8f8fe9325306108dbb9a42c54c6ae14f8a3f8fe0be7cc146829ddbb47bbe5f7c443c7b059de27cb2d162f141b992ed18daf0f67 SHA512 ce3889f06770340e6250525bce762026280e85e44f68c7f6de7fd69adb2196ef81853463d2f8d544cf9e6725790034cfb8327504bb8eb2697029973cd1dac4f4
+DIST firefox-156.0-fa.xpi 477674 BLAKE2B 599013a640e9cdae89f63683027a9d15b938fb93e5d1384269c42728e712ae7ad1b9ef2e76691e9780af9fd2d4016d3ca082a805650ec3c73add8a0f6fe9ff42 SHA512 166ad3e29ad966dab625065cefae1248b715911c0b62cb48c400f25f30e6a0a55fcea2d1e5e5cc2ce77131d602986defc2c18111db54f6b3fa9605f70b2876b3
+DIST firefox-156.0-ff.xpi 382752 BLAKE2B dbeabd1b06ec0b122e34ddce71e77dbcd2b345cbefe735952191ef9cc1982e4ee31c4ddf41078cbb94c92bdc0c3061bfc74f9d976b102064b1eb99251df2f46f SHA512 99802490e487b408bf4491b1ec68468830671fd679a49c24f0f4dade827ec2597eeb393e42cee18b6027a399daf43c765aa1620aed07e69c56c4f6d398d0185f
+DIST firefox-156.0-fi.xpi 510180 BLAKE2B a83be8e5488aac045be0abee8694e712858e501abe0d34e5a2c8b59ce531d804ed6cc27320d67afa563c5867007d521df8238f5332c3abb410ff76ae3ad93c3e SHA512 2d2008887d3f6d89f78f2199ad6c6db6058fb5766b2c6ace70861e43b1d829efa209e97bc459475468fe1149fcda2c2ca4dfde83281ead54d366ff0615890290
+DIST firefox-156.0-fr.xpi 538109 BLAKE2B 8dba29a73d331e87276c50eab2ff53ab6c9b60bda0eaef920dd867a139281d396bf08a77effb49b123f10dcbcdb721e4735f909b4da70f1ffb6909cd652c74df SHA512 d4d0e8f650e650d63837f0fb751d1cf6c21322f27b5ce5f13c1720b5830ba839ef2ea26769e1baacfc11ee14073e04a29df819c3c24d0a3d48a7cf7324a47d22
+DIST firefox-156.0-fur.xpi 511342 BLAKE2B e96fe67874456ed19325cd1bf030f1ed0f44f1d51a478d6c38f00a1a593bc3550570e489308e4800eff001337677a1fdcdbfa6f281b0c798ec3d954604b9e672 SHA512 ad990d424fa48f39defe4ed745566b5cd360f24400f02bfae96df4733fe6f6e0e45132ce2a702fe18bb22fb41cbdd5e98c309be5810e04f70c7f63759022f8c8
+DIST firefox-156.0-fy-NL.xpi 516878 BLAKE2B adf410f2fb30873481335bb52313401362e9bb1a7e35e44272dd605e38c9fd6bbe4a63b847b6b96e6bcecc372509e52d65fa9d5a36dddf9b35ab78a59003c29c SHA512 b17443fe59b17d15281d0c4b5099f98ed0976fdee0e67c12df1071671d71ed0387f44dada1d924599f2ce0adb833ed4abcc60133dbb38b01c638585927f9997f
+DIST firefox-156.0-ga-IE.xpi 394629 BLAKE2B d8a5cbe21d9b67b87ecd9e3ae0928c271331b59dd5028929a448cced2c554a3a219409f8a860fc851feabb5cb17f9ced8ae8e8ecc8117253e050b3b75722d861 SHA512 366f3778864ea76cfdc374b386c209d9208fab68d66b0ca45f1608ab85c4a26d9cb41da10bba54bd959af388b8b17217590da87239d8b720228e85e68702dd7c
+DIST firefox-156.0-gd.xpi 451730 BLAKE2B a1428c43e3da3c57c33279562e29586d7b7b0d42d4eacd0927874c1a15383614781da34206f47022b6e9207731cad0422143ceb28d21a0a010f8f122a26a7422 SHA512 5023531dee556cc3c4a3331cab0c34b4132e8f4c8290dd8c318ee583a847d8f6b872e610cd912240079892d61f9943d07c888723ee328a243637d3e2f482fad2
+DIST firefox-156.0-gl.xpi 473490 BLAKE2B d01d46c28f768ab76831fabaaefb6e027dde40455493962f046b229cf89dafd2330175c1bb6c7ddba800a29b1d0ba140ae41bccb001a834e6c4abde40630c2f4 SHA512 b32fbc97ef152dab0fd5bbe5a551f90fb619b42276c79a68489fca6c141ef7d1e93a47b80e5ecb31fca532a3ebd486b46415d490a4e5e5ec81d3e6f65a0f504f
+DIST firefox-156.0-gn.xpi 526015 BLAKE2B 552abadf38805064cf922793fb9d13969803b3eff49fde4e3bec15887c7211b2761f0da9f77fd3e80f3beb5a664230da5f0294de78c355cde51cc7cc682009e0 SHA512 feb1318f4544850104e001aae6783885add2b9a06163e5fc7ee60200a90818b09c0305cba6f0baaf6b5df1bbac368514994a271bbef62c614ac778308d03c36e
+DIST firefox-156.0-gu-IN.xpi 430044 BLAKE2B 36c7605dcf825a6e2539cd20c4c7810864e1b7ef0009d3f1bb952b350b18f143b93a267813039ccc8ffb7a29569d31f9e1fdffc5475f1041d94adaae13acfdbf SHA512 191aad22d3a75dea86d2c7bb98c809bfc7372084ce0f426afd29cea3e675ebe54455df12b4349b696ffdf19995760b4215df6fe38f6496bf29ba6df30df81b81
+DIST firefox-156.0-he.xpi 534626 BLAKE2B d30da071b005960d559dd574a795b35347c234d7e528c86c96a050b53e7ab5c0b2ebfa389b98b312dd790d0198f3f62eb4e71814e4343b63f853b2a77711cdc7 SHA512 7e0c6ecf5e77acfbf5ce63a52e021f52b104c007e2ad6dbfd5fab209abe67b5cc3d39706be60cfe7e93f7e45ba9fd77f1b29d958ea2837e77c2575a58f671a1f
+DIST firefox-156.0-hi-IN.xpi 444482 BLAKE2B 237958d80fcc62172664c4605d002eb9a68ca3a4d27be8267862ab454e56c60a158c18fc2f31f7c48ec85dd2c16ed39149536c29780f1f2d4ba33f95ebd2c238 SHA512 ddc8f86ff4853356d5d1b0131b484e19828e655b1ef9d165ac4162134386bce7d49d03138a340345b18b5fda45ff78242bb9891952d34462c09f037437392849
+DIST firefox-156.0-hr.xpi 499953 BLAKE2B 00ddfa4bd769fdb35dbb470072ac401ac36e6a15693854b13a3b6cffcbd9d43a7444f2c44abc0986300b31294b508ec2894ea0e6db452200e145c3e96c521caf SHA512 0418002372262f802778e2b1c38a24db248999a96549db6320b65c976dd78f577c5daec4f23ba129874100a1ed1e2f78c9917ae29d3f3104ae72057c7994126c
+DIST firefox-156.0-hsb.xpi 543506 BLAKE2B 46f9b96e78dfaba971a8c6dc0084465e673cc40d99253ec3bdcec5116c8643c9def3c959e94b72e98d00f6e87737475ac346a99b21b802a997c91491bb5b7c16 SHA512 d1a7b9b6546f29fb2e5905ad467ccab75fbea2acf5c6d2243aa245179f9b80b6cbd038a9157376c35a92bdf145f0929196c3e39e367473d1bfe20ae8db8ac5da
+DIST firefox-156.0-hu.xpi 547579 BLAKE2B 33d9e1e98fda571f148d6283e44e22361e515bc1090d3e42e52a84586db14652bfd405dc3eb43d7b8e0a8c0d6418132c877205fa533707a25fb079a3e049c554 SHA512 040e5de06d4926b3cada4f342a10fd228b3b179b3e4e675019fb7e69fd6a948827a256683932ef03b086247c3a673ba2cfc58d04525c69eb653c2994d511938d
+DIST firefox-156.0-hy-AM.xpi 548304 BLAKE2B 9a42a2247ffd5654a52affd7ad40c70e4b774dca55c7799e100ae857aa6eaa7de51cf1beee18e9804a02be76dba877488ed4997f0930b9317c76542b8570106f SHA512 5ef3573418d0173165fceda25a58dd82bbc72934a9376d819d5fb904061779616f7f7de83012495c1a5f2b2f094d2a2a281defcf058a764f44ee80223b1f8c99
+DIST firefox-156.0-ia.xpi 503738 BLAKE2B fb9f8672b242a96cace62edbc74d373ab115d14ae18903b50b1fb76e8bf1dc8889de875ff476ba4136ef64e22c7a7fc27064f12d2e2ea7af085e7d31539527c8 SHA512 0c83b6129567ca7a8a191e3e51eaa6e0083658d3ee7f567954800701fa4b7d1668211cee721515f5b6a460edfe24b219568729107a5575dceac6f4f4f64ff213
+DIST firefox-156.0-id.xpi 466176 BLAKE2B 1002879137e2c037584e9144247828557a9a13e5764d9566a8583161f642c47c9ab4be2d23843de9a607daa9eb6f5d19b0e89ae17691b2aeb9ae27af97b71212 SHA512 51debe59091dc3d4f06969ef08cbd9eac564f6336d0e6512911eaacd6aedbc968a60afbeb41270979345e204bf0a1dec4c36d025f635ee44c04550ca98357542
+DIST firefox-156.0-is.xpi 477010 BLAKE2B df5efc182f04b3b50c32565e0bcf511435cbe1578d6fff79dd5ba4496f57ec9568569a7164016ee7035525e8d5f2944c095829f8d0fc6a3f698e29c66fc1daa7 SHA512 6b55de567c6ad2e7d25a3b59b969146415276ecdce84cdcee7ab373b7fb6247b34ad7e0b82d90aa1974c20beb35384d7a3f6fadc0c1193fa41123caf1b59cdff
+DIST firefox-156.0-it.xpi 516945 BLAKE2B 9f041f56ee237763f80227d3583a1bf913c154c16e13a59dc7fb1b2a2550d9085cff2c9628e201896ec997f48c9364e3080df65a552372de8d404569ebb79f08 SHA512 5d1bdd23cf6cfd7e11114674a6c77b365be2be95aba08d5cb872e0a4dd170bc8428d074a00699156b638d7ef2ba3d7c2783bd171b7b53b6463ef13f6acc73ab0
+DIST firefox-156.0-ja.xpi 563509 BLAKE2B 78222286c7d4ee40a0d279b8b2cf29953d665580912cf6fe616f95e48fdd29a7f04d0c0cd45f502de380a3a10cbe87586356cb8c2ec29651356d050f47daa0a1 SHA512 af4f50021f51a9a84eb270770e8fdd87552422f5220362753bbf99a336bc4547aa18950fad95e51b5ecc0bcbc2a082734359dc881c9c6f255b2c4f9f6561392a
+DIST firefox-156.0-ka.xpi 578072 BLAKE2B 1836063680cb6505c857ab57925daadd2c01622b49a04c59302b6b3630da8300b97faf24e34398c7db9eb5d14aad7e76fbdbd6767c0c16db9e129349132ef42a SHA512 4cd0c9c7a35c779f967f688b2422b83bdc533ec7627e4711e72b9d291b5dce66f9d96e1487c7589fea2fb11055ab5c8b9ce009d313a687c1eb9846d508c786e4
+DIST firefox-156.0-kab.xpi 463131 BLAKE2B 2c307bdc8621c631b3ecee758ab2ffe12d8eddec986520f02ad44b324242e777b82d485dc4fe325f69ccc8e69918303861c89d7f53717672e44362e18334e336 SHA512 a96f4ec806177b3fa08ae27e65521a06410da0f0120a7845f710b79c14892bcf74f0d0af7fe4a04ece9f943a754a62265f6f37d3833a9f4a0569700cfb2ed59f
+DIST firefox-156.0-kk.xpi 604589 BLAKE2B 6a9e9905befece92d23ab8fe393d1f608f467342e8f0ff0ed8242c25a5353e54909e8b3c79f6c72557230023fe0e12af8371c769ee8d1d3f162358ff88fd163d SHA512 e1ff117b6ecb38e0274dc31213b26cebe96b06686282e5e3e3a43d29fe4252962ca0ab23333ca64d56ac66f9efbeae5d834b4d5e93d011f15d7fba3f50df1506
+DIST firefox-156.0-km.xpi 448637 BLAKE2B 6e989ca8fb012b5b78298f09c0cb5fada1c4af739244f2530a3a92117718a30e69ba3fa8c081c0854d893a8d014aa030913e0a40a20f024a7bba6c12328f5d12 SHA512 c06734c5bbb8e8a6ffbfec26d6c2c0c36e675ea84376bac59191f4ca4306d9e5e207ca1f7708501f6232bb08bb61100dcc412fb16cc21d4ecb4cd0a9290f6906
+DIST firefox-156.0-kn.xpi 412871 BLAKE2B 643e9925b3eba1f21eb785530146de519ff19c4f733f3ba82529442fcae73b5ca569faccad033851fc1352c3655d05aed041eabf78a9ed7b9886acfd8d08cd79 SHA512 3ff51b092605ebe279a0351c3eff3ef1600046072cb0e41b02be6e95a338e8133d245f1bcc0d1be6c0b3eef04e6085bbbfbde8002a25050dc2e8d32fd1fdfe17
+DIST firefox-156.0-ko.xpi 546731 BLAKE2B 9da9ff28377ca8a33a853b4bac5c12a873321049034952f2cc107b071f4024582cdaabf9486363a1874f466fda31d1fa9ecdb679506d892b0d8856c69fe7b67d SHA512 8a7e38cf88680c3985c4f31961b3a153d0dc1eb9e13dcf2001ce05d6070e1157bd3f348a6bd5adf7855a859e362715fed178e8dcdb9ae2becac84c7b53f10af3
+DIST firefox-156.0-lij.xpi 391394 BLAKE2B 1879049b04ea0e59d9c36d1ce0f977882f97baf0b0de231e74bee536c908ad7233153e7ddde89cef7f4071f18a443598c3e58e24b9e18d3dcf8383ae35e6cf6d SHA512 b923f5dd0ba97d059be100b77bec57981b3ef641b35a0cf6edf291508a79b3a0c193f2f622f4cb4b805d8efdb8e5da135588701b3716977025f7d7acd5df52e7
+DIST firefox-156.0-lt.xpi 431938 BLAKE2B d6218f3aec07231ccf4e7a8a5e40f3655b1b98f63ed154a5e4cbb72fb6dcba8c9da7e94cf311563a3e63b8d8257dc39423ea9248c4215a7b793b6346e910dc91 SHA512 5d17e6f577f23111ae38ebbe611861fcfc9edf7433d8402b0c6b1e975b8643c15e6c56e2b137e596a2af061878cc7e7728391c3e349298351893fa7ce16dd950
+DIST firefox-156.0-lv.xpi 462190 BLAKE2B 983ccc4aeaf93367a06855ce6edc0d1ea61e6693184b8ccb389d466e0d1dd73fd0d8ae57baf99b1c716ef1d802da645ca0888f0b9ac8604ddd4a0fe6e91224d5 SHA512 81b4ea123534f62ef7164f7af18e810a2ff4f9778e75f8f268dbe79c23f8f19480e3b6b20ecb7cd2a3774f5b5c92ee43089fa5055d9263d19b6ce963e9fa8465
+DIST firefox-156.0-mk.xpi 445733 BLAKE2B f66ab78be16c74c04e4ff1384fc8e861cb73c53f1c5f3c8a6fd4defb7a3aedc03cf842170dbd4b1ec3570a8b14a489347bfd3901c7b520062b5e59fd8d68696a SHA512 1fd6a8b8b748491af6777b38385774e13e56ab34f29645285e0e8ee088706253ffec34bbee7e77a53352c8ce5c180d77b7aba08f4cb85789d8581047622f3d1d
+DIST firefox-156.0-mr.xpi 427574 BLAKE2B 2c73de98a621422c7b8c522be960bda7bca982edc6b193afe5b568df0135cffe2877fcab96c81b5e0a461496a39f44737590260001c876eae4243c0f18765fc5 SHA512 6d589f94500f2baf9dfb509e60f9209c9bdaa906e2c6b290fbe0946d9ffb0ad8d7375ecf149c4c37273df20a8801f67ed1d8bbca460dd5d9ea0aac820546b909
+DIST firefox-156.0-ms.xpi 389819 BLAKE2B 5c47f910d2975f40c1c5cd2c573adaaa8ffc687435b5e43dd5eb7743e23409a96ce84c5235fbc38f967817d8e81b81c6219d7ab2df31c1131af495ca948cf50f SHA512 0002a3988e07a467954fbae7563aa8b1ac611f083a3eb9b7ad0fb3043118ffd4cc03ea368f564a9786a2bbfe1be415d7ebfaff3ce6ca99cfba5db34c2849cc71
+DIST firefox-156.0-my.xpi 424231 BLAKE2B 1df1934c1411acd897a9c5c8b8be943f7d65b9b212541211d64a80186445abf7b83b944c4daae0a60d6ccaca8f84e4c17b29ecaee605726b66668513a4bc454f SHA512 7a8c8538913a7fc80aca429c703229b82364962b2fb10e8d4208a2b3ee56deaade19b7408423f0175a2023b029361f53b691ea25652ac86434daaa6b176d4187
+DIST firefox-156.0-nb-NO.xpi 502702 BLAKE2B 6c4ac3b64f14046637f0c20886bf5de4d56edbc3f2c036d5f7b58a34ab5700574bab00ecf3f1c4748b8274e2e90b239e98e3e2a57c8f9ae535003a0ad803cb2c SHA512 b7c3acce028bd32282057202389489cc658c47664533b9048580c18e31fdb895de62ba62e99cad8241e80424c104fad4e8d7778e5b9dd932d8172106f854d04e
+DIST firefox-156.0-ne-NP.xpi 425406 BLAKE2B 1b3909df412a037a73a14ddb46b53c6a9b679e8fe6f672583e64d6b0401aee32961a4001e85b5938ebf393b2af445fb036d298dfa5bd8dab0ca5998936e05fe8 SHA512 30f6c26df86c0ff443e9b08ca8661ed2f97849136cb75eb38f87e0f8018c54be83ec5a734a196f5d0b91546f12960b44091c1a2738c162525d87bca5042ed14d
+DIST firefox-156.0-nl.xpi 510995 BLAKE2B 13f015722028a2bcf397bee73c4823ed6b40c6fc1d70bd8dc91d2e2048b14d03cd64324445390103860cc39998bae5f487d81c993a3810944418fce2b1e9232e SHA512 c07ff7c71067c0473370a05fa2423ef134673cf01cdfd884054b485ffa1d56cd967b745168de7d4aa4d4b3e6bf913edb7c656cf4d5053e83b0f3e0121dfafc05
+DIST firefox-156.0-nn-NO.xpi 506447 BLAKE2B 9f8988b9adefa340d6eecddf5c4fadcc78ce933aea9a2120fb1bcd093674cae378c43865439c0728051729eba72dc4599fbb77459f2607b4c1681ca96befbd0b SHA512 6f1d49282b3a780dce4530f28d2cdaa3d123f7fd487e7babea04deef74964049b62b3658af09fb9efacceba9fbd24e3121da2981549a7e40f73cabf880f7e060
+DIST firefox-156.0-oc.xpi 455066 BLAKE2B 1048c0cab31f87e0769910891a3708da1032394cbcec13ae051ca9b1053e6cfd5ca3a6bc2673f5dc8ce5409cab50af4c43dc042be2cfe1f853affcf07b7e8e39 SHA512 17d0d7c60415ec61ab9bef579ec348ac796c164e4e21a265d95df7df065073094cdcfd8d825476eff3451c181f37be2593f8028bfd113cc4a149c581764fe5d2
+DIST firefox-156.0-pa-IN.xpi 597582 BLAKE2B e2895d5031e806e02abf5e17ecd049b7f04cd501cb142dae57688503e5cf7bf1916e64727c9161195718992f412b25b75dfe494b9f5405bd8302afe89aeea151 SHA512 bde8143ecbc81ece48834f7914c31c5f94cf8ba2b87bbb82efd55fffd2b802ce7d89f4c882513f3bd7df14a4dc48a58a99f58fe280d550971b0f9494ee9594df
+DIST firefox-156.0-pl.xpi 544761 BLAKE2B 52c97eaef8476711cb848d0e19e4bed585fd7d4ed42f04df5ce5d7d8fdf1ce5a2aa05a07f897304fce30384163f5f6461c613c1c264822ba6670efdc74839abc SHA512 5edc7821bdd31cfd66e8e4f8abb521ba16ecb5312953d2c4bc933135a3aee4c256d26f448ad232b57f3a17ae6120f30013fcfb8e16b2c5d302dba21575b9f2a2
+DIST firefox-156.0-pt-BR.xpi 515942 BLAKE2B dacd27176fa1af936d8302b150cc04492dbd368e624c7d7e47016fdc21e6943a11c9d24a8d73e623c313d667a6b604e345a4671f7778cd0779555ecc7d889b22 SHA512 105434d0a765d1d1b5c7f7b3bebe70bcd2b4264c649298871c6eb244fbb920e0e10f78a3d071f9203de5b1bd548e10c17658f16a2276c1b148aa1e7f05e5a665
+DIST firefox-156.0-pt-PT.xpi 523613 BLAKE2B a4d6ad74cec7bfaaed24283061c59c0caba92ed1f776318ae5b3e4c5c2dd890e28e97ff3433af19e28d88f8016d3003282b94ec699ad31efc837da3472395b8d SHA512 03584e280bc9fe528f001595e5dcb17c8ff084f4e7d17e9e1ef954cdc17bac500ced5e930e280e3458e5420fab465b6de81ff3aea84652ac41e9228c30cf9f82
+DIST firefox-156.0-rm.xpi 481995 BLAKE2B b5e86c29f19c1a3697a6baf2d1980561df4c9e170cd19c1e132efccf6a2059261c60f57c5898246f863cf96a6bb6c83df62db1235ff4590dc288710da74e8fb0 SHA512 df78a9b58bc44942bbc2d0168260ed4c8f7d7d26575d14ce3a387e56916260459e43c55ab11e31473a2cebdb2ee6bcbcca27d69340ce5d99f73907fcd9068282
+DIST firefox-156.0-ro.xpi 531095 BLAKE2B b40b7a101e1ff81590931a7ce30aceb880bb5935fd3d2a488a003c053f6d58313648498670fceeda89fdf50d254d72a33f1efb7184e7e10ce9a61ac92bbf5b62 SHA512 aba956fb452b8b1d0ba12bde504c4c4b4b84b657e56deba337abf4c37528f5cbf56ba642b57959049f3a825135f7ef2aa10ed095e85523baa905dd2fa3f9f831
+DIST firefox-156.0-ru.xpi 617975 BLAKE2B 9c4cb1b41929b5cf9ab2af3467375afa5029923ac7ec0ed308f6da5c32cfa568d413aa50014a77171e1f68c39ec6f6c987ce42ed55be47d98236dbb05eaf5fe2 SHA512 ddd5792b7878f67f824dba3723a267e6d529177c425eb5a29a40c824c36bf670352d25a266b7c3dafa5be18acd63af2e186bedc2a94757d85bf96e66d93f66b0
+DIST firefox-156.0-sc.xpi 487785 BLAKE2B afc93976d1e6b9b40614eaea82569339ab225d0d7b6eba0e828644818436d2ee284cd14fdba21cc112daf24977d14ec6437ccf2419b7dcd4bd82db19b5e4c6a7 SHA512 d8c6abfe06e8a2e284a8536b6753d56fd9100b8bab246be28fd3f765c7b23521afa459100a6d9ab1e0911334c483c869b50f741aab9d07f0eddc06b320c43b88
+DIST firefox-156.0-sco.xpi 394798 BLAKE2B 0c0e95b2b4a096166cb4195750f6cb070a735103b6ee4ed721901ecfffb78bed66edee650ee30ee112f3195ddc95196158e32deb686164eb229154ba54efc315 SHA512 b673d4c6e77d83809a81f5274c3ae087a22a5eb4a834f8f5369ef80dba0c57347ca8ddfd7abb658770381a1b45a96e15128e22a4094d342abc3963dc7c87adf5
+DIST firefox-156.0-si.xpi 472440 BLAKE2B 2a0ea9651c69bd30e60b05f262f476b75e905d33d15386888f7fff477fe5a50838cf242b051399432795e743feae81faeb58bb3e61069fcc9102550d8b8bef71 SHA512 8ff9cb9bfad1cab20c74bf226b7d9a3d5030027496433c83758dd8308d5026e7702e2efd8aaa5a4ba31e0f237b0528bdf0783ea2c537cb02bf6e27d71675968b
+DIST firefox-156.0-sk.xpi 551704 BLAKE2B edac2c5b64e6feb91862ad63859627898d6a159d581bbd031ff7121b5b3909d11aa589854e1cdeaaa382bb9354caed6156612fefd039c4265279807f7d7e1cb6 SHA512 9ba42cb3388feb2df116b0b99c113f0c9b0bad2e05e3e9c47c97b3c8f7e96a4beebc5b2218fe600543cd83d6cdba4dc7c5b6c4a8b1a5b4ee2a8e7a2505dcbe5c
+DIST firefox-156.0-skr.xpi 519644 BLAKE2B e313fbffc9ee540dedeae56dd78b388f7f98dd8bd867921aef2f7738721aa4c21e8e9e1cc72865a6e8fd058d8eead7a98fad59b5f1e30fe094e09e0d8ca6776d SHA512 064f0d7465f328cb6c0cea7ba9c8c1219f75709e3f36165d541cd66604a7a5921e1c9a510629da7625bf2994bf9e6769d76e24485ac4a74564db132d21a18066
+DIST firefox-156.0-sl.xpi 516521 BLAKE2B 944ef90c74fee79b89a1dcc5d461ff0f551e33fbdedb1288496c816f7873d855b656571af8334ba3a13cc64b27ede8e121d6e85209dd122bd379e7311a657aa9 SHA512 cfe5decf75fe8b3f758cdd7a9c53156df61f1f8e0b0a33962d28c27c256ac3d72bcbb38f029b73dffeb35a8691d40c91dd68e4b9792e93b549407b354ad04dba
+DIST firefox-156.0-son.xpi 356989 BLAKE2B d7b888d0b8cffa92ebb0b7d375bd760efba99bd56b31650b2aefb950e918da47db9374412e71dc2b307b2eda8a06eca85600d94bd68685f08f7aa4ffc4da0d25 SHA512 65705b903adc3688bb202b168b857b4bf74aa94d5e8030c3309df068f7dce6e22f9967694f6ac9d2e5cf6a94874ccaeab4ac514bffd6e4e257e75dd43cde8dbf
+DIST firefox-156.0-sq.xpi 510325 BLAKE2B 5573bcca00ddd87696066fd7746ef606ec81b288150bee6d94da3670803cbd8929a44c7000b6c789ae608d9f2778197683203b091f372c405b673f8b1653101b SHA512 55b736ae5b00f2321e647b5f0b47dc0f91b6dfeef124c654c9735926bd3c4db9676c1ec00fff26cedfe2d7fc12f15da39cf9273d1529c1c3d107b613e3655948
+DIST firefox-156.0-sr.xpi 586963 BLAKE2B 458017c4afb351c2e750a8f1eba728db658f8d9eefd3d076800d3ed2b3cb3b4198ebc9b59354195983298f2b796a51362b1e05fa5cbb4895b11880db271dcbf9 SHA512 6a00588a2e78e7c26b8c76851f6ed4cc488e13cee25fff43a064b186e6770267537001f8e9248372b721227f3b6915732616b4ee692b5206b6b742dca599223c
+DIST firefox-156.0-sv-SE.xpi 510210 BLAKE2B fcee8167f2ee7beacec6b14a09dbf808636ef126af35c8f096bcb4f0e236fabeab1ab1e8574b31f9ee611e8da60d6d3d5427f4732a40dfadc8c58d1b87981775 SHA512 c95b606f0364bc147197668388cdbd2a00aa5f124cdb00b88d2259bed6ca4f121602c747b394a7af8b85f70dcf88b5735a5a73d56eac39d915d2b202319c4c34
+DIST firefox-156.0-szl.xpi 414094 BLAKE2B f5f8991e0479aca6e0f939fe7b3640265ba3f5431d9487135a70cf90be069448f44093a112e452e143b22b52d7bd12459dde239b1acb8d1b9a6fb4f81fc8334a SHA512 cf78eedcd3638719d57ec9a92441a4e381051b82634fb1f95ffc23543a9b1b1c6a36e4888fba5ac76c6b9beed8d496ae3c697734f7d80639cc6841ea1d8d8dbb
+DIST firefox-156.0-ta.xpi 415987 BLAKE2B 8cd5f059ba8fb93eb188d37c22c4ee71f9a74d8f1a13d4382bf0f5311dd7219a1cab8a94bdf5e094b1fa0180a4e06a599394f66084053d44a6db5d09608e8881 SHA512 0ec99987b019cc4096cff16079427a487ecb0b1f1267df0163ee507ef4e4779db731c4952d6e1d9d2e3b261d50a7f4a107212d02fbc892c93603df7520f969ee
+DIST firefox-156.0-te.xpi 454878 BLAKE2B 4ef88e1462ee2f49adb131bd48ad6f4cdb7592a1874415e5238ace7dcf48599ba6c5d15a2d1a847453bb2019e634b3db91e0aed295f54cd23c93f2eada9b9b08 SHA512 cffa28010dfe5451432e32c39210f76a12789a2cdb375947925f1abab0189fa78823bfcd042bd0eddd03e3ac12985d265f599cf4017829b8947651be8f9f9e78
+DIST firefox-156.0-th.xpi 578263 BLAKE2B 56e77e518cc95beb2938757626fe99d900ee3fca09e251f789e737eaff9cbe357e54deafa7a87e553a37c59b5a07e942937bf07cdcdc86add8b1b2faa416df62 SHA512 c1432cb7f5c056d5987705f4c4ede1939e6e7351132f8d3a2e404364f4286c9c2d63f952e3b6cd2ee16ded814825f4c49d55fc09f5071b337b3662a31f178310
+DIST firefox-156.0-tl.xpi 411628 BLAKE2B 4e28fe3a308a89ac35399a52a3d63241eb2f33b1b8502c976da9a2498c66cd203f3c21d4069311fa3fc190e397a34e670a707147cba28397637636ffb48996b8 SHA512 dcef17e7b626efdf48dac279a72d76db3daf9ff27f0138d503d480ecacc056a527dcf35493c48599512401e98f57443e159d09cc3e322a6947d69080449eefa6
+DIST firefox-156.0-tr.xpi 526101 BLAKE2B 857c60811d913e5be77552b76ab79b53c21d0c7694bb19f691697b2f48cd9905ddc6eac4dd3d0810da402e4a93e9697c84f33378b1b4bee4ebe6783d079eb6f9 SHA512 196fa84e28ae9939de74fb3724395769b227cc43d31829e169ff8425dc1dc597e77e816bd0653f7642225363052a7f946cf073dfed1043c08c8618502da7afe6
+DIST firefox-156.0-trs.xpi 402163 BLAKE2B e9b5c35c7b7d0d780627d8484f8a6b40fdf66c079a089605042c79e5aa3997b18c87acce057666b1e48397d493358e8067e80ea30b2ee09ef3809de041f2bffe SHA512 d9f3cc2a8319af2805b50750c25a8f6228cc47981bbf660b417ccde682429a18a1e4143277b32dfb68a09272d034d7f635a74a745fc3067647c5b89fe8b3e463
+DIST firefox-156.0-uk.xpi 593711 BLAKE2B 5b80bfd8e26d84269cadd43c80971a9510257dba043e810eee1e06471188763a6693982faeab7a239cd1532f887907d315dc90863846123d683033acb2710a69 SHA512 3bf6a0a6ef3721b0020d192cd129c70a59e92fb5462785f64b7dd5d39b936b38755ff7bf874fb0eea438447c3719878f0c6ba8ef9ec6263acdcac8d45616d7c3
+DIST firefox-156.0-ur.xpi 437156 BLAKE2B 2aab9c2ef07535012c56d2f83fde8bdcfe173ce8c3159cc53651a1c0be34489a57ab9b81353960964d7857cc3870332406c0308c68ea19c624f73b5ce0323275 SHA512 19ff65f00dce20cea29666a5bea02058914bb0d77311d991473b9832b4d918d57d84d54c25ff53b81ec32c6803d87cf736e666c226a6c7562e7ec94da7d333d6
+DIST firefox-156.0-uz.xpi 384110 BLAKE2B d6e9efc545b5865a5a02bb942183ba4887206728253c6c78118297f195b928601df149859bef8b7e0d83f5bd6c1b73381ee1474b8317935f0ab1b23a74995041 SHA512 f6242cee76058d5e81c673065e516c335fae656ec0954d25b70e6bb5f6cc0faea2a980636d31e75ee16b6aa589989893479ebf38f9a1322225144c62095e8e9a
+DIST firefox-156.0-vi.xpi 551897 BLAKE2B e1b06b701bb9ece69e89777609319c282653d0ee1d36950f10d83eebb6774953130fa4e149cff1444c3988ac52b4ae2c7428b525f8644290f779b97e8d65065d SHA512 d30e142ad47d4b8bca5073e22f909cadcb64104c864428423d02a659198be5aa9acaeaae50525235e0d68da6a7f1e534ca90c13f04fd0f95c5f8c5d0b2a294ac
+DIST firefox-156.0-xh.xpi 362670 BLAKE2B ade66c12922178edc3d3dc240c8b30430128eff47e71607f59a4d6ec8633244e83c76715122c432efd287689ddbd01a60f5361fad22de5f0a4512d1079b399ee SHA512 8a12598c2e1abdbd566b595d0c4374d332e4ce8e5536424759d215aabad6fa4787888c56c15b5fa6b23edd920a21610575f5a6d69f89e724020f3bcc5e0675f3
+DIST firefox-156.0-zh-CN.xpi 537329 BLAKE2B 49c20a578e5b245a114a7ec62b8b2d0c93df61b9637d8f10b764e653d9c3c5bee60f4f1fbbf37629e90a66a46fc1901c009c9fad8adca3123eed7d18625d80c6 SHA512 312b0ca3696c8f98e00e2a1d956108c790be71398c66465a92a16353426a2fa87f45ac4dbedce2fa68c69e19538e31dc3db2ce2964c8acd6f35a566cf3d726b9
+DIST firefox-156.0-zh-TW.xpi 543188 BLAKE2B 2c573f272e0bacc23b8dfb6787a87c24a5da156bf35256e36f481e8f1753a32dd7e5d4537c7ffc7c1843b048597ed072c165bdecc1ce69830e5c657421d0d41d SHA512 5393e303f828f795bce5449b6013c0b1114ca52c45168fcf061fb7eeb4deb48a7254775c39d5faa63688c6cfb6ffc914db520d74e1adb1a935af025deec38e77
diff --git a/www-client/firefox-l10n/firefox-l10n-153.3.0.ebuild b/www-client/firefox-l10n/firefox-l10n-153.3.0.ebuild
new file mode 100644
index 000000000000..b3087a7620b9
--- /dev/null
+++ b/www-client/firefox-l10n/firefox-l10n-153.3.0.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.firefox.com https://www.firefox.com/enterprise/"
+else
+	HOMEPAGE="https://www.firefox.com"
+fi
+
+MOZ_PN="${PN%-l10n}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+DESCRIPTION="Firefox Web Browser's translation files"
+
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	SLOT="0/esr"
+else
+	SLOT="0/rapid"
+fi
+
+# 149.0 is when the firefox-l10n was introduced.
+RDEPEND="!<www-client/firefox-149.0"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb el en-CA en-GB
+	en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu id
+	is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( skr )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${MOZ_PN}"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+}
diff --git a/www-client/firefox-l10n/firefox-l10n-156.0.ebuild b/www-client/firefox-l10n/firefox-l10n-156.0.ebuild
new file mode 100644
index 000000000000..d0506fb86ca3
--- /dev/null
+++ b/www-client/firefox-l10n/firefox-l10n-156.0.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.firefox.com https://www.firefox.com/enterprise/"
+else
+	HOMEPAGE="https://www.firefox.com"
+fi
+
+MOZ_PN="${PN%-l10n}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+DESCRIPTION="Firefox Web Browser's translation files"
+
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	SLOT="0/esr"
+else
+	SLOT="0/rapid"
+fi
+
+# 149.0 is when the firefox-l10n was introduced.
+RDEPEND="!<www-client/firefox-149.0"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb el en-CA en-GB
+	en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu id
+	is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( skr )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${MOZ_PN}"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 17c11bd0b2a1..1fc0b48c0e57 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -102,11 +102,14 @@ DIST firefox-140.15.0esr-zh-TW.xpi 463736 BLAKE2B afc6b0f77719b455c4be37de82804c
 DIST firefox-140.15.0esr.source.tar.xz 640054332 BLAKE2B 2267af31f533a17ff8e77b79d635c408a00df9e936f110f19ad1712113689fdf2c3765807f803a4761ebb455e96c2163c74b2ada799fb46cab29cf70e231486b SHA512 c3a9c92776fc0fe4ec84e83d608822a84ab424bef3e9200de8e17f161369d13bb4a5caf5de326dded23edaf1c6b424d831218029786d4cfd1d857ee2634efeff
 DIST firefox-140esr-patches-13.tar.xz 15628 BLAKE2B 824c3d42f2f6cf70932fe395cf11dfe9043e09e20d6dfd2bd64ce4567206def45424e82b738f27c71648f0b2d97608746d22565cf7aa35713dedd71a24cde449 SHA512 d4d59818944f6a8213598308a1095a0f3c9818e6c517587e4630056d432a0e9673ad627447ca18dfa884dbb35bc2921e54cfc63f9c5646765e0f66a75279584d
 DIST firefox-153.2.0esr.source.tar.xz 807705672 BLAKE2B 73798f3bb282f39ceb302989caf74ca4385c9079b98c783f8ac16401feae820a7183fb35ece9308bb1e029356d1e7d6ebe745031ed4f0706de565fb3ab8903df SHA512 a8cd4784bb52ca89c0fe37404e894c044f6145c62e9fcdeffe621fde81ae4602078be575e26c90d83e5e47f26675d3ee897cd6a20027d09d4ba7d0e785ce39bc
+DIST firefox-153.3.0esr.source.tar.xz 804997520 BLAKE2B a01a4e3efec1c81ca462b915e448750a4d76ec81fad4cb2b909db584cd14df7437154fde82bc6547689466e811dccf70dc8d27d1e76b00572f5137d653040319 SHA512 56a5e092f0aba91febf01d227e8068520513f632d09c5ffbad4cbb2de307d9066425f353a1b7fcf5648733e02a9b17cfc9aaed5e39d7562a6b143b1c9827a668
 DIST firefox-153esr-patches-03.tar.xz 13056 BLAKE2B 25dcb9db586180e2e695a148eabcf226a271abac110c632bfca0f8f659387c2d14c5a5fd5706eb300cf990a4f424e34abc3d7edb3db0e62b662aa0ade47b75a9 SHA512 686164839139581802e08cae254d84e2e5c13a8f0826b47be645c697024af89eec51175f823586851ff18de717a366362898bb5a42ecbaa863ccfaf11af66dd3
 DIST firefox-155-patches-04.tar.xz 12860 BLAKE2B f16f2ce03d625f12c1512ab8271c6bd368b5774482b4173723fbfed7be4f37444f084d6b18c047310dc76ed4be42b18f5580934cc5e9afbb6058173c869a63df SHA512 8f341eaf640d3b75e95b152e36e59836ef7cacfa4182c8dd759e2303fadc3261c28a1f81440f1456aa5477ccbb53542f79599be021d208cf4b1a025eebce07ba
 DIST firefox-155-patches-05.tar.xz 19468 BLAKE2B 463a5fe05041a97fe6479c362e3898d58d2dbd487bc2b860791a145c625e4a8a57b1646579947aeae28ab2d61dfedc0e003852a3447b9516b2001b8de78e74ee SHA512 a7a55b4eb27301536ab874044aca2b487091f8b63c7f9e1d7220507edeff738e06e043f1de2b8d7938c96a32d112bdeea39a43e38b4787b96894a5d211b16a83
 DIST firefox-155.0.1.source.tar.xz 811591200 BLAKE2B 961ba27f944df8814b4c8937fc1d73e11cc67882d607a52f6bee81aeb29fe6250941ff92b4fd16f9aa9c53827299d1b859577b11d1c5ed14ad2080c27671401e SHA512 6d137a7a315cb1d0aac1a3fe314af80fe290c49b7c2e47f8687b25d4720927b2a0dc71a3da9d75f6cab479067db114caa6732d17e888b0abfce99238a8af0f39
 DIST firefox-155.0.source.tar.xz 810837272 BLAKE2B 2e043edb24f540c6e967c786c6ac5bfbd0942e9fb4b04fe0072b00efa8b104248a04aa7db297bb371e626f75d5b247c3648b188672ded646c1a716d64fdd6056 SHA512 24292681924edb9f0494eb77a7b19994039abbc3a8c0ba304f0e472b49a943838565723de983bc8ef08e019971e02a3014c8d241bb88c645a06a625c8ace0d6a
+DIST firefox-156-patches-01.tar.xz 18908 BLAKE2B ea2734e98c8ab19f5205ac4ed6ff4c4ded8d061b90ddf7bcca475a3b35b757d9daba337ef6b6a62d91f973f86ae11892a6d72fdd3f2d70e32ba0281cce02d601 SHA512 9131d3ef2245f9445df9569ee7d8898e0bb9e269dcf665353cdb5bd23f22f25e92e497753c30f5f72d24b310333e4674e675e4fd10bad123387ebbf4ff18b86c
+DIST firefox-156.0.source.tar.xz 802800568 BLAKE2B 19be7acf988ee6b7bf27ea292ce36a3a491d7cf4aad2f0c6bdff2f333cf1da540c0fcd5904d5618b7f64624508d0457bd7418b570a8b72d3ae242d5e40fea4d7 SHA512 0463304a0898670d248114f66f7c235166ae2397c3989a7c878c96f0c589fbbba1f1c87432daa22633b9fadd94394adf1dc37f0e67d22b066c75efe5eead75ce
 DIST wasi-sdk-32.0-arm64-linux.tar.gz 142940986 BLAKE2B 45712415f916c2749bac9002157def84f75d005bcac0403cb9b5a814623a1e0c2a2f24092d55478ca5204afa82c7499cabf405b8e5c6e95a514351801da4a91c SHA512 e39f3130290e63a7c2674e8838bd6569ca6a630c0231e2a303d6bd4a6b7f9c78b59a99606193c3ba3e200d93d9221339d23653e98ef720632d54c5c6866dde69
 DIST wasi-sdk-32.0-x86_64-linux.tar.gz 143157058 BLAKE2B 62b83e2db70b24361962b392551c604b21c59535b8d34a5e652447d7b722b033327334f0e17381d28eaa6dcb31fb02aad9978c66b761fb592b6de502012aeb57 SHA512 f77c08d1eb0f8e765bed4955d4794b33bb38149df5a144bebbe43e91fce3cfda7210cdf57073c0ff23c1d3c68105b6c69b4782af1643a0be2f3310001a2398f0
 DIST wasi-sdk-34.0-arm64-linux.tar.gz 192255247 BLAKE2B 3d185e7e98a1e5091aba98f76f221b7e641acadb8dae5aa453ec24a07f1b3e1643ab2a4d4da2d86cd08fbe3e93a7617864716fb7ca64e716d203bdece6087aa5 SHA512 b27453c20b949e8c783980e69937cfa24a306ed3fe0ce2716a72b5ba4cbf231bdd0f114af6a519c41dd6cd81da7bfb06bb86d7b86a45ffd4a723fe4341d8b653
diff --git a/www-client/firefox/firefox-153.3.0.ebuild b/www-client/firefox/firefox-153.3.0.ebuild
new file mode 100644
index 000000000000..823fb6b5d186
--- /dev/null
+++ b/www-client/firefox/firefox-153.3.0.ebuild
@@ -0,0 +1,1318 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-153esr-patches-03.tar.xz"
+
+LLVM_COMPAT=( 22 )
+
+# This will also filter rust versions that don't match LLVM_COMPAT in the non-clang path; this is fine.
+RUST_NEEDS_LLVM=1
+RUST_MIN_VER=1.90.0
+
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+VIRTUALX_REQUIRED="manual"
+
+# Information about the bundled wasi toolchain from
+# https://github.com/WebAssembly/wasi-sdk/
+WASI_SDK_VER=34.0
+WASI_SDK_LLVM_VER=23
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.firefox.com https://www.firefox.com/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.firefox.com"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}
+	wasm-sandbox? (
+		amd64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-x86_64-linux.tar.gz )
+		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+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"
+IUSE+=" system-pipewire system-png +system-webp test wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell jpegxl +jumbo-build openh264 +telemetry valgrind wasm-sandbox"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( jumbo-build )
+	wayland? ( dbus )
+	wifi? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		clang? (
+			llvm-core/lld:${LLVM_SLOT}
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+		wasm-sandbox? ( llvm-core/lld:${LLVM_SLOT} )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.29.4
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			gui-wm/tinywl
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.125
+	>=dev-libs/nspr-4.39
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	virtual/zlib:=
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libdrm
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.5.3:=
+		>=media-libs/libaom-3.12.1:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		!wasm-sandbox? ( >=media-gfx/graphite2-1.3.13 )
+	)
+	system-icu? ( >=dev-libs/icu-78.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-pipewire? ( >=media-video/pipewire-1.6.8:= )
+	system-png? ( >=media-libs/libpng-1.6.45:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox:rapid
+				~www-client/firefox-l10n-${PV}:0/esr"
+else
+	RDEPEND+=" !www-client/firefox:esr
+				~www-client/firefox-l10n-${PV}:0/rapid"
+fi
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+		einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+			einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	if use pgo ; then
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="18700M"
+		elif tc-is-lto ; then
+			CHECKREQS_DISK_BUILD="10900M"
+		else
+			CHECKREQS_DISK_BUILD="9700M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+
+	# Get LTO from environment; export after this phase for use in src_configure (etc)
+	use_lto=no
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		if [[ ${use_lto} = yes ]]; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="18700M"
+		elif [[ ${use_lto} == "yes" ]] ; then
+			CHECKREQS_DISK_BUILD="10900M"
+		else
+			CHECKREQS_DISK_BUILD="9700M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#915651 and bmo#1988166 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-967694-musl-prctrl-exception-on-musl.patch || die
+	else
+		# in musl, the rust-1.98 patch probably handles RUST_TARGET like we want to?
+		local rustver=$(rustc --version | cut -d' ' -f2)
+		if ver_test "${rustver}" -ge 1.98 ; then
+			rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+		else
+			rm -v "${WORKDIR}"/firefox-patches/*-bmo-2053518-handle-oe-linux-rust-targets-added-in-rustc-1.98.patch || die
+		fi
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use loong; then
+			# Only the LP64D ABI of LoongArch64 is actively supported among
+			# the wider Linux ecosystem, so the assumption is safe.
+			export RUST_TARGET="loongarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		elif use riscv ; then
+			# We can pretty safely rule out any 32-bit riscvs, but 64-bit riscvs also have tons of
+			# different ABIs available. riscv64gc-unknown-linux-musl seems to be the best working
+			# guess right now though.
+			elog "riscv detected, forcing a riscv64 target for now."
+			export RUST_TARGET="riscv64gc-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
+		fi
+	fi
+
+	# Pre-built wasm-sandbox path manipulation.
+	if use wasm-sandbox ; then
+		if use amd64 ; then
+			export wasi_arch="x86_64"
+		elif use arm64 ; then
+			export wasi_arch="arm64"
+		else
+			die "wasm-sandbox enabled on unknown/unsupported arch!"
+		fi
+
+		sed -i \
+			-e "s:%%PORTAGE_WORKDIR%%:${WORKDIR}:" \
+			-e "s:%%WASI_ARCH%%:${wasi_arch}:" \
+			-e "s:%%WASI_SDK_VER%%:${WASI_SDK_VER}:" \
+			-e "s:%%WASI_SDK_LLVM_VER%%:${WASI_SDK_LLVM_VER}:" \
+			toolkit/moz.configure || die "Failed to update wasi-related paths."
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/chromium/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \
+			python/mozbuild/mozbuild/frontend/data.py ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \
+			js/src/moz.build ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-updater \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-packed-relative-relocs \
+		--enable-release \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-ffi \
+		--with-system-gbm \
+		--with-system-libdrm \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-pixman \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --enable-update-channel=${update_channel}
+
+	# Whitelist to allow unkeyworded arches to build with "--disable-rust-simd" by default.
+	if use amd64 || use arm64 || use ppc64 || use loong || use riscv ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use loong || use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# riscv-related options, bgo#947337, bgo#947338, bgo#977845
+	if use riscv ; then
+		mozconfig_add_options_ac 'Disable webrtc for RISC-V' --disable-webrtc
+		mozconfig_add_options_ac 'Disable JIT for RISC-V' --disable-jit
+	fi
+
+	mozconfig_use_enable valgrind
+
+	if use valgrind ; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-sandbox
+		mozconfig_add_options_ac 'valgrind requirement' --disable-jemalloc
+
+		sed -i -e 's/--enable-optimize=-O[0-9s]/--enable-optimize="-g -O2"/' .mozconfig || die
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-pipewire
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		mozconfig_add_options_ac "+hardened stl" --enable-stl-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# wasm-sandbox
+	# Since graphite2 is one of the sandboxed libraries, system-graphite2 obviously can't work with +wasm-sandbox.
+	if use wasm-sandbox ; then
+		mozconfig_add_options_ac '+wasm-sandbox' --with-wasi-sysroot="${WORKDIR}/wasi-sdk-${WASI_SDK_VER}-${wasi_arch}-linux/share/wasi-sysroot/"
+	else
+		mozconfig_add_options_ac 'no wasm-sandbox' --without-wasm-sandboxed-libraries
+		mozconfig_use_with system-harfbuzz system-graphite2
+	fi
+
+	! use jpegxl && mozconfig_add_options_ac '-jpegxl' --disable-jxl
+
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	# PGO was moved outside lto block to allow building pgo without lto.
+	if use pgo ; then
+		mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+		# Avoid compressing just-built instrumented Firefox with
+		# high levels of compression. Just use tar as a container
+		# to save >=10 minutes.
+		export MOZ_PKG_FORMAT=TAR
+
+		if use clang ; then
+			# Used in build/pgo/profileserver.py
+			export LLVM_PROFDATA="llvm-profdata"
+		else
+			# Attempt to fix pgo hanging with gcc, bgo#966309.
+			export MOZ_REMOTE_SETTINGS_DEVTOOLS=1
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use loong || use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on loong/ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	mozconfig_use_enable test tests
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if [[ ${use_lto} == "yes" ]] && tc-ld-is-mold ; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_test() {
+	# https://firefox-source-docs.mozilla.org/testing/automated-testing/index.html
+	local -a failures=()
+
+	# Some tests respect this
+	local -x MOZ_HEADLESS=1
+
+	# Check testing/mach_commands.py
+	einfo "Testing with cppunittest ..."
+	./mach cppunittest
+	local ret=$?
+	if [[ ${ret} -ne 0 ]]; then
+		eerror "Test suite cppunittest failed with error code ${ret}"
+		failures+=( cppunittest )
+	fi
+
+	if [[ ${#failures} -eq 0 ]]; then
+		einfo "Test suites succeeded"
+	else
+		die "Test suites failed: ${failures[@]}"
+	fi
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from llvm-core/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r4 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled", false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled", true);
+			EOF
+		fi
+
+		# Install the vaapitest binary on supported arches (122.0 supports all platforms, bmo#1865969)
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/vaapitest
+		doexe "${BUILD_DIR}"/dist/bin/vulkantest
+
+		# Install the v4l2test on supported arches (+ arm, + riscv64 when keyworded)
+		if use arm64 ; then
+			exeinto "${MOZILLA_FIVE_HOME}"
+			doexe "${BUILD_DIR}"/dist/bin/v4l2test
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate", false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Add telemetry config prefs, just in case something happens in future and telemetry build
+	# options stop working.
+	if ! use telemetry ; then
+		cat "${FILESDIR}"/gentoo-telemetry-prefs.js >>"${GENTOO_PREFS}" || die "failed to set telemetry prefs"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+
+	# Prefer the upstream svg file they use when packaging flatpak so it's always up-to-date.
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${S}"/browser/installer/linux/app/flatpak/files/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg firefox-symbolic.svg
+	dosym -r /usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg /usr/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local desktop_filename="${PN}-esr.desktop"
+	else
+		local desktop_filename="${PN}.desktop"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	if use gnome-shell ; then
+		# Install search provider for Gnome
+		insinto /usr/share/gnome-shell/search-providers/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
+
+		insinto /usr/share/dbus-1/services/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
+
+		# Toggle between rapid and esr desktop file names
+		if [[ -n ${MOZ_ESR} ]] ; then
+			sed -e "s/firefox.desktop/${desktop_filename}/g" \
+				-i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" ||
+					die "Failed to sed org.mozilla.firefox.search-provider.ini file."
+		fi
+
+		# Make the dbus service aware of a previous session, bgo#939196
+		sed -e \
+			"s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \
+			-i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" ||
+				die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file"
+
+		# Update prefs to enable Gnome search provider
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs"
+		pref("browser.gnome-search-provider.enabled", true);
+		EOF
+	fi
+
+	if use jpegxl ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable jpegxl via pref"
+		pref("image.jxl.enabled", true);
+		EOF
+	fi
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+}
diff --git a/www-client/firefox/firefox-156.0.ebuild b/www-client/firefox/firefox-156.0.ebuild
new file mode 100644
index 000000000000..6224ac7da9e9
--- /dev/null
+++ b/www-client/firefox/firefox-156.0.ebuild
@@ -0,0 +1,1301 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-156-patches-01.tar.xz"
+
+LLVM_COMPAT=( 22 )
+
+# This will also filter rust versions that don't match LLVM_COMPAT in the non-clang path; this is fine.
+RUST_NEEDS_LLVM=1
+RUST_MIN_VER=1.90.0
+
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+VIRTUALX_REQUIRED="manual"
+
+# Information about the bundled wasi toolchain from
+# https://github.com/WebAssembly/wasi-sdk/
+WASI_SDK_VER=34.0
+WASI_SDK_LLVM_VER=23
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+	HOMEPAGE="https://www.firefox.com https://www.firefox.com/enterprise/"
+	SLOT="esr"
+else
+	HOMEPAGE="https://www.firefox.com"
+	SLOT="rapid"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 rust toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}
+	wasm-sandbox? (
+		amd64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-x86_64-linux.tar.gz )
+		arm64? ( https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER/.*/}/wasi-sdk-${WASI_SDK_VER}-arm64-linux.tar.gz )
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+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"
+IUSE+=" system-pipewire system-png +system-webp test wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" +gmp-autoupdate gnome-shell jpegxl +jumbo-build openh264 +telemetry valgrind wasm-sandbox"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( jumbo-build )
+	wayland? ( dbus )
+	wifi? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		clang? (
+			llvm-core/lld:${LLVM_SLOT}
+			pgo? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+		)
+		wasm-sandbox? ( llvm-core/lld:${LLVM_SLOT} )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.29.4
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			gui-wm/tinywl
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.128
+	>=dev-libs/nspr-4.39
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	virtual/zlib:=
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libdrm
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.5.4:=
+		>=media-libs/libaom-3.12.1:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		!wasm-sandbox? ( >=media-gfx/graphite2-1.3.13 )
+	)
+	system-icu? ( >=dev-libs/icu-78.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-pipewire? ( >=media-video/pipewire-1.6.8:= )
+	system-png? ( >=media-libs/libpng-1.6.45:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			|| (
+				net-misc/networkmanager
+				net-misc/connman[networkmanager]
+			)
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+# ESR and rapid dependencies.
+if [[ -n ${MOZ_ESR} ]] ; then
+	RDEPEND+=" !www-client/firefox:rapid
+				~www-client/firefox-l10n-${PV}:0/esr"
+else
+	RDEPEND+=" !www-client/firefox:esr
+				~www-client/firefox-l10n-${PV}:0/rapid"
+fi
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "llvm-core/clang:${LLVM_SLOT}" ; then
+		einfo "llvm-core/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "llvm-core/lld:${LLVM_SLOT}" ; then
+			einfo "llvm-core/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	if use pgo ; then
+		if ! has_version -b "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+			einfo "=llvm-runtimes/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing!" >&2
+			einfo "Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json || die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="18700M"
+		elif tc-is-lto ; then
+			CHECKREQS_DISK_BUILD="10900M"
+		else
+			CHECKREQS_DISK_BUILD="9700M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+
+	# Get LTO from environment; export after this phase for use in src_configure (etc)
+	use_lto=no
+
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+
+		if tc-is-lto; then
+			use_lto=yes
+			# LTO is handled via configure
+			filter-lto
+		fi
+
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		if [[ ${use_lto} = yes ]]; then
+			# -Werror=lto-type-mismatch -Werror=odr are going to fail with GCC,
+			# bmo#1516758, bgo#942288
+			filter-flags -Werror=lto-type-mismatch -Werror=odr
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use debug ; then
+			CHECKREQS_DISK_BUILD="18700M"
+		elif [[ ${use_lto} == "yes" ]] ; then
+			CHECKREQS_DISK_BUILD="10900M"
+		else
+			CHECKREQS_DISK_BUILD="9700M"
+		fi
+
+		check-reqs_pkg_setup
+		llvm-r1_pkg_setup
+		rust_pkg_setup
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	export use_lto
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if [[ ${use_lto} == "yes" ]]; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#915651 and bmo#1988166 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-967694-musl-prctrl-exception-on-musl.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		elif use loong; then
+			# Only the LP64D ABI of LoongArch64 is actively supported among
+			# the wider Linux ecosystem, so the assumption is safe.
+			export RUST_TARGET="loongarch64-unknown-linux-musl"
+		elif use ppc64 ; then
+			export RUST_TARGET="powerpc64le-unknown-linux-musl"
+		elif use riscv ; then
+			# We can pretty safely rule out any 32-bit riscvs, but 64-bit riscvs also have tons of
+			# different ABIs available. riscv64gc-unknown-linux-musl seems to be the best working
+			# guess right now though.
+			elog "riscv detected, forcing a riscv64 target for now."
+			export RUST_TARGET="riscv64gc-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post a new bug with your rustc -vV along with emerge --info"
+		fi
+	fi
+
+	# Pre-built wasm-sandbox path manipulation.
+	if use wasm-sandbox ; then
+		if use amd64 ; then
+			export wasi_arch="x86_64"
+		elif use arm64 ; then
+			export wasi_arch="arm64"
+		else
+			die "wasm-sandbox enabled on unknown/unsupported arch!"
+		fi
+
+		sed -i \
+			-e "s:%%PORTAGE_WORKDIR%%:${WORKDIR}:" \
+			-e "s:%%WASI_ARCH%%:${wasi_arch}:" \
+			-e "s:%%WASI_SDK_VER%%:${WASI_SDK_VER}:" \
+			-e "s:%%WASI_SDK_LLVM_VER%%:${WASI_SDK_LLVM_VER}:" \
+			toolkit/moz.configure || die "Failed to update wasi-related paths."
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/chromium/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py || die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py || die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" \
+			python/mozbuild/mozbuild/frontend/data.py ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" \
+			js/src/moz.build ||
+				die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-geckodriver \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-updater \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-packed-relative-relocs \
+		--enable-release \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-ffi \
+		--with-system-gbm \
+		--with-system-libdrm \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-pixman \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --enable-update-channel=${update_channel}
+
+	# Whitelist to allow unkeyworded arches to build with "--disable-rust-simd" by default.
+	if use amd64 || use arm64 || use ppc64 || use loong || use riscv ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use loong || use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# riscv-related options, bgo#947337, bgo#947338, bgo#977845
+	if use riscv ; then
+		mozconfig_add_options_ac 'Disable webrtc for RISC-V' --disable-webrtc
+	fi
+
+	mozconfig_use_enable valgrind
+
+	if use valgrind ; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-sandbox
+		mozconfig_add_options_ac 'valgrind requirement' --disable-jemalloc
+
+		sed -i -e 's/--enable-optimize=-O[0-9s]/--enable-optimize="-g -O2"/' .mozconfig || die
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-pipewire
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+	mozconfig_use_enable jumbo-build unified-build
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		mozconfig_add_options_ac "+hardened stl" --enable-stl-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# wasm-sandbox
+	# Since graphite2 is one of the sandboxed libraries, system-graphite2 obviously can't work with +wasm-sandbox.
+	if use wasm-sandbox ; then
+		mozconfig_add_options_ac '+wasm-sandbox' --with-wasi-sysroot="${WORKDIR}/wasi-sdk-${WASI_SDK_VER}-${wasi_arch}-linux/share/wasi-sysroot/"
+	else
+		mozconfig_add_options_ac 'no wasm-sandbox' --without-wasm-sandboxed-libraries
+		mozconfig_use_with system-harfbuzz system-graphite2
+	fi
+
+	! use jpegxl && mozconfig_add_options_ac '-jpegxl' --disable-jxl
+
+	if [[ ${use_lto} == "yes" ]] ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	# PGO was moved outside lto block to allow building pgo without lto.
+	if use pgo ; then
+		mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+		# Avoid compressing just-built instrumented Firefox with
+		# high levels of compression. Just use tar as a container
+		# to save >=10 minutes.
+		export MOZ_PKG_FORMAT=TAR
+
+		if use clang ; then
+			# Used in build/pgo/profileserver.py
+			export LLVM_PROFDATA="llvm-profdata"
+		else
+			# Attempt to fix pgo hanging with gcc, bgo#966309.
+			export MOZ_REMOTE_SETTINGS_DEVTOOLS=1
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-jemalloc
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use loong || use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on loong/ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	mozconfig_use_enable test tests
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if [[ ${use_lto} == "yes" ]] && tc-ld-is-mold ; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_test() {
+	# https://firefox-source-docs.mozilla.org/testing/automated-testing/index.html
+	local -a failures=()
+
+	# Some tests respect this
+	local -x MOZ_HEADLESS=1
+
+	# Check testing/mach_commands.py
+	einfo "Testing with cppunittest ..."
+	./mach cppunittest
+	local ret=$?
+	if [[ ${ret} -ne 0 ]]; then
+		eerror "Test suite cppunittest failed with error code ${ret}"
+		failures+=( cppunittest )
+	fi
+
+	if [[ ${#failures} -eq 0 ]]; then
+		einfo "Test suites succeeded"
+	else
+		die "Test suites failed: ${failures[@]}"
+	fi
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from llvm-core/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r4 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled", false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled", true);
+			EOF
+		fi
+
+		# Install the gfxtest binary on supported arches
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/gfxtest
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate", false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Add telemetry config prefs, just in case something happens in future and telemetry build
+	# options stop working.
+	if ! use telemetry ; then
+		cat "${FILESDIR}"/gentoo-telemetry-prefs.js >>"${GENTOO_PREFS}" || die "failed to set telemetry prefs"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+
+	# Prefer the upstream svg file they use when packaging flatpak so it's always up-to-date.
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${S}"/browser/installer/linux/app/flatpak/files/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg firefox-symbolic.svg
+	dosym -r /usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg /usr/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if [[ -n ${MOZ_ESR} ]] ; then
+		local desktop_filename="${PN}-esr.desktop"
+	else
+		local desktop_filename="${PN}.desktop"
+	fi
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" || die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	if use gnome-shell ; then
+		# Install search provider for Gnome
+		insinto /usr/share/gnome-shell/search-providers/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
+
+		insinto /usr/share/dbus-1/services/
+		doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
+
+		# Toggle between rapid and esr desktop file names
+		if [[ -n ${MOZ_ESR} ]] ; then
+			sed -e "s/firefox.desktop/${desktop_filename}/g" \
+				-i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" ||
+					die "Failed to sed org.mozilla.firefox.search-provider.ini file."
+		fi
+
+		# Make the dbus service aware of a previous session, bgo#939196
+		sed -e \
+			"s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \
+			-i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" ||
+				die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file"
+
+		# Update prefs to enable Gnome search provider
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs"
+		pref("browser.gnome-search-provider.enabled", true);
+		EOF
+	fi
+
+	if use jpegxl ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable jpegxl via pref"
+		pref("image.jxl.enabled", true);
+		EOF
+	fi
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+}
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 171dcb06c0d2..37a238bc1f2d 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,2 +1 @@
-DIST editres-1.0.9.tar.xz 161300 BLAKE2B e7867180dcb0af061a55fd2a86ee6309b3ea7972fb3414d745ba99e183ff3a8fde9dc7c818df3f745f17463949eb18a67270ef340ae7192377637b5d3e6e45e5 SHA512 b1abf32cad8f881b8b98c8b4a3280b09f581fc3a86188e86d5d435801676ec75377d8a636b9479a335c5c2321d358841f1194861913b2c17803758b626517230
 DIST editres-1.1.1.tar.xz 166828 BLAKE2B 05d3a3011a3ffa838d71aad7161e3d1146aea4a3b979732af28a332a2d649eb42e4504b495cb653821c96f1b143d4fb247a8074add3c098b5426eb00bfff6f31 SHA512 0a0dba9d80363296e333d6f0cefb622cdb38b596b6e5a2ea1fb458c5cb136b2e53a3e3965e1e3699c4346699a6f541f49e3ec27d619f7236b5a13ea20d5c5237
diff --git a/x11-apps/editres/editres-1.0.9.ebuild b/x11-apps/editres/editres-1.0.9.ebuild
deleted file mode 100644
index c546ad4a8287..000000000000
--- a/x11-apps/editres/editres-1.0.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb
-)
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 0e4a39be19a1..2a0ac809cb0e 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,2 +1 @@
-DIST xclipboard-1.1.5.tar.xz 132420 BLAKE2B a405f3381cba8a8af8be5cd6db50b338fe70994c125b7dfa358c1c46874009ec1a4ab99788e082e8aeb77e1c864de409ef1f9a820dd4e7e42456f5cf3c0623e9 SHA512 9962b8d19e6387c9af87a47d66d81577ec3e2ba1d0aa6f6ca8fa89664ccfb0dd20906e143a4d19a303a4eded4f29c4bd40868477fbf754a79cdb48256846a8d3
 DIST xclipboard-1.1.6.tar.xz 136460 BLAKE2B 4df8b3e62094ce09157392aeb40cdec4efa6956c86057cbba291839000fe372ac9aac196da3f4b951bdcf68fe956f534689a5786f2d4744f73ab582081184b27 SHA512 c7d14f9997e7ab7741f5694fe04d413ef92d479160533ac46dc9ebb25d727d649b9a624ab82f8fadef072645c967a80bc2b7305f0a50a2a3b4cb927525f64aeb
diff --git a/x11-apps/xclipboard/xclipboard-1.1.5.ebuild b/x11-apps/xclipboard/xclipboard-1.1.5.ebuild
deleted file mode 100644
index 432e46abdeee..000000000000
--- a/x11-apps/xclipboard/xclipboard-1.1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="interchange between cut buffer and selection"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	>=x11-libs/libXt-1.1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index fcab4f923ac9..086f877673a7 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,3 +1 @@
-DIST xclock-1.1.1.tar.xz 159556 BLAKE2B 5770cc0cf9065eb83b427c63190dae070635eade9410676a343505fc7a9d94098fd8d416384383f5311453a7ec80a0b72e8cb9a86be98eb8275dfd9cc92ba478 SHA512 059ea986bc7537c2796e8855676e8357bd8a7852fbac0839b3f8a9e3ffa088de41bc4e4961973353f0a7b7293366b81bc764d74f3dc4e90e361da06185d976e7
-DIST xclock-1.2.0.tar.xz 177848 BLAKE2B 1efe587d53fd0812192ec10352203475d838ed32dc4227df18aa6de3ff73b8505201459fa8673df9fa50292cb20e2d0220b5e77bc041de53b43328610674135e SHA512 acfe4000fc84f511145404ef1f98058d0cdd1d2238942a7a4beaf4781238c2085364e78449418fa46e7957700befeb720efa6f49382e1f8a5759829456d391c2
 DIST xclock-1.2.1.tar.xz 180196 BLAKE2B e9efdf8c8cffebb773d2ab956716078603cf159527226e5d93ee21cf5efb71a0726e4cf1eec59af5694ee1fcc8878fe78b58f24972bea9002eb3bf36c7124222 SHA512 0e94fd7e6c1e1c9e914991f3a8e3bf44b055a93066a153b05ec25fa4f8b6ec2c3b836bb8e1e6bc98c38a8e55f2070f225d358e7a771a97d27e2df119e0511b41
diff --git a/x11-apps/xclock/xclock-1.1.1.ebuild b/x11-apps/xclock/xclock-1.1.1.ebuild
deleted file mode 100644
index f2fe735d5f8d..000000000000
--- a/x11-apps/xclock/xclock-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/xclock-1.2.0.ebuild b/x11-apps/xclock/xclock-1.2.0.ebuild
deleted file mode 100644
index cd52d8223824..000000000000
--- a/x11-apps/xclock/xclock-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-meson
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index 851a06b0748d..93e819092ee9 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,2 +1 @@
-DIST xedit-1.2.4.tar.xz 481740 BLAKE2B 186240f42dbb7d1f1c4923f37c2614d7ba4251d22fb6cec033f5bd43bb6378101e329669255ebd0b16791dd2424d33cc816740a999e75e24294654e3d43a7dd0 SHA512 30819ec491f9a02db95c20eb8653389b29bf4a4a5c54701d156db67fcb8fade5276dcb3a656dca245c958d75d0ee6fe50ab207e040ce0065d9d9a1bd58d5b24c
 DIST xedit-1.2.5.tar.xz 488032 BLAKE2B 31d3b7ec4cbf11c97d1081683fd735bf872d3957ebf4a6c3dd7ee12eefa2192bb13d586232723645a203a3508f4341af82adb2f4b2ee04431dedf8ff98d5e7c7 SHA512 577d38781a8373e0db415d2b51e7e3158fdbcd720ee3fab3f157004132d6e4644928b922d91c42f46e389f7d7b6a7254f341f1031ec378bbe4640e54e2299d98
diff --git a/x11-apps/xedit/xedit-1.2.4.ebuild b/x11-apps/xedit/xedit-1.2.4.ebuild
deleted file mode 100644
index ffbad1559f68..000000000000
--- a/x11-apps/xedit/xedit-1.2.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="simple text editor for X"
-
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 378fdae132c1..9c4eee369a67 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,2 +1 @@
-DIST xev-1.2.6.tar.xz 129724 BLAKE2B 998049e07f79ceb5be5ca4999a1812278d701a62f8220a3851a6a774bea7e3c66860692e9589c427dfdfff631d1b27d07bd1229767a997e9c2e915544583dac2 SHA512 aaabb635622abfbf0b7ef2a1978070a918ea94480f375dd0798375274cf378ddb25007cc42426bb2292ed65c8af922f88e6a04c5a2f6cff3fadb0194b53eb7e7
 DIST xev-1.2.7.tar.xz 136784 BLAKE2B 319a0508f7f0735c7966fd2ce4f7768e0510e2269bc3b79d6d26aa1354ce1ca50b53175f4780ca58cc85fb6025f1c82da49c009b936f259e69d3df91a9047653 SHA512 e6537827972b80bd58af4569054d44028cbb8a86e94445e9e99c7a6299500454da7b7dad0783bd49e937ca43e39cde1bf564762576ae3f2c52dc4a5c7c68b333
diff --git a/x11-apps/xev/xev-1.2.6.ebuild b/x11-apps/xev/xev-1.2.6.ebuild
deleted file mode 100644
index 716fa62822ca..000000000000
--- a/x11-apps/xev/xev-1.2.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="Print contents of X events"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index d4abab17816f..d00eccfc2180 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,2 +1 @@
-DIST xfontsel-1.1.1.tar.xz 142336 BLAKE2B 89d06f85cdd6b1a363711b6b59937d3f7ba6dad4ffd1c1fb2fa2604aa52e7d883726dc72d8d9d96060d7fedcd2c4ca20f30621d28d0174b1b66151705d899864 SHA512 fdb1f20dc86e2e74da77ef5e62d9465ea24d1af965f1ff3a6334ffefb239130fcf28f7cde9b4e7d7e6c9cf12fcb637784e7af209cffcee3dbe304025d33abcdd
 DIST xfontsel-1.1.2.tar.xz 148792 BLAKE2B c9a4b56975987488d142b5f095f77e972c0802de7ec80aa862c0b71d16c2eca1a3bb27eaaaf2691f70b83063f2d6ab4343caabecde3c470b37ea5acff1e4d190 SHA512 377ef4e95f68411716a9cd202f4b2468ef5638d53ebd058518bdf97319f8008052f2cb76154503a1eae76aae3ce27dfa7334428b66f738a087d0915bef69c603
diff --git a/x11-apps/xfontsel/xfontsel-1.1.1.ebuild b/x11-apps/xfontsel/xfontsel-1.1.1.ebuild
deleted file mode 100644
index c19284d8102c..000000000000
--- a/x11-apps/xfontsel/xfontsel-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="point and click selection of X11 font names"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
index 34e32134ed11..dccb9a93fa09 100644
--- a/x11-apps/xkbprint/Manifest
+++ b/x11-apps/xkbprint/Manifest
@@ -1,2 +1 @@
-DIST xkbprint-1.0.7.tar.xz 161736 BLAKE2B bf60cfc234284f4f16f5337f52f124c4b67b1cf50fc0585505a1fcac987d688eb16875062cb857b9e9e7b7892ae1ffd1eff796d770585e6a873d90622920b7f8 SHA512 52f803ba85b053408dfff400f47ae9461954430665a12257a99b9775e26dd7192a97b979de949b9c4532936c9bfcc181a773de41514a122973f05d676dee6476
 DIST xkbprint-1.0.8.tar.xz 164912 BLAKE2B 3dc90310b7a314640fe8dc265f02c02ef1ceea1bd94a5de22e6de1085e11a0780cacaa78ec9790ee023b5995377b13fd03af6192e152c9f47dd23a30fbbb3202 SHA512 b2c1716f0dc30e528886190cfccfb72fb17f337bb321f988058759a1cbbf93f2effc68c1b2b9a0c808cc2831b62a8e894ca341ba0a35c22eaff4cc195a20d8da
diff --git a/x11-apps/xkbprint/xkbprint-1.0.7.ebuild b/x11-apps/xkbprint/xkbprint-1.0.7.ebuild
deleted file mode 100644
index 3fb97836fd7c..000000000000
--- a/x11-apps/xkbprint/xkbprint-1.0.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xorg-3
-
-DESCRIPTION="Print an XKB keyboard description"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libxkbfile
-	>=x11-libs/libX11-1.6.9"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 1499e0c3d261..d0253e4d4b85 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,2 +1 @@
-DIST xkbutils-1.0.6.tar.xz 130540 BLAKE2B af97210ded0e5d1d5ce99e71c50c3ade19b5fe926596a3816a8fcbe7ea6b65f08d5216792a45cb4df3191b6f5fc3db059ee1b1b05ecf0fea408562088f6489e4 SHA512 78fb7ab4ef6642040992529444944080aca7a2ec4118f9a64c45dacc37e4041181df7bcd1f4270e11b9fbc8bd60a131b4702d2aa95741d89c54582ff8a8f896e
 DIST xkbutils-1.0.7.tar.xz 137116 BLAKE2B 260d75e3e09911272899173393aaaf3ed92a4aaa91f35ca67259aeb6b8db3c5e103db4f8a2bcf557b6aa605e7a83a23801482cf4ef4dd6dfa48d15ea0bfba4fa SHA512 cc5767fa089b53cfcf43d559b946be9ec338f6bc8610594e1b0e212373d84cfd1382f4bd67071a9167ad3fcee4171bf5dcd62d714a448591628614118b84dd31
diff --git a/x11-apps/xkbutils/xkbutils-1.0.6.ebuild b/x11-apps/xkbutils/xkbutils-1.0.6.ebuild
deleted file mode 100644
index 002704269ab6..000000000000
--- a/x11-apps/xkbutils/xkbutils-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xkbutils application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index ae9a95bdba20..8be9983fd7e0 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,2 @@
-DIST xload-1.2.0.tar.xz 134996 BLAKE2B 178d264836b23ede8392371bc3b7f1c56eccf930ef8c30aa4526869d666e6788b367de69f31c96e1c48010abc77d66722a99e8994372977974f9af15ca9b5abe SHA512 b6143f796f7d24bb204e29f341f59c27a0eba00ae58e42bde0d1471e3e9357a0ce5e9e23de119d2540c9f5c71d28eb1e85dd766b6b28a7f066805b5f386aa716
 DIST xload-1.2.1.tar.xz 141716 BLAKE2B cbdbc50f30330585ebe070b67eb83a6b49a1bd58d053abf9ab044f6954b58234be1b204d1840d7b3e79315016e411c480d3cbb56a75c5f9ac1be5d4216c73835 SHA512 55bdf254d7521a54a9dc771a7e8d3d2750a64d8ec8274c3d2394cbe40358b03525a39d1e10c637bd9e66ee7f956d9aa55ae6c416a2611a35718e01f3b491fde1
 DIST xload-1.2.2.tar.xz 141784 BLAKE2B 10a06c6d2202a5494b47470184ff89bb08742aa8def594c78729ebe2cd57afac5f3982bb6242e98ae959ad1520e9fc29c4cef0f37ec4c511e6fed598574082eb SHA512 98d853543da8a1b86fc474a6748425861bac01c4888087d052c3f00baca6aade2d4ecfa3ee96feb32ed4fbaa4f89816888fe03a022b8fa19c71f147a0a9a4a48
diff --git a/x11-apps/xload/xload-1.2.0.ebuild b/x11-apps/xload/xload-1.2.0.ebuild
deleted file mode 100644
index c1d9ae25db33..000000000000
--- a/x11-apps/xload/xload-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="system load average display for X"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index 466f8408a555..a323172996a2 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,2 +1 @@
-DIST xlsatoms-1.1.4.tar.xz 120480 BLAKE2B 33b852bbafde3c2532c2071bfba54411943f30b2db0842b96bbdb1491415bc00d395abe691c721367e6b134f66e62d6918571b90c2e303982ea8a4ea498f5a63 SHA512 82f0d1e17850770537eac82947eff4514639f8122bd864e02685ede49db110a4c90c7782702ffb677a2b581f3eacd10dba80e63e29e7a1ed1c9255ee163fe0c4
 DIST xlsatoms-1.1.5.tar.xz 127500 BLAKE2B 548f586dfb5a8a06362605315497f0493609973165fe8d2cd39d136d699fbffc0315eb6da593c909d62bd649795295a5f677d9c809903c1cdf9450e7d77ad25f SHA512 a3e91814d6484f7bd6bb55d49ab898e685beb0bb5c86209cfc3e2f3b9aa85c81e09322f25b315bb0afe2ce86b8344adb81c47ed38730a1d4ffa15ce07c230631
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.4.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.4.ebuild
deleted file mode 100644
index 66f352306773..000000000000
--- a/x11-apps/xlsatoms/xlsatoms-1.1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libxcb:="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 0b871ffd2886..c30a611749a4 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,2 +1 @@
-DIST xlsclients-1.1.5.tar.xz 125552 BLAKE2B cafd425b28ab5de1d9b35bffcdf8b8f9552205618029c898c038729f185a6e7b064631482f2785fd496363e65360084b55e95713ee7fe64582af292cb975316f SHA512 3896643378603876438772475e89ad5c066f98c16593245db5fa066418ff793798247f976d2bf7aa401d2590fc9807b80c9758bcbcc91566f02ceb856d9702bf
 DIST xlsclients-1.1.6.tar.xz 132260 BLAKE2B ff092c8fa2ec5fd714f3f7ef8c4badd705b76c149eb7e49cd351c9d9dbb40029ad2f913a64e68c9608aec433ba2282225632a07f5631133ae39b22e6f402fe5b SHA512 bc330df0f56aa2c732a6d251494280839eb6a7c085e138e2f1d484e2ae580cdb562e1efb71257fa277f7a69f8a22317ef8419c5755661ed5155ea428a550a513
diff --git a/x11-apps/xlsclients/xlsclients-1.1.5.ebuild b/x11-apps/xlsclients/xlsclients-1.1.5.ebuild
deleted file mode 100644
index 336202f8cb0f..000000000000
--- a/x11-apps/xlsclients/xlsclients-1.1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND=">=x11-libs/libxcb-1.7"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 8c2e7d0b617f..075cbbb528a9 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,2 +1 @@
-DIST xlsfonts-1.0.8.tar.xz 130488 BLAKE2B 16ff4ba039f3122844c44c907fbfaff0fbbe6f219bd96cf7154179cbb5865b7911c3af926750dd702917f04a103c889cccea3aa03b48d2a4a47885b448b268e4 SHA512 401c86d902f173c440c08a22067a51e7238949c8d3c71eba7a8df11955edfec27525c8cbbcf2e96ed444fa20b15f98cf65a01343215d1ed9ba84fce849d02927
 DIST xlsfonts-1.0.9.tar.xz 136520 BLAKE2B 0502168372442d173cef38beb6782db794acafb3d6a3ed84761c00085a46cbf7890543b9980d710a3cea9d37367ade424dc999957960afb988f67fcd74bd13d5 SHA512 c08d8ad107eabcd8ffc2653de172b2b3192c3823890e95feb226c5689335b8cb3d8d3a78168f62f07b7f84bf55b1cf8e2230df2fed1c414a56f36cfa150224b1
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild
deleted file mode 100644
index ee1bb4b19299..000000000000
--- a/x11-apps/xlsfonts/xlsfonts-1.0.8.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xlsfonts application"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index b9b3b0ad6f5b..da4ad4a7a76e 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,2 +1 @@
-DIST xmodmap-1.0.11.tar.xz 139532 BLAKE2B d50611e762b665b18c370ea49d981d7820f16e2e10450bbb2ebc76c867a3a4e75d68e7dacfb9e610849770afa95f4d757863953217aac8e13509b386bdb8131d SHA512 a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510
 DIST xmodmap-1.0.12.tar.xz 146376 BLAKE2B c1f9cad468a9a55ab8c01513308d5a46d46b899f7a18b11bae6a60a71e0007ba3ba6a7f9c82f7d2140450ced02be3cea474cc62690bd3ac5b07ffcb7b8656524 SHA512 2319f1b7eee54d650930c9e16c06e8db5a0c19eaef1902d6196d666bcab8bc288baaea65d3b561e117fc98b918cbcd9c2660c91c556f3fa08e0f57a8f0d38f82
diff --git a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
deleted file mode 100644
index eb591e36f44a..000000000000
--- a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 28df599fd631..68684edbaf2c 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,2 +1 @@
-DIST xrandr-1.5.3.tar.xz 176852 BLAKE2B a2f253e0027976ef1bbf346361f6cfcfb575db36f134ec21e234f733fe7e70959d401c6b078a0d6d0297021aeff12eef57e4fdc865c86531784e439927385995 SHA512 2096afb9040ca18005aaf744401df40bdb8e8c8c06ffc97b927e63131800a4dc40cec063bdb5f38cd74b3d24b25fbed258c16cb6c73161efea44b3065b15c100
 DIST xrandr-1.5.4.tar.xz 182784 BLAKE2B c83fe2aa6bb7277ae9bba04bf0584c8558bd55cbff4142ac84c39933a520c4fbdda90272983fdecff8e96526bdb44ad73414d7b1e0b5ce0a1a9990896d056f3f SHA512 2758615a3d212cc53540cd76199d7a03580702a7b776c430984db33c5368a19620cf54b7ac8e193a4c4036bc40373a933c01473d2f2ce982ce2c6b48379da5e5
diff --git a/x11-apps/xrandr/xrandr-1.5.3.ebuild b/x11-apps/xrandr/xrandr-1.5.3.ebuild
deleted file mode 100644
index e7906b34edcd..000000000000
--- a/x11-apps/xrandr/xrandr-1.5.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xorg-3
-
-DESCRIPTION="A primitive command line interface to RandR extension"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND=">=x11-libs/libXrandr-1.5
-	x11-libs/libXrender
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_install() {
-	xorg-3_src_install
-	rm -f "${ED}"/usr/bin/xkeystone || die
-}
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 3cc25cbfc6be..8dff52f0ec31 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,2 +1 @@
-DIST xrdb-1.2.2.tar.xz 136768 BLAKE2B fbf396089a82db2a21866527f7d847f106164e1ce10795a2f96e34d5165311f4ed718eee10429792fc4fe273529af3350c41d765cb067c6310707bcc976bfdbe SHA512 c8a6fc94e270e9cb5602e055150553de103d545298285157ecd8924f163a10ebeb9acfff56d1fafbf48d339809c76340213792478cdf3270012d3cd05486001c
 DIST xrdb-1.2.3.tar.xz 144084 BLAKE2B 40816165f081860862e72252b7f4d6159c6cfc21bcf5a500676bff6590e9c19560a2168acc60f906eefa201a966b71868f9d8dbb091fbb7df78de51509befb8c SHA512 4dbbfd38afc9c795de3671a37e377247dc598b9c1352f6f07158fb716437f0465fb5db4eee22d74ebee93dff4a3ef1c1e4268f333cea0d8f02d1fa10104ac748
diff --git a/x11-apps/xrdb/xrdb-1.2.2.ebuild b/x11-apps/xrdb/xrdb-1.2.2.ebuild
deleted file mode 100644
index 1a5a856a0496..000000000000
--- a/x11-apps/xrdb/xrdb-1.2.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X server resource database utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-
-RDEPEND="
-	x11-libs/libXmu
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 07d153a76c41..948be2a8e004 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,2 +1 @@
-DIST xrefresh-1.1.0.tar.xz 122764 BLAKE2B 905a0cd0ed1f202f46ad1a5f1d487375499fc7d56a936652f6b7d144d62eee2c2b1b6dc3cca7ce96daf6195ddcc906553bc4ca98a8a07a12a1f3d05c6503554d SHA512 d46988c0423c3c6efb21a2eec0df427934d041afa6dcbbfd33f2dff19bf5e077baf10bd96780d98326d3a3e34cbf5824da822b6cb0091873cc1baade0aa05c26
 DIST xrefresh-1.1.1.tar.xz 128816 BLAKE2B 807145775a8fa0ab28d6ab9849ac52f3529588e9a9c3b3271985b3043952fa5a4fa42d0f2c7c53b62fcad4a69ce98fad5e0a0995e1c257a3c4519ee6db1dc691 SHA512 9b064bc63216a52fc768068a11d32a6327907033ae69aaf99f2944503931da2d418550c1165713a20fc3690cd034533df977ec1831e9a618e2daed2796782d35
diff --git a/x11-apps/xrefresh/xrefresh-1.1.0.ebuild b/x11-apps/xrefresh/xrefresh-1.1.0.ebuild
deleted file mode 100644
index 2f70406eb56c..000000000000
--- a/x11-apps/xrefresh/xrefresh-1.1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 4779d288f6a6..51cdae4d7363 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,2 +1 @@
-DIST xset-1.2.5.tar.xz 138776 BLAKE2B 81d93de0bd2a5f0d76937109a8f16f5e1d5074ec5209ea373d9f4b3f5064ac15a9e3c9cdc850cbe6103469fcdfc4d69df033ce7bbf80e22b507d3664e49911a9 SHA512 12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d
 DIST xset-1.2.6.tar.xz 146116 BLAKE2B 6d0df9c342cd6bc22b081c2ddb9057474736ed5446b84b9a843479327028bfe612703a98c32ba32572ffb3067decd8a27340729bfafd58e893e274a0d0d06aed SHA512 5031166960eea0588b9ef643677d5aef44c83c6d6070234a68f247ea947b94818d94c6958d9abe05cfa99ceee98ad3c95443f5f0c54cf0d086407ffe816d19ca
diff --git a/x11-apps/xset/xset-1.2.5.ebuild b/x11-apps/xset/xset-1.2.5.ebuild
deleted file mode 100644
index 3b07b18a4de9..000000000000
--- a/x11-apps/xset/xset-1.2.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xset application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xf86misc
-	--without-fontcache
-)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 976adc77a673..adb14c1839fc 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,2 +1 @@
-DIST xsetroot-1.1.3.tar.xz 123200 BLAKE2B 807c927c8c055877ad83af7559d897daa34f86a9ff70250997cc933065bb24ecb88fac01a62edb59a9c497630dbe351eccedb1f324668153dad67bcb461dd7a9 SHA512 f333d1bfd92bb943044da36331ae2cf68a811c8f3891719d9ebc1749e2dd0c67068f86face0794c3c4ae584c4dd189bad4998dccb38fe1ac37a8921e5713e7c0
 DIST xsetroot-1.1.4.tar.xz 129272 BLAKE2B ad6d99ad6c10fa78b800e0d63273ef500f85f5740d818b9c3b290527fd3f534b7b4ed7cd6ae7e211eafe42f14d3f4036041ef4b40ff81237328c984936704b31 SHA512 76f2ba25e7e312337cf28013470b814b9db0aa67777d8463b360177e374ef1195af867e85cccb848694466de7d7e9804dcd905c59c87a5d25aff72386e163573
diff --git a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
deleted file mode 100644
index 3cab7be7e7d8..000000000000
--- a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xsetroot application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXmu
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 060049259229..3203e2cdb44b 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,2 +1 @@
-DIST xstdcmap-1.0.5.tar.xz 120796 BLAKE2B 0b36b787ba6f69f944598ae3d94418cf7775e22279070db9471738709639ca3552d985525d05c750399d29e1b58a152da0d37be8bff3479a05265e45d85bf554 SHA512 3f2047af1d328a34d38ededc13de00298db3300eab1d1dbdff7d2aa4a3cd543a79305bfbd2e6424c5e023cf866a4f7a70aa9a3014444d543268d2f812a322a49
 DIST xstdcmap-1.0.6.tar.xz 126652 BLAKE2B 28acf5ebc55980d4fe22aa2994aa171013c4dc6a24bdff800da82e2e8378c6dddd242614354a375c646ebf9821acb78816f1285f49626429a8ab3f8584b1a131 SHA512 912247ede6531c06f57544e83540c5a7b0f0c1faefc7adc86517499acfee65ac41569b6cdb34ffcafe958b7ed8349ad5ff06e2f398ab64432910e5d319e63d87
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.5.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.5.ebuild
deleted file mode 100644
index 803d16603694..000000000000
--- a/x11-apps/xstdcmap/xstdcmap-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="X standard colormap utility"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index 3bd871ad9f84..2f5bde1997ef 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,2 +1 @@
-DIST xvinfo-1.1.5.tar.xz 120700 BLAKE2B 37ee9a5df13e47535fbef51878e9b0da7cd6cef378f7e69810beefb5aceb15e279a930313edff43a901eed9cb8750bb33e2ca4a3e7cdc25895630253efcc63a0 SHA512 18467161b248c68f6bde15e1c1b4b8cf812daf46777602558aee5fb7cb4d2649218de88fa93842fea4f316d954440f03a37d71fa4fda92eda3c7d80970e19cbb
 DIST xvinfo-1.1.6.tar.xz 127084 BLAKE2B 22e2d873160b6f704cbfc047130b80d1e678b8ae60b23d5dacc9b5d22563046e53be1ae3458147ed8e344395260f5c558db327e980e8d18ff526a210ba1c23d0 SHA512 f57655e3c7cb72e9b7db6831255b4b1e1e3e1a6bc227eec3c3d2da81871708743a3582385ddaa63c39080440331a541c11564d76f6d5ec056c0b2a091f7f0084
diff --git a/x11-apps/xvinfo/xvinfo-1.1.5.ebuild b/x11-apps/xvinfo/xvinfo-1.1.5.ebuild
deleted file mode 100644
index 3bc160ec32a2..000000000000
--- a/x11-apps/xvinfo/xvinfo-1.1.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="Print out X-Video extension adaptor information"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libXv
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 7ec12d851fd4..8f67794dfc4b 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,2 +1 @@
 DIST xwd-1.0.10.tar.xz 147932 BLAKE2B cd1d2a476dc979459f80555341e79a89ad10a34b4ab9a36e4fb802a96036a9528b6c383c9fa52905ef655245dc9d9f04346eb509191181ffb5ed3e943be7f0c7 SHA512 93be318bbc3d305f7786c9964376536f990b7172d0800193573697442770cf7ca47ef20d869af0c365b894ef41cc8721fd0a6d6b439fd95bf9ebf7859e2d96d6
-DIST xwd-1.0.9.tar.xz 141940 BLAKE2B 06505859e28095ba4c34f76001aa283b2b173d71f78c83e067faefe91671475daf9adcedecdc9c090826ecec8fb73763529fb9fae1ebd1e62e67d7ec70117c78 SHA512 ae59661b05160f5658920fd79031b6b8548cb7bbfc734194edb0acef5c95f76b210ca4443e9506fc1a0cb9df47ee7c22948502971afe578b44c75aa2a1138d56
diff --git a/x11-apps/xwd/xwd-1.0.9.ebuild b/x11-apps/xwd/xwd-1.0.9.ebuild
deleted file mode 100644
index 6194fe22922a..000000000000
--- a/x11-apps/xwd/xwd-1.0.9.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="dump an image of an X window"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index 551b5c624b09..d9bd51090d8b 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,2 +1 @@
-DIST xwininfo-1.1.6.tar.xz 161660 BLAKE2B d23d175d6083d95ef5f5df79fb1c88b4d92c618dbec90ee3dc4ae07fe2c5600b9c4dd00dcf3a32b512b51ecf9c6a11e5e7a5bb398f2cb479bdea05b076e5fd73 SHA512 c6df4ed3dcf97772450612f2786ecab8313a43bb78e0b8020cc9ec228b3f466f55090313ad02c8159a73a6892d117322ad85e28d9d76e38bb84c9750712c20bc
 DIST xwininfo-1.1.7.tar.xz 174060 BLAKE2B 6b360f5c91072b878296dd20fd5c840fe366a54bf1487d614556d8baaae46dbe72127a1563a8f92eda5f36e8c6acd195eb3558c0621961e1ff19ea9f34c47430 SHA512 116e53bdd5c40b6162e98057fc1c7981a4c4fb894adeb31197984d5408489195f9eb621635036e17194f4e50c7eed9e3624d044cab14b975988200f6883b9a66
diff --git a/x11-apps/xwininfo/xwininfo-1.1.6.ebuild b/x11-apps/xwininfo/xwininfo-1.1.6.ebuild
deleted file mode 100644
index 46c012f9a1d1..000000000000
--- a/x11-apps/xwininfo/xwininfo-1.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="window information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.6:=
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-errors
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libX11"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xcb-icccm
-	--with-xcb-errors
-)
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 3d6ecb6e3153..b8d32943db33 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,2 +1 @@
-DIST xwud-1.0.7.tar.xz 129736 BLAKE2B 890e2c4b81e00d9dda99bbaa5855653fd37640dadbce335783005ddd2dcbd7da597ec7da5cf2ae9c3b0ae9869c907b65624dea0d28b0c8b68c429699dfd93ab0 SHA512 3c910fc170f6f6373d426aa5532bd3ede6d83efab06a77c3a43a92aa9cfae9a5324d5a6ca1dfcc8941be6895b6769b3a7beee8081815000b57f93aa1b4e7c420
 DIST xwud-1.0.8.tar.xz 133828 BLAKE2B 6a58af2a941ac98a4536c4a0591322e48ddb87a7cf0b0fde11f281867f555d4ab0a8b10bb8aebcfb7ea3dc9a5274eb3b91642195951187fd51165b5337d5092b SHA512 ff5c6a2d02cada3347f1f810702e6194e2005f5f507150fc3f58ff6a127462d4ffbb4196e5fe41dcc2a6bfab07e7d60abd324e99707abaef66d3a9fdcec3a4b5
diff --git a/x11-apps/xwud/xwud-1.0.7.ebuild b/x11-apps/xwud/xwud-1.0.7.ebuild
deleted file mode 100644
index d8f3b85bfd92..000000000000
--- a/x11-apps/xwud/xwud-1.0.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xorg-3
-
-DESCRIPTION="image displayer for X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 94653917c654..94490934771d 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,2 +1 @@
-DIST libXfont2-2.0.8.tar.xz 474560 BLAKE2B 9764ea6307c1e92a2187b6b2db07aee276e9df4120f05d72a0733607ae19bf968b31a1918c94c01fbf80642f8e55ffbc31c33c96a90f67474a7d0086914d98ff SHA512 e14cc3fa03d7baa4554ee5754ab33f69ac1da3d509c686a5f705fde8cd07772be564d68cc18d9fd0beb5ed7b2f864fcd7f6bf4983f5c0db08a9c747d0e001531
 DIST libXfont2-2.0.9.tar.xz 478844 BLAKE2B aafe0306472f8d9793c66038840cf6485a69ff178af27defff3d3a2787544c0e24b0e237a571a5451bdd396df151ec112c4ffd64e131785e556e3810bdb0112f SHA512 ccd6d6abf6aa814a940d137813dba638f8259c3672abf00808d82df033c1026ae29d40c9068da4f112637338ad0d0fc15818a4afa9369a626c8f17e466b4fa72
diff --git a/x11-libs/libXfont2/libXfont2-2.0.8.ebuild b/x11-libs/libXfont2/libXfont2-2.0.8.ebuild
deleted file mode 100644
index 7bb0cc61d79b..000000000000
--- a/x11-libs/libXfont2/libXfont2-2.0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_PACKAGE_NAME=libxfont
-inherit xorg-3
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-IUSE="bzip2 truetype"
-
-RDEPEND="virtual/zlib:=
-	elibc_glibc? ( || ( >=sys-libs/glibc-2.38 dev-libs/libbsd ) )
-	x11-libs/libfontenc
-	bzip2? ( app-arch/bzip2 )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-ipv6
-		$(use_enable doc devel-docs)
-		$(use_with doc xmlto)
-		$(use_with bzip2)
-		$(use_enable truetype freetype)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index d7dac518edd8..41cce763ad23 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,2 +1 @@
-DIST libXi-1.8.2.tar.xz 405200 BLAKE2B 869389e4e35187c8ca28a63b9c49125c960629037e1c0e2aff7c149d0f3ed25bf6401dd4b9a8942a14152eceb0e3148e9805a48df3123dc0471c44f8636976b6 SHA512 6348aae8f595217e26f348184dd594d83af800949f649bfd11b6aef7387faa5624ed18551fe2c3a38c8deab9d7473f72fd7e3e8472cff3ff30d4bb3fb2e6dc31
 DIST libXi-1.8.3.tar.xz 411684 BLAKE2B 45ffc7c3a3407b669fcad80f8ba809455745e3ff87d8bcc861c851c16981cfa2ace2e1075cd778f58257f924a4b7b61bc17c4d7e6628a1cc961f99b4d575550d SHA512 5fb8273424467c102d3bab01cb273169038ff6fae739f6873ca357be8890c4fd30ba2952bca2759249458796df53ad130e2c9c3674b385602afd13c718faf79a
diff --git a/x11-libs/libXi/libXi-1.8.2.ebuild b/x11-libs/libXi/libXi-1.8.2.ebuild
deleted file mode 100644
index 8b3ac3079160..000000000000
--- a/x11-libs/libXi/libXi-1.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		$(use_with doc asciidoc)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 378f968fd64e..c9d8f55b69be 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,2 +1 @@
-DIST libdrm-2.4.131.tar.xz 435808 BLAKE2B e83e9cdde629fbab3a23170c964952c13dcb75e1b96773088392833f31b44f55903e01e28fc4c7d5e18c7f4fab306a5b0c8f4d4d76e5eeaac33ad3b350685a89 SHA512 d75894215600b648e25bbe13422901b650fb94bba8276d77971a49db7dc001819c9fc4b7e90ed82275f170a331687960ca5752cbb12064b2eec9c5c8eb60bf3c
 DIST libdrm-2.4.134.tar.xz 437244 BLAKE2B abdd9bcca56551f6568d42d8fd21a0cfc136b283e8b54ae87a8d3434dca30621013d68c275363f687407db1558b78d256882e728a44f95487b1a2958db03d75e SHA512 ef2abddea59d1e93c83a48de920431b839ab50d6071ef4da3cf126e7d64ba7b235f2e34e1169d49ad9de2937a0a18acd66bb8d324b067239b1136e0ddbe792a1
diff --git a/x11-libs/libdrm/libdrm-2.4.131.ebuild b/x11-libs/libdrm/libdrm-2.4.131.ebuild
deleted file mode 100644
index 9e261aeb1706..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.131.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/libdrm.git"
-PYTHON_COMPAT=( python3_{13..14} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/libdrm"
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="${IUSE_VIDEO_CARDS} doc test tools udev valgrind"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	valgrind? ( dev-debug/valgrind )"
-RDEPEND="${COMMON_DEPEND}
-	udev? ( virtual/udev )"
-BDEPEND="${PYTHON_DEPS}
-	doc? ( $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-	use doc || return 0
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		symbols-check.py || die # bug #925550
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use udev)
-		-Dcairo-tests=disabled
-		$(meson_feature video_cards_amdgpu amdgpu)
-		$(meson_feature video_cards_exynos exynos)
-		$(meson_feature video_cards_freedreno freedreno)
-		$(meson_feature video_cards_intel intel)
-		$(meson_feature video_cards_nouveau nouveau)
-		$(meson_feature video_cards_omap omap)
-		$(meson_feature video_cards_radeon radeon)
-		$(meson_feature video_cards_tegra tegra)
-		$(meson_feature video_cards_vc4 vc4)
-		$(meson_feature video_cards_vivante etnaviv)
-		$(meson_feature video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto disabled)
-		$(meson_native_use_bool tools install-test-programs)
-		$(meson_native_use_feature doc man-pages)
-	)
-
-	if use test || { multilib_is_native_abi && use tools; }; then
-		emesonargs+=( -Dtests=true  )
-	else
-		emesonargs+=( -Dtests=false )
-	fi
-	meson_src_configure
-}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 43d85b617726..2aff1394cf58 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,2 +1 @@
-DIST libxkbcommon-1.13.1.tar.gz 1234661 BLAKE2B ecad42f01fa6bac526f4e7bc6949bcd3b4c166360eef97c489ed543013a5489950956d551f043a42500c0857d0bb1d9b3f0b534293dcc85ada3c1a8cc8a611f2 SHA512 450c33fe26af6b847cf7516685d0df63c2ba0126887e27595c40fe80e4d0487009aa6cdf38ff1270d595c7900cbf3c11e7aa4f9cff80fa361742b5ebb10d83bd
 DIST libxkbcommon-1.13.2.tar.gz 1243485 BLAKE2B 98df853415ebb3f29521fc637e8db54730b666c42897b5e9bbc7177d2837e3303d5c16c08ef0b06cbbb17ba8e578e108546aabbded8452b393c35eef7dfb80e4 SHA512 261af9e02ad533bb6560e2711171812c7d92094db8b54eaa19b477ab68270e6d62b315e18d42527ca9c944e87f36f063d003d74aeb4829b21ecb96ab1b0c1ce7
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.13.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.13.1.ebuild
deleted file mode 100644
index 8944229c33bf..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.13.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-	S="${WORKDIR}/libxkbcommon-xkbcommon-${PV}"
-fi
-
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit bash-completion-r1 meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
-
-DESCRIPTION="Keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="doc static-libs test tools wayland X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=sys-devel/bison-3.6
-	doc? ( app-text/doxygen[dot] )
-	test? (
-		${PYTHON_DEPS}
-		x11-apps/setxkbmap
-	)
-	tools? ( wayland? ( dev-util/wayland-scanner ) )
-"
-RDEPEND="
-	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP}] )
-	tools? ( wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] ) )
-	dev-libs/libxml2:=[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-	x11-misc/xkeyboard-config
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	tools? ( wayland? ( >=dev-libs/wayland-protocols-1.15 ) )
-"
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Dbash-completion-path="$(get_bashcompdir)"
-		$(meson_native_use_bool tools enable-tools)
-		$(meson_use X enable-x11)
-		$(meson_native_use_bool doc enable-docs)
-		$(meson_use wayland enable-wayland)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED}"/usr/share/doc/{${PN},${P}} || die
-	fi
-}
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 501b0c9ac465..917d9d7fffc2 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,2 +1 @@
-DIST gccmakedep-1.0.4.tar.xz 102704 BLAKE2B 2efb17475bb2d4b36f5387483b189dcc62cdddc9ed66d4c737ffa4726ea94480c67e498aaf65762dac6cdeab6596c30249aeb78703dd3e6c808b78196956f79b SHA512 7665923de51256720e7ae73c09f3c8c908c5cda2e204afac60e3c1ef45c7211cee303629ab9e53171df2a37765944a8a85a654bb1b2e90df9f497dff7d9d29a8
 DIST gccmakedep-1.0.5.tar.xz 108564 BLAKE2B a3d6748fdcebd05e9887bfac67cf2d5918dbbc9a8d072bac657a99803f26e6901da3a384cd0828d8fb6923c557b74b7523ec4010c7e552c61f859860e126ab4a SHA512 118e338852c222cb809c4f0672aa867734ce098b06899186c7f6ddb8ba2773d1dadebcedb85829de5e60bec6f277887f4684794ded91102a2295426ecd0a7f55
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
deleted file mode 100644
index 57644e023213..000000000000
--- a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xorg-3
-
-DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
diff --git a/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild b/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild
index 1674ed542e50..5508d7582f84 100644
--- a/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0_p20251101.ebuild
@@ -11,7 +11,7 @@ else
 	COMMIT=dfa5315fd600760f8f3abddf7fb704202ffb07b3
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=6.7.2
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 8ae2787f0806..17bb0cd8a702 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,2 +1 @@
-DIST xbitmaps-1.1.3.tar.xz 109772 BLAKE2B e5ffeed910131fafe7346bc26920dc27a9ef55b069a36cc969183cc7b02a732a781e1fd295ec2577fbb472efc566f18aa2d534e18e94d4a8abc66db0177bd26e SHA512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814
 DIST xbitmaps-1.1.4.tar.xz 114616 BLAKE2B 20ea4e1c6eb7c00fbae3817834fefc4a145c17aaa1e88ccc25d548a06350e113316d6238605bf104bcd95725fc9c4412e7beed73dc42ba1461a505cd8d6ae241 SHA512 7da5e506effdfcf7344fc8209f47c1ec4c2e9f639e677f8701c36e1e5728037357478af3dd030ca93f3e36a3e1eaad1bb97596aba85868f01b52b420b825a10f
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
deleted file mode 100644
index 110935725e32..000000000000
--- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MODULE=data/
-inherit xorg-3
-
-DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
-
-# there is nothing to compile for this package, all its contents are produced by
-# configure. the only make job that matters is make install
-src_compile() { true; }
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ef77580a27cf..1ac89db63221 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1 @@
-DIST xkeyboard-config-2.47.tar.xz 930468 BLAKE2B ddfe6d3c8a088cd625c1a81c56ffe1f2ada5e003b3bf0628983a0058aa9e0ff9c26ab8cfcd0a6aded22e6a545d63533b2de05570b4e0c3a22879e195dcb96f61 SHA512 bd9b70ec5c8957e087f6c12272725044e6e124c15c7cbbfffb7f3c231944984d3302adda604da05464b7be6c91b5461e74fbec8544ac21b06e3bd8c748fd04e3
 DIST xkeyboard-config-2.48.tar.xz 953316 BLAKE2B 3200801ed54cc9ec28790053fa3311429e9fbce4607cda67f1f2991b4f0764df0dc35c4f880541833644ba9a4aba075792ce3dd26c54a2539312d8c6bbb75a54 SHA512 2c24f9cca97b8863ff2e71fc3780e9c3e22e4486c80d45022e2208d559bdb40824bdb8a4037e0d5690900b6e080ddef4eacfc8bff843e04ba5ab86940f1fb6ea
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.47.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.47.ebuild
deleted file mode 100644
index 0b6c7e2f22c3..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.47.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-	${PYTHON_DEPS}
-	test? (
-		x11-apps/xkbcomp
-		x11-libs/libxkbcommon
-		$(python_gen_any_dep '
-			dev-python/pycountry[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version \
-		"dev-python/pycountry[${PYTHON_USEDEP}]" \
-		"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
-		"dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Remove pytest timeout
-	sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Workaround for portage's collision checks, see pkg_preinst (bug #957712)
-	mv "${ED}"/usr/share/X11/xkb{,.workaround} || die
-}
-
-pkg_preinst() {
-	# Avoid touching EROOT if not needed, and use -f just-in-case anyway
-	if [[ -d ${EROOT}/usr/share/X11/xkb && ! -L ${EROOT}/usr/share/X11/xkb ]]; then
-		rm -rf "${EROOT}"/usr/share/X11/xkb || die
-	fi
-	mv "${ED}"/usr/share/X11/xkb{.workaround,} || die
-}