Publish srcux candidate 0000000623-20261010-204610

302 files changed, 6990 insertions, 5371 deletions

diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 65126527af7f..ec435325a69c 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,4 @@
 DIST orca-47.5.tar.xz 3394148 BLAKE2B 8c7c20c48fc681bec42fbf17f08a39ac2c57b6d1804fa6121bd8712a712219247991b59c0d1e125aac6f3ddd891234b641172d8374d6077d008b3fabbb71246c SHA512 01aa17ae47ba60ffdfaa00af16ee0df0e128a3d34d3d0bf75f030970289c7cd860b16c3852699ecc4269d3124a9127d34abde4c4b4ffe8b8e26a6da7ce0a9c4e
 DIST orca-49.7.tar.xz 3641960 BLAKE2B 3c41572e600a3b24a11f6d4fad72159828d58f0309d61fca23b22e49f579721a9d3cc9b78e2645b92dad146bf0e68501098184a86458653e72022d2196bdd6ae SHA512 8e07841643b9431070e5562491595dcb638e751080ed53a8d090756dac4dc7ad4969bd879012a854db11558c5afe2159d20aab8fe67732d8981a1ff42b5c93e3
 DIST orca-50.2.tar.xz 3718716 BLAKE2B 3cab038389b962ea487bfe711d8f0d21a23e218436e07863103a19f27efd1f82fc97986a87d9b4bf6cac2c41bc14f65a3d37d7fdbfe00b341a1366f0001c581c SHA512 66ee5e6baae0ba37167ce08a17645d3163570575df83ed07f7a34c1ee433a3b958406f16f6accf12fbc36ffa20d99914dacfe34ee17cfe569f4c99ff31260012
+DIST orca-50.3.tar.xz 3731072 BLAKE2B 40fe4b4f01975ff793848961c4f09bded13000387c0d83b30332bdae8983cb4358ec0d90eb854ebdff76ab9e92c8e8ec2e0dcf368d6924efdfceecc279055940 SHA512 5e1071a63226eb4bfb8888c7b7d7ea0a3f32122594af3d80ceeb79afbfe573c261fcffbccf42e5d8db568d40e231eab506d013c33660cfc32c24ea779ad3268c
diff --git a/app-accessibility/orca/orca-50.3.ebuild b/app-accessibility/orca/orca-50.3.ebuild
new file mode 100644
index 000000000000..e5fe42cc7fcd
--- /dev/null
+++ b/app-accessibility/orca/orca-50.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit gnome2 meson python-single-r1 virtualx
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://orca.gnome.org/"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+braille test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-core-2.56.0[introspection]
+	>=dev-libs/glib-2.28:2
+	media-libs/gstreamer:1.0[introspection]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
+		dev-python/dasbus[${PYTHON_USEDEP}]
+	')
+	braille? (
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+			dev-libs/liblouis[tools(+),${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.46[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+	')
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+		)'
+	)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	local emesonargs=(
+		-Dspiel=false # spiel not yet in gentoo
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# test_structural_navigator needs more time
+	virtx meson_src_test --timeout-multiplier=10
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst(){
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 5176508ec3a3..a43bd9396071 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,6 +1,4 @@
 DIST aws-cli-1.46.1.gh.tar.gz 19215038 BLAKE2B 3120c6768b749a85eea847040758f64120d5fba33be786566e178c36ed53d5d81676b8f9d632be7c09e65cc469d71366f897a4cafeb237b8fd2128361e3b4b1d SHA512 d332682464b9cb2cb3f1c0229f2161f8480c01416e637cf243c84388690f6029884eecfaa156fa57f6f9a224127902ec9cb11d5a1a4d313842ee5dd99f52d3be
-DIST aws-cli-2.37.10.gh.tar.gz 19607507 BLAKE2B df06772a0c31439f4f0117d25c79db5f84e59303b84e3411643d14d1863b47d60d21627520779e8de5bca9ab9d4e4058c87033979df07c729b2172d8a410e4fb SHA512 f2a8fca737a9f111491a5144a2736081e728a839d8b5c1a6dcacda7ef2860d51351f23c9dffbfc2924e8a3cfa37c17c48f2056ce46a26cd0d6c559fd8a28917d
-DIST aws-cli-2.37.11.gh.tar.gz 19628357 BLAKE2B f511f4ea7a0674e646f18801842cb9478232066511a7b7c4b7bb8811270e1f36ce1092c7b68f0bda6a4a67d7479fd58c5f11515b6270e0421f77555c5ededa09 SHA512 a3004e652eadc14dda1018f40955ee5f53651e72e523fb3a7e8d186cddfd4f0c478d4af25b45f6a29e0815cc15be3d80b328b05dc7e4103ee9373b26c29a455f
 DIST aws-cli-2.37.12.gh.tar.gz 19630292 BLAKE2B ef64f5f8ec755d16355cfe4a1eafb39a08e6de744aab458183c1109be46af11e09e494ebe64da5fb9fd1c3bb4997869218984b41679e418faa8e8e1070bfb7a1 SHA512 64aa8e2ef6d2c49f083b03db7b3b214d74e3ba66a3ab858f58950fed41a8957429039df382ef0b23309f6bb07d9f582ba0b2fe83091cd6876ae545fcaa44e517
 DIST aws-cli-2.37.4.gh.tar.gz 19473894 BLAKE2B ad6cc6bccb8521e6951feece0418dc4976fe088b35f6bb2be41cb82cb8ec85b3dafdedb5545187fa3a045cb29ff9c114d3f39ba7fdfbf22085c8cb8e00f4fc98 SHA512 e9af6b7f12da9f31182487d9e89bd234f817bcdc379cb5ef37467d5e23a07e84b0021fedfcc717c6c031508dad915553e074e2fa1dfd00198d1459d84de75bac
 DIST aws-cli-2.37.9.gh.tar.gz 19700332 BLAKE2B f24deee1bcfc03146536e3f87ec2a687be7a1888df5e0eb8fca91f0f13ab40875add8ba98c2b44b90bb8000efc05c063bb32e6e824caacde216c01e94d71245c SHA512 892591dfda26b89c5e75f9e313c2b0e2979b61c8ecc248e2d88d021ff1d08b8bcf417ff9bbda5a09e47a4fe20dd682a8656ad21524f2a1f5f062044f6e5c8c76
diff --git a/app-admin/awscli/awscli-2.37.10.ebuild b/app-admin/awscli/awscli-2.37.10.ebuild
deleted file mode 100644
index 0271e6e9ae34..000000000000
--- a/app-admin/awscli/awscli-2.37.10.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 shell-completion
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.24[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/awscrt-0.36.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# bundled dependencies
-RDEPEND+="
-	>=dev-python/s3transfer-0.18.0[${PYTHON_USEDEP}]
-"
-TODO="
-	dev-python/rsa[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	dev-python/flit-core[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-EPYTEST_RERUNS=5
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# this package bundles botocore & s3transfer, but they are custom
-	# v2 branches that were never released and are incompatible with
-	# our release versions
-
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[=0-9.]*::' -e 's:==:>=:' pyproject.toml || die
-	# wcwidth isn't used
-	sed -i -e '/wcwidth/d' pyproject.toml || die
-}
-
-python_test() {
-	local -x TZ=UTC
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/autocomplete/test_main.py::test_smoke_test_completer
-		tests/unit/customizations/ec2instanceconnect/test_websocket.py::TestWebsocket::test_connect_with_proxy
-		tests/unit/customizations/ec2instanceconnect/test_websocket.py::TestWebsocket::test_connect_with_proxy_but_no_proxy_env_empty
-		tests/unit/customizations/emr/test_emr_utils.py::TestEMRutils::test_which_with_existing_command
-		tests/unit/customizations/emr/test_emr_utils.py::TestEMRutils::test_which_with_non_existing_command
-		tests/unit/customizations/wizard/test_app.py
-		tests/unit/test_compat.py::TestGetPreferredEncoding::test_getpreferredencoding_with_env_var
-	)
-
-	# Some tests take a lot of memory, so run parallel-safe tests first.
-	local awscli_parallel_tests=(
-		tests/functional/[ac-z]*/
-		tests/unit/
-	)
-	local botocore_parallel_tests=(
-		tests/functional/botocore/*/
-		tests/functional/botocore/test_[cds-z]*.py
-	)
-	#epytest "${botocore_parallel_tests[@]}"
-	epytest "${awscli_parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=(
-		"${botocore_parallel_tests[@]}"
-		"${awscli_parallel_tests[@]}"
-	)
-	EPYTEST_XDIST= epytest tests/functional
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-	newzshcomp bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-2.37.11.ebuild b/app-admin/awscli/awscli-2.37.11.ebuild
deleted file mode 100644
index 0271e6e9ae34..000000000000
--- a/app-admin/awscli/awscli-2.37.11.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 shell-completion
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.24[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/awscrt-0.36.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# bundled dependencies
-RDEPEND+="
-	>=dev-python/s3transfer-0.18.0[${PYTHON_USEDEP}]
-"
-TODO="
-	dev-python/rsa[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	dev-python/flit-core[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_PLUGINS=()
-EPYTEST_RERUNS=5
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# this package bundles botocore & s3transfer, but they are custom
-	# v2 branches that were never released and are incompatible with
-	# our release versions
-
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[=0-9.]*::' -e 's:==:>=:' pyproject.toml || die
-	# wcwidth isn't used
-	sed -i -e '/wcwidth/d' pyproject.toml || die
-}
-
-python_test() {
-	local -x TZ=UTC
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/autocomplete/test_main.py::test_smoke_test_completer
-		tests/unit/customizations/ec2instanceconnect/test_websocket.py::TestWebsocket::test_connect_with_proxy
-		tests/unit/customizations/ec2instanceconnect/test_websocket.py::TestWebsocket::test_connect_with_proxy_but_no_proxy_env_empty
-		tests/unit/customizations/emr/test_emr_utils.py::TestEMRutils::test_which_with_existing_command
-		tests/unit/customizations/emr/test_emr_utils.py::TestEMRutils::test_which_with_non_existing_command
-		tests/unit/customizations/wizard/test_app.py
-		tests/unit/test_compat.py::TestGetPreferredEncoding::test_getpreferredencoding_with_env_var
-	)
-
-	# Some tests take a lot of memory, so run parallel-safe tests first.
-	local awscli_parallel_tests=(
-		tests/functional/[ac-z]*/
-		tests/unit/
-	)
-	local botocore_parallel_tests=(
-		tests/functional/botocore/*/
-		tests/functional/botocore/test_[cds-z]*.py
-	)
-	#epytest "${botocore_parallel_tests[@]}"
-	epytest "${awscli_parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=(
-		"${botocore_parallel_tests[@]}"
-		"${awscli_parallel_tests[@]}"
-	)
-	EPYTEST_XDIST= epytest tests/functional
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-	newzshcomp bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/bitwarden-cli-bin/Manifest b/app-admin/bitwarden-cli-bin/Manifest
index a009220177aa..1c4b5b2d598a 100644
--- a/app-admin/bitwarden-cli-bin/Manifest
+++ b/app-admin/bitwarden-cli-bin/Manifest
@@ -1,7 +1,4 @@
-DIST bw-oss-linux-2025.12.0.zip 43566826 BLAKE2B b7d776c07a471edd72e6d8c90689f67f0bd81b1866aeeebb7b6110029296210aeab19f4eaccf7a995f6deb0833e7c858b7b2330ccfde54e6746b6465ac2dd994 SHA512 af6eabff9e1029f16b6e4c78a6b057c68ad546456dbd1eccbc75e0455eed573b85cca3970328ea726ac47db237861449a33baabdd077022edf4d4bf785d4757c
-DIST bw-oss-linux-2026.6.0.zip 45028412 BLAKE2B 9af2d3887e939e58cc9b1bb2f4938a9c6e9bf2d705a2e58d878b3b186aad3e1d254ac15e763fb8f86d6439ece97cbd1f752f94f0dc0ca5738a59722c26aacce4 SHA512 fcdc3081bf09fdf2a94dfaece90c2a178282d922629da816902067fa64a2b5dbc911785a372fc96ebece9a5df24e2c89b0f3336eefe6d4d6c280bfa59a58f42d
-DIST bw-oss-linux-2026.7.0.zip 45214201 BLAKE2B 2aec74a36bfac74eb70e988b59f9e6e65456f5d82aa96a83ad5bd5c80d27908d5a75d9ec3b24dbc51ec047d51ff0e55b62673d13f9be526fccf3f4656af6f138 SHA512 32d281914a6a93cf4148ff55d4be458a2919c2596be2291857d97727e9b6ad7cfc7d68fbf6d0902772a031cc0062f619c29a27e85c83b830b08c3f9c4462e39d
 DIST bw-oss-linux-2026.8.0.zip 45355899 BLAKE2B 7ddfa28b4ddfa784292bb07f822ead4d4a7042871c457a6178241ec732c8f513da962c3d884daa49347c1282141c069c66be5d12786500bcc69a25907b4305ad SHA512 026e23ad41576926c8497d509cc6103a2023b75951c809dfc3d690d28125f3d0babd878de4fc7bab409129909ca4eb17776b0e5986e594c2a22ded8ce25b46d0
-DIST bw-oss-linux-arm64-2026.6.0.zip 43534048 BLAKE2B 850b9df41f5ddf8267f5ff0ed5458c9635ea3f12e9863076c11b59828ca3adecb2d49dd7052c7939bc67c116e3ad5d79d0339e8f648eaa27df6cb47cb0a29bdb SHA512 f03d0028f7d3b2c544d98c080681bef6b3f7a17dec2da96aaa59861b7030abce84e01627324a30968c1ee6e79dbce3c6c40edbb9099dc3989a108b38a7e8c526
-DIST bw-oss-linux-arm64-2026.7.0.zip 43719865 BLAKE2B f999036b6c3e643cedfab8a0f6abfd5b7affeb4753a9aec2f74627b7a90cf0c0866a2df0e77eb387003cc8df787c1b3610d8b8e6db5e7020ba89efe8ed067af8 SHA512 28322a4edf16d39be0c315a00178e7cb64b0943bcf2225382393af0b5397ccbb21b62ace8d74f2f4d0ac7a27933c4213414da4e8c9c07a31692818a8983e1c3b
+DIST bw-oss-linux-2026.9.1.zip 45556621 BLAKE2B 3bb9ffb0672be59972206c840f0c4c568e62ad2d56461e08cf207341ae1a4aa0d11c51748e6073891bec3099c10359b691f0ad5da7e93cd49947e5f5fb2668ba SHA512 9774a807e16f9b495d8f5fbc93bffd535af26fa03b7f72bf883b60c57dff70ce833bab3c3cd8e14660316da5d1c04f8ba6bcd92da62df0bedcde6483f7f18dae
 DIST bw-oss-linux-arm64-2026.8.0.zip 43873365 BLAKE2B 03fc55038b746b3555937d355d4b19d232c440ee03bd463105a9ed5f4e1decebd10f6a2eac02096395018a874ccbdaea469319923b2d314bd78c237f6237cd8b SHA512 d7c0c38a3c37fdaf37a21aaa974bce55e24893a0a5fd9e107594f3fcc078058596bd186002925074ee9a6857fea8a6d1a3b5ec7828156a64cc25491acdb31ff8
+DIST bw-oss-linux-arm64-2026.9.1.zip 44066520 BLAKE2B 8bb9fb557c90891b7258e98647dab8236b6b70d0dfb6b549f94b6bb1571db258a3ec641289b112bb1d4ce4c329b28915d9351ea1024749e416f1d9862f152130 SHA512 979ad60527238d29437f59044fb19867de0442a7cc79fab195e92d530c5ffc6447678eca500800a996633fdf0cce96dd5ea51fa9cd72c923e87827fe539e8285
diff --git a/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2025.12.0.ebuild b/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2025.12.0.ebuild
deleted file mode 100644
index cd2339daa979..000000000000
--- a/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2025.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit shell-completion
-
-DESCRIPTION="CLI client for Bitwarden compatible servers"
-HOMEPAGE="https://github.com/bitwarden/clients/tree/main/apps/cli"
-
-SRC_URI="https://github.com/bitwarden/clients/releases/download/cli-v${PV}/bw-oss-linux-${PV}.zip"
-
-S="${WORKDIR}"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# stripping breaks the binary. Errors:
-# Pkg: Error reading from file.
-RESTRICT='strip'
-
-BDEPEND="app-arch/unzip"
-QA_PREBUILT="usr/bin/bw"
-
-src_compile() {
-	./bw completion --shell zsh > bw.zsh 2> /dev/null || die
-}
-
-src_install() {
-	dobin bw
-	newzshcomp bw.zsh _bw
-}
diff --git a/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.6.0.ebuild b/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.6.0.ebuild
deleted file mode 100644
index 60c388986657..000000000000
--- a/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit shell-completion
-
-DESCRIPTION="CLI client for Bitwarden compatible servers"
-HOMEPAGE="https://github.com/bitwarden/clients/tree/main/apps/cli"
-
-SRC_URI="
-	amd64? ( https://github.com/bitwarden/clients/releases/download/cli-v${PV}/bw-oss-linux-${PV}.zip )
-	arm64? ( https://github.com/bitwarden/clients/releases/download/cli-v${PV}/bw-oss-linux-arm64-${PV}.zip )
-"
-
-S="${WORKDIR}"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-# stripping breaks the binary. Errors:
-# Pkg: Error reading from file.
-RESTRICT='strip'
-
-BDEPEND="app-arch/unzip"
-QA_PREBUILT="usr/bin/bw"
-
-src_compile() {
-	./bw completion --shell zsh > bw.zsh 2> /dev/null || die
-}
-
-src_install() {
-	dobin bw
-	newzshcomp bw.zsh _bw
-}
diff --git a/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.7.0.ebuild b/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.9.1.ebuild
index 889361de1feb..889361de1feb 100644
--- a/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.7.0.ebuild
+++ b/app-admin/bitwarden-cli-bin/bitwarden-cli-bin-2026.9.1.ebuild
diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest
index e3f6957416be..bc02399709c1 100644
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -1,2 +1,4 @@
 DIST vaultwarden-1.37.2-deps.tar.xz 49758228 BLAKE2B b497870e07d889fb2747134d98704348f4cf92dd52d2f90ec13c4a06568ce639e043baac87f6949cbeafb4029a89371246c041b9bee2b55ddb10547a46d6dd17 SHA512 276b1c4b61e2fe8c872b75e7d05c700830a432b81c5cadf1f62421111115d13a9ff57fc3c848e6c06b0c0423f27389f65a615d2682d7cfc3092ae9c18faf9b9a
 DIST vaultwarden-1.37.2.tar.gz 742207 BLAKE2B 3998da25768f43102b1f0c628f78705d0af94b0fbb82a9d1f7cf216f8197743b49bbc62b54bca6516fb845d0595ba2c8a22eb604c9aa7c0cee717ffe3a180af1 SHA512 9ddc5e829ffe990a5c866833f4155d062bb974f5c04e2d6b31d5e0a53fb619e054366b65d3777a27080cb0572709548b71d49eb3f7b3e6c1edf1c195c8a10908
+DIST vaultwarden-1.37.4-deps.tar.xz 50934576 BLAKE2B 0a3b9248ace7731e70519d48d2c4d3a32ceae50727dfefdcf65ef8acc82259de735430cf7c82c09dc9277e87dca10f6917215259f7ce1cb092f75506b297806c SHA512 c444f1f8d8e23602d75a9738319c533d81a3e66ce3fe695a8ee9b1fb583d5fb9dfe5bf3802a7db8f68658812b73bb19d817a870820d61361521af1c0d2160efd
+DIST vaultwarden-1.37.4.tar.gz 693022 BLAKE2B 9fcb9c5f869171c0fa0cbb1cc2b8a216ccf37cb58854462210ff9fc64229738b99248fd28e6ccd7fc68af83edebc3be0323fc48417c846d3599708df6b431b1b SHA512 4b78d01c58c8b70eb60624cbb0881ca4d3ea11db0bcccf8ed2791ae144d7bdabfecd20ba41adc22ee1b7306787c5f7fadd0797287a922145e576f4a0242bb3e8
diff --git a/app-admin/vaultwarden/vaultwarden-1.37.4.ebuild b/app-admin/vaultwarden/vaultwarden-1.37.4.ebuild
new file mode 100644
index 000000000000..08d4a769c9d3
--- /dev/null
+++ b/app-admin/vaultwarden/vaultwarden-1.37.4.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+	https://github.com/dani-garcia/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/gentoo-crate-dist/${PN}/releases/download/${PV}/${P}-crates.tar.xz -> ${P}-deps.tar.xz
+"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="AGPL-3"
+# Dependent crate licenses
+LICENSE+=" 0BSD Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0"
+
+SLOT="0"
+IUSE="cli mysql postgres +sqlite +web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	dev-libs/openssl:=
+	cli? ( app-admin/bitwarden-cli-bin )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( www-apps/vaultwarden-web )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+RUST_MIN_VER="1.97.1"
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.34.1.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}/${PN}.conf\n
+	Data directory: /var/lib/${PN}\n
+	Log file: /var/log/${PN}/${PN}.log\n
+	Default endpoint: http://127.0.0.1:8000\n
+	Admin endpoint: http://127.0.0.1:8000/admin\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Please find the documentation at https://github.com/dani-garcia/vaultwarden/wiki\n
+"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	if use !web; then
+		sed -i \
+			-e 's|^# WEB_VAULT_ENABLED=true|WEB_VAULT_ENABLED=false|g;' \
+			.env.template || die
+	fi
+
+	if use mysql || use postgres; then
+		declare -a DB_UNIT
+		use mysql && DB_UNIT+=(
+				mariadb.service
+				mysqld.service
+			)
+		use postgres && DB_UNIT+=(
+				postgresql-{14..19}.service
+			)
+		cat <<-EOF > "${T}/${PN}-db.conf"
+			[Unit]
+			After=${DB_UNIT[@]}
+			Wants=${DB_UNIT[@]}
+		EOF
+	fi
+
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite sqlite_system)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile
+}
+
+src_install() {
+	dobin "$(cargo_target_dir)/${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.33.2.service "${PN}".service
+	if [[ -f "${T}/${PN}-db.conf" ]]; then
+		local UNIT_DIR="$(systemd_get_systemunitdir)"
+		insinto "${UNIT_DIR#"${EPREFIX}"}/${PN}".service.d
+		doins "${T}/${PN}-db.conf"
+	fi
+	newinitd "${FILESDIR}"/vaultwarden-1.33.2.initd "${PN}"
+	newconfd "${FILESDIR}"/vaultwarden-1.33.2.confd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.33.2.conf "${PN}".conf
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/"vaultwarden-1.33.2.logrotated "${PN}"
+	keepdir /var/lib/"${PN}"
+	fowners "${PN}":"${PN}" /var/lib/"${PN}"
+	fperms 750 /var/lib/"${PN}"
+	keepdir /var/log/"${PN}"
+	fowners "${PN}":"${PN}" /var/log/"${PN}"
+	fperms 750 /var/log/"${PN}"
+	# Do last due to insopts modifications
+	insopts -m0640 -g "${PN}"
+	insinto /etc/"${PN}"
+	newins .env.template "${PN}".conf
+
+	readme.gentoo_create_doc
+	einstalldocs
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/vaultwarden/vaultwarden-9999.ebuild b/app-admin/vaultwarden/vaultwarden-9999.ebuild
index 605d2fefde83..08d4a769c9d3 100644
--- a/app-admin/vaultwarden/vaultwarden-9999.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-RUST_MIN_VER="1.95.0"
+RUST_MIN_VER="1.97.1"
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 QA_PRESTRIPPED="usr/bin/${PN}"
 
diff --git a/app-arch/xz-utils/xz-utils-5.8.4.ebuild b/app-arch/xz-utils/xz-utils-5.8.4.ebuild
index b67877bbcbfa..31d2ace89ac9 100644
--- a/app-arch/xz-utils/xz-utils-5.8.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.8.4.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; 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
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/ddcutil/ddcutil-2.2.7.ebuild b/app-misc/ddcutil/ddcutil-2.2.7.ebuild
index fb7290abc50b..4c5afef3a5c7 100644
--- a/app-misc/ddcutil/ddcutil-2.2.7.ebuild
+++ b/app-misc/ddcutil/ddcutil-2.2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+dbus systemd usb-monitor user-permissions video_cards_nvidia X"
 
 # In 2.2.0, DRM seems fairly embedded and non-optional even if the
diff --git a/app-misc/localsearch/localsearch-3.12.0.ebuild b/app-misc/localsearch/localsearch-3.12.0.ebuild
index 9f739f349b18..e3d096736456 100644
--- a/app-misc/localsearch/localsearch-3.12.0.ebuild
+++ b/app-misc/localsearch/localsearch-3.12.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gnome.pages.gitlab.gnome.org/localsearch"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="cue exif gsf +gstreamer iptc +iso +jpeg mediainfo +pdf +playlist raw seccomp test +tiff upower webp +xml xmp xps zip"
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index db643a6fb214..79271edd1e52 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,3 +1,2 @@
-DIST gnumeric-1.12.59.tar.xz 17773992 BLAKE2B be227ae70e4861ab1a7a1864ebcb57eed7f99052756f56cf29825a98682933f9ec7bbecd68e933043665065865466881ca1431b5e8b3b6a216461cc5e6495388 SHA512 51b4fc23166d75788bcb86260c5e17fa4bb48f8920a0f9bc001609417be75f707650f057c58d480e9ded1dc8460407629329c19154c65d273a6edc7682d3428f
-DIST gnumeric-1.12.60.tar.xz 17794296 BLAKE2B e3310dc02bb2bc0f111e003c3ff3ad455cac7ca6c4021bf46adf603a35a6ee35f47452ad869af533f715c5f12fc1c95a6c3377b6fb45e5017e6b3be4067a239f SHA512 43529ca05411cba02b052754cd15bbe84b5205e58ebb7dc5e7c07131600842e523a108f509020845f036f27b0d78eb9df6db970dfeb21285dc7e5fd8171fea56
 DIST gnumeric-1.12.61.tar.xz 17921384 BLAKE2B b0c07157d961e1b9d6636dd06b03aea922002257471799332a202f4a5b7543c5b6316d4a2d52e68b795c15189607da0b1777c6904fa327e0dcb6496164fbc50c SHA512 67a351fa850333743606ea77a2b4439b8932c51704c2d625a333a79ed1dcf40ac027259f76538136e3167dcadde59430552f7d455d3052cc420bbbe83ad001e3
+DIST gnumeric-1.12.62.tar.xz 18144824 BLAKE2B 96dd23bef583bb432914c1a4689dc5488b998261e15c571fc139d2e4dba630a385100e25dc40d24bda2bc1d58d5b55a8a9c517eb2d87f436e885d367a0eb6f73 SHA512 da38f26f61bc6719dbdf1ba0d34991d0061e6672bbbeb9302eb4fb284c0e3313c169c6580f95e001123ccd5d73efa8a7d5ec8ea45c3162b094c526df90424da1
diff --git a/app-office/gnumeric/gnumeric-1.12.59-r1.ebuild b/app-office/gnumeric/gnumeric-1.12.59-r1.ebuild
deleted file mode 100644
index 0d64aac30569..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.59-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit gnome.org libtool python-r1 xdg
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+introspection libgda perl"
-REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-# Gnumeric has two python components
-# 1. The python loader for loading python-based plugins.
-#    This component is pure python 2 and a port "is not currently being worked on".
-# 2. The python gobject-based introspection API. This component is compatible
-#    with python 3.
-# Component 1. can only be re-enabled once someone has ported the upstream
-# codebase to python 3.
-# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
-RDEPEND="
-	app-arch/bzip2
-	virtual/zlib:=
-	>=dev-libs/glib-2.40.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.57:0.10[introspection?]
-	>=dev-libs/libxml2-2.4.12:2=
-	>=x11-libs/pango-1.46.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg(+)]
-
-	introspection? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-1.82.0-r2:=
-	)
-	perl? ( dev-lang/perl:= )
-	libgda? ( gnome-extra/libgda:5[gtk] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-build/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Manage gi overrides ourselves
-	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--disable-static \
-		--without-psiconv \
-		--without-python \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl)
-}
-
-src_install() {
-	default
-	dodoc HACKING MAINTAINERS
-
-	if use introspection; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.60.ebuild b/app-office/gnumeric/gnumeric-1.12.62.ebuild
index c06a8975cc2f..bdd79e553a94 100644
--- a/app-office/gnumeric/gnumeric-1.12.60.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.62.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{13..14} )
 
 inherit gnome.org libtool python-r1 xdg
@@ -9,7 +10,7 @@ inherit gnome.org libtool python-r1 xdg
 DESCRIPTION="The GNOME Spreadsheet"
 HOMEPAGE="http://www.gnumeric.org/"
 
-LICENSE="GPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+introspection libgda perl"
@@ -34,12 +35,13 @@ RDEPEND="
 	app-arch/bzip2
 	virtual/zlib:=
 	>=dev-libs/glib-2.40.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.60:0.10[introspection?]
+	>=gnome-extra/libgsf-1.14.45:=
+	>=x11-libs/goffice-0.10.61:0.10[introspection?]
 	>=dev-libs/libxml2-2.4.12:2=
 	>=x11-libs/pango-1.46.0:=
+	>=dev-libs/fribidi-1.0.6
 
-	>=x11-libs/gtk+-3.8.7:3
+	>=x11-libs/gtk+-3.20.0:3
 	x11-libs/cairo:=[svg(+)]
 
 	introspection? (
@@ -54,6 +56,7 @@ BDEPEND="
 	app-text/yelp-tools
 	dev-build/gtk-doc-am
 	>=dev-util/intltool-0.35.0
+	dev-util/itstool
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -63,6 +66,9 @@ src_prepare() {
 	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
 
 	elibtoolize
+
+	# Remove useless GPLv2 only file, bug #937619
+	rm tools/win32/jhbuildrc.py || die
 }
 
 src_configure() {
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 64bca3fc5ea0..16c03b481a08 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,3 +1,2 @@
-DIST gentoolkit-0.7.6.tar.bz2 3191813 BLAKE2B a56c575ab2026abe2ace0b6fe7c411d892b8aeb8722ecac929ccfe8da141683c630c490d35bedcfe0cf67e0fe071a2f45b7b7731b052a34b47f798c10102f240 SHA512 723611caea039272870b928a8fb3c2681fbde68ace09049d2f1b44fb9181b4ceb706593b9e6c7b4b465393e80e3582791c384d79b8622423bbc676b3d28a6a44
-DIST gentoolkit-0.8.0.tar.bz2 3191836 BLAKE2B 4fc4db2b394521ae6ee41b18868c022628a6c69d814810821713ba5b203d21e9bdda789ff37588efe77f2af7625a7b6993d4d24e68da2a13e8cdda2a25999767 SHA512 96d343401afd548106280120bfa7e8e25f3b31027cf84a3f950bec93680bc3fe49d56f1c0a6fb4284a8505bf1868a36d0f7eb68815c556edf0c48a541d172fad
 DIST gentoolkit-0.8.1.tar.bz2 3192301 BLAKE2B 6a630e96233526905fed7c7e3d6e0ab82786810a0caa90ac7353cad564499bd9bd172babb127c4cc1a5e63e094c7fafe4618b7c106e178691f0636ce22f97518 SHA512 b5e04b985071bc5fe6033767d92d5482157cee14fdeb5c039555712a0ba8d0469db1dffa1382e7dd8cd0b38bd48dc4592433303815f65c728b277b9b7272c4c3
+DIST gentoolkit-0.8.2.tar.bz2 3192292 BLAKE2B c72cdfb27cf3168b7ff4e6524bbaa940982d6cd67f8e8fcf15a4348aa1cd87afc03311b7d7eeb3eeb8d8344ae486a03a5f37bc992d25f1a73db30f9edb896f82 SHA512 72e84b88b1a93aa3630d57c7770c10cebc3e9b3a9026eee5cae0d8d13a164078a66a0bf974976262313517bc1dc5ce9c6c6af3366fc8a79b2ef5daac61269543
diff --git a/app-portage/gentoolkit/gentoolkit-0.8.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.8.0.ebuild
deleted file mode 100644
index e4c9ab36c8db..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.8.0.ebuild
+++ /dev/null
@@ -1,130 +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} )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit meson python-r1 tmpfiles
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/gentoolkit.git
-		https://github.com/gentoo/gentoolkit
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Need newer Portage for eclean-pkg API, bug #900224
-DEPEND="
-	>=sys-apps/portage-3.0.57[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	app-alternatives/awk
-	sys-apps/gentoo-functions
-"
-
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/meson-1.2.1-r1
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	' python3_12)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default
-	if use prefix-guest ; then
-		# use correct repo name, bug #632223
-		sed -i \
-			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
-			pym/gentoolkit/profile.py || die
-	fi
-}
-
-src_configure() {
-	local code_only=false
-	python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
-	local emesonargs=(
-		-Dcode-only=${code_only}
-		$(meson_use test tests)
-		-Deprefix="${EPREFIX}"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-	code_only=true
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl my_src_install
-	dotmpfiles data/tmpfiles.d/revdep-rebuild.conf
-
-	local scripts
-	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
-	python_replicate_script "${scripts[@]}"
-}
-
-my_src_install() {
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-	)
-
-	meson_src_install
-	python_optimize "${pydirs[@]}"
-}
-
-pkg_postinst() {
-	tmpfiles_process revdep-rebuild.conf
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.7.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.8.2.ebuild
index e4c9ab36c8db..93fd6972062a 100644
--- a/app-portage/gentoolkit/gentoolkit-0.7.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.8.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2"
-	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
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index baf673ac660e..7057010f3483 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,4 +1,3 @@
-DIST mirrorselect-2.6.4.tar.gz 19053 BLAKE2B 8ade56ebcac99bc50c7912da43768eff411cc1e3ad9f2670482b7cb6ea897e3cce1f1716c4b8f3a05491820a7dcd74ce42e278bacfb1b92b54da13021b2dbe5e SHA512 e1251496af1d3862bd52c78ebf4a4a09a8fc1cd489b5eb4063d107befc6b1f14de312b16f61fcc362653d4bb8306145f48d29a3d5aedc9042ec80f1185eabd22
 DIST mirrorselect-2.7.0.tar.gz 19060 BLAKE2B 0e40cc22206eaba1bb0e3dbd3a759c6047de42247d03f54809e9502a5f4bdfd03027bb40938afd16bfcfd06cc16f57962519bfc04d0a51300273b8908473f8e8 SHA512 3ee8e0a92d8859fc05ab9e883c1171c7da5f202a3e4c2d414420c9600877ddfcee6a0c681f62484c2060fdf11af8f562583cf714e37926512cb8c0b15dfe921e
 DIST mirrorselect-2.8.1.tar.gz 19446 BLAKE2B 156563057b0e0c5f36f7ffb9d61abd3a8e3f75abf48aeff3c690b24934c486f5ba4919f391b08198029e529f4001d5e3098a55cf5105ea566a2dbd6223e9faa0 SHA512 99f5ae4b977ee8c11df617265d9832a7499fc654be31e8cdbb19663067188b42f5460cf063d4ad1b25eab665bdd4814a2a741f06abbf6474e3931d0030d41c97
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
diff --git a/app-portage/mirrorselect/mirrorselect-2.6.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.6.4.ebuild
deleted file mode 100644
index 94d221135b67..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.6.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit edo distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mirrorselect.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/mirrorselect.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-BDEPEND="${DISTUTILS_DEPS}"
-RDEPEND="
-	dev-util/dialog
-	>=net-analyzer/netselect-0.4
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	python_setup
-
-	local -x VERSION="${PVR}"
-	sed -e 's:os.path.join(os.sep, EPREFIX.lstrip(os.sep), "usr/share/man/man8"):"share/man/man8":' \
-		-i setup.py || die
-	eprefixify setup.py mirrorselect/main.py
-	edo "${PYTHON}" setup.py set_version
-
-	distutils-r1_python_prepare_all
-}
diff --git a/app-shells/bash/bash-5.3_p20-r1.ebuild b/app-shells/bash/bash-5.3_p20-r1.ebuild
new file mode 100644
index 000000000000..aa66849ba16b
--- /dev/null
+++ b/app-shells/bash/bash-5.3_p20-r1.ebuild
@@ -0,0 +1,487 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset.
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+MY_PATCHES=()
+
+# Determine the patchlevel. See https://ftp.gnu.org/gnu/bash/bash-5.3-patches/.
+case ${PV} in
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		if [[ ${PV} =~ _pre[0-9]{8}$ ]]; then
+			BASH_COMMIT=
+		fi
+		;;
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	*)
+		PLEVEL=0
+esac
+
+# The version of readline this bash normally ships with. Note that we only use
+# the bundled copy of readline for pre-releases.
+READLINE_VER="8.3"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${BASH_COMMIT} ]]; then
+	# It can be useful to have snapshots in the pre-release period once
+	# the first alpha is out, as various bugs get reported and fixed from
+	# the alpha, and the next pre-release is usually quite far away.
+	#
+	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
+	SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz"
+	S=${WORKDIR}/${PN}-${BASH_COMMIT}
+else
+	my_urls=( "mirror://gnu/bash/${MY_P}.tar.gz" )
+
+	# bash-5.1 -> bash51
+	my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.}
+
+	for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do
+		printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}"
+		my_urls+=( "mirror://gnu/bash/${MY_P}-patches/${my_patch_ver}" )
+		MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" )
+	done
+
+	SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )"
+	S=${WORKDIR}/${MY_P}
+
+	unset -v my_urls my_p my_patch_idx my_patch_ver
+fi
+
+if [[ ${GENTOO_PATCH_VER} ]]; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if (( PLEVEL >= 0 )); then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if (( PLEVEL >= 0 )); then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011).
+BDEPEND="
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+# EAPI 8 tries to append it but it doesn't exist here.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# bug #971782
+	"${FILESDIR}"/${PN}-5.3_p9-general-workaround-aliasing-violation-in-REVERSE_LIS.patch
+
+	# bug #965423, bug #970713
+	"${FILESDIR}"/${PN}-5.3_p9-pid-reuse.patch
+
+	# Patches to or from Chet, posted to the bug-bash mailing list.
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+	"${FILESDIR}"/${PN}-5.3_p20-comsub-export-env-rebuild.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif (( PLEVEL < 0 )) && [[ ${BASH_COMMIT} ]]; then
+		default
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
+			done
+		fi
+
+		unpack "${MY_P}.tar.gz"
+
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches.
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985.
+	sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \
+	&& touch -r . doc/* \
+	|| die
+
+	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
+	rm tests/run-jobs || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local -a myconf
+
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	#
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime. Chet also advises against use of byacc:
+	# https://lists.gnu.org/archive/html/bug-bash/2025-08/msg00115.html
+	unset -v YACC
+
+	if tc-is-cross-compiler; then
+		export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		# https://lists.gnu.org/archive/html/bug-bash/2025-05/msg00029.html
+		export CFLAGS_FOR_BUILD="${BUILD_CFLAGS} -std=gnu17"
+
+		if use kernel_Hurd ; then
+			# Necessary for cross-built bash for Hurd, otherwise
+			# config.status generation at end of configure will hang
+			# natively.
+			#
+			# https://lists.debian.org/debian-cross/2023/11/msg00000.html
+			# https://lists.gnu.org/archive/html/bug-bash/2024-11/msg00202.html
+			# https://lists.gnu.org/archive/html/bug-bash/2005-04/msg00074.html
+			cat <<-EOF > builtins/psize.sh || die
+			#!/bin/sh
+			echo "#define PIPESIZE 16384"
+			EOF
+			chmod +x builtins/psize.sh || die
+		fi
+	fi
+
+	myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h.
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DDEFAULT_LOADABLE_BUILTINS_PATH=\'\""${EPREFIX}"/usr/local/$(get_libdir)/bash:"${EPREFIX}"/usr/$(get_libdir)/bash\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	use nls || myconf+=( --disable-nls )
+
+	if (( PLEVEL >= 0 )); then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash"
+	else
+		# Disable the plugins logic by hand since bash doesn't provide
+		# a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	local -a pgo_generate_flags pgo_use_flags
+	local flag
+
+	# -fprofile-partial-training because upstream notes the test suite isn't
+	# super comprehensive.
+	# https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	if use pgo; then
+		pgo_generate_flags=(
+			-fprofile-update=atomic
+			-fprofile-dir="${T}"/pgo
+			-fprofile-generate="${T}"/pgo
+		)
+		pgo_use_flags=(
+			-fprofile-use="${T}"/pgo
+			-fprofile-dir="${T}"/pgo
+		)
+		if flag=$(test-flags-CC -fprofile-partial-training); then
+			pgo_generate_flags+=( "${flag}" )
+			pgo_use_flags+=( "${flag}" )
+		fi
+	fi
+
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others
+
+	# Build Bash and run its tests to generate profiles.
+	if (( ${#pgo_generate_flags[@]} )); then
+		# Used in test suite.
+		unset -v A
+
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check
+
+		if tc-is-clang; then
+			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
+		fi
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset -v A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	my_prefixify() {
+		while read -r; do
+			if [[ $REPLY == *$1* ]]; then
+				REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"}
+			fi
+			printf '%s\n' "${REPLY}" || ! break
+		done < "$2" || die
+	}
+
+	dodir /bin
+	mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	my_prefixify bashrc.d "${FILESDIR}"/bashrc-r2 | newins - bashrc
+
+	insinto /etc/bash/bashrc.d
+	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color-r2.bash | newins - 10-gentoo-color.bash
+	newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r3.bash 10-gentoo-title.bash
+
+	insinto /etc/profile.d
+	doins "${FILESDIR}/profile.d/00-prompt-command.sh"
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc}; do
+		newins "${FILESDIR}/skel/dot-${f}" ".${f}"
+	done
+
+	if use plugins; then
+		exeinto "/usr/$(get_libdir)/bash"
+		set -- examples/loadables/*.o
+		doexe "${@%.o}"
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples; then
+		for d in examples/{functions,misc,scripts,startup-files}; do
+			exeinto "/usr/share/doc/${PF}/${d}"
+			docinto "${d}"
+			for f in "${d}"/*; do
+				if [[ ${f##*/} != @(PERMISSION|*README) ]]; then
+					doexe "${f}"
+				else
+					dodoc "${f}"
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1.
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then
+		mkdir -p -- "${EROOT}"/etc/bash \
+		&& mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	local IFS old_ver ver
+	local -a versions
+
+	# If /bin/sh does not exist, provide it.
+	if [[ ! -e ${EROOT}/bin/sh ]]; then
+		ln -sf -- bash "${EROOT}"/bin/sh || die
+	fi
+
+	if [[ -e ${EROOT}/etc/bash/bashrc.d/15-gentoo-bashrc-check.bash ]]; then
+		ewarn "The following file is no longer packaged and can safely be deleted:"
+		ewarn "${EROOT}/etc/bash/bashrc.d/15-gentoo-bashrc-check.bash"
+	fi
+
+	read -rd '' -a versions <<<"${REPLACING_VERSIONS}"
+	for ver in "${versions[@]}"; do
+		if [[ ! ${old_ver} ]] || ver_test "${ver}" -lt "${old_ver}"; then
+			old_ver=${ver}
+		fi
+	done
+
+	if [[ ! ${old_ver} ]]; then
+		return
+	fi
+
+	{
+		if ver_test "${old_ver}" -ge "5.2" \
+			&& ver_test "${old_ver}" -ge "5.2_p26-r8"
+		then
+			:
+		elif ver_test "${old_ver}" -lt "5.2" \
+			&& ver_test "${old_ver}" -ge "5.1_p16-r8"
+		then
+			:
+		else
+			cat <<'EOF'
+Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, it may contain a command to set
+the terminal's window title. Those who were already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash set the window title in the case
+that the terminal is controlled by sshd(8), unless screen is launched on the
+remote side or the terminal reliably supports saving and restoring the title
+(as alacritty, foot and tmux do). Those wanting for the title to be set
+regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d
+drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
+		fi
+
+		if ver_test "${old_ver}" -ge "5.3" \
+			&& ver_test "${old_ver}" -ge "5.3_p3-r3"
+		then
+			:
+		elif ver_test "${old_ver}" -lt "5.3" \
+			&& ver_test "${old_ver}" -ge "5.2_p37-r5"
+		then
+			:
+		else
+			cat <<'EOF'
+The window title setting behaviour has been improved. It is now formatted as
+"\u@\h \W", in accordance with the prompting mechanism of bash. For example,
+after switching to the home directory, the current working directory will be
+shown as the <tilde> character.
+
+The value of PROMPT_DIRTRIM is now respected. If this variable is unset, the
+use of the \W prompt string escape will prevail, with the current working
+directory typically being shown as its basename. If set to 0 or greater, \w
+will be used instead, which may be trimmed. This also means that the title
+can be made to show the full path by setting PROMPT_DIRTRIM=0.
+
+For further information, run info '(bash)Bash Variables' or visit
+https://www.gnu.org/software/bash/manual/bash.html#index-PROMPT_005fDIRTRIM.
+EOF
+		fi
+	} \
+	| if [[ ${COLUMNS} == [1-9]*([0-9]) ]] && (( COLUMNS > 80 )); then
+		fmt -w "$(( COLUMNS - 3 ))"
+	else
+		cat
+	fi \
+	| while read -r; do
+		ewarn "${REPLY}"
+	done
+}
diff --git a/app-shells/bash/bash-5.3_p20.ebuild b/app-shells/bash/bash-5.3_p20.ebuild
index 214a8bf8bc04..c593e7fa276c 100644
--- a/app-shells/bash/bash-5.3_p20.ebuild
+++ b/app-shells/bash/bash-5.3_p20.ebuild
@@ -75,7 +75,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if (( PLEVEL >= 0 )); 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="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/files/bash-5.3_p20-comsub-export-env-rebuild.patch b/app-shells/bash/files/bash-5.3_p20-comsub-export-env-rebuild.patch
new file mode 100644
index 000000000000..b0b3dad0eea7
--- /dev/null
+++ b/app-shells/bash/files/bash-5.3_p20-comsub-export-env-rebuild.patch
@@ -0,0 +1,53 @@
+https://lists.gnu.org/archive/html/bug-bash/2026-05/msg00037.html (https://lists.gnu.org/archive/html/bug-bash/2026-05/msg00063.html)
+https://lists.gnu.org/archive/html/bug-bash/2026-05/msg00054.html
+
+From b1d9695f781bd53f1d30781b26f1fbbcbb6d2eb6 Mon Sep 17 00:00:00 2001
+Message-ID: <b1d9695f781bd53f1d30781b26f1fbbcbb6d2eb6.1791680029.git.sam@gentoo.org>
+From: Kerin Millar <kfm@plushkava.net>
+Date: Sun, 31 May 2026 19:55:28 +0200
+Subject: [PATCH] execute_cmd.c: avoid export-environment rebuilds in comsubs
+
+This is a partial backport of commit 2d4ba0c61858 from the devel branch.
+It addresses a performance regression affecting command substitutions
+with large exported environments.
+
+execute_cmd.c
+    - execute_disk_command: if we update SHLVL, do it after (maybe)
+      making the export environment and then update the export env in
+      place, so we don't have to rebuild it twice or rebuild it more
+      times than necessary
+
+Link: https://git.savannah.gnu.org/cgit/bash.git/commit/?id=2d4ba0c61858
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+---
+ execute_cmd.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/execute_cmd.c b/execute_cmd.c
+index 6a22395e..739991f9 100644
+--- execute_cmd.c
++++ execute_cmd.c
+@@ -5814,9 +5814,17 @@ execute_disk_command (WORD_LIST *words, REDIRECT *redirects, char *command_line,
+ 	 shell level like `exec' would do. Don't do this if we are already
+ 	 in a pipeline environment, assuming it's already been done. */
+       if (nofork && pipe_in == NO_PIPE && pipe_out == NO_PIPE && (subshell_environment & SUBSHELL_PIPE) == 0)
+-	adjust_shell_level (-1);
+-
+-      maybe_make_export_env ();
++	{
++	  maybe_make_export_env ();
++	  adjust_shell_level (-1);
++	  update_export_env_inplace ("SHLVL=", 6, get_string_value ("SHLVL"));
++	  /* adjust_shell_level() marks the export environment dirty because SHLVL is
++	     exported. Since we have already built the environment, update SHLVL in place
++	     below and avoid forcing a full rebuild here. */
++	  array_needs_making = 0;
++	}
++      else
++	maybe_make_export_env ();
+       put_command_name_into_env (command);
+     }
+   else if (command == 0 && notfound_str == 0)	/* make sure */
+
+-- 
+2.56.0
diff --git a/dev-build/cmake/cmake-4.3.4.ebuild b/dev-build/cmake/cmake-4.3.4.ebuild
index 96ab566985ba..eff799f1bf9a 100644
--- a/dev-build/cmake/cmake-4.3.4.ebuild
+++ b/dev-build/cmake/cmake-4.3.4.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20250904 )"
diff --git a/dev-build/cmake/cmake-4.3.5.ebuild b/dev-build/cmake/cmake-4.3.5.ebuild
index dd71025527dc..5f2a1d597b36 100644
--- a/dev-build/cmake/cmake-4.3.5.ebuild
+++ b/dev-build/cmake/cmake-4.3.5.ebuild
@@ -53,7 +53,7 @@ else
 	)"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20260908 )"
diff --git a/dev-build/meson/meson-1.12.1.ebuild b/dev-build/meson/meson-1.12.1.ebuild
index 94aa40fd9ce2..88658975076e 100644
--- a/dev-build/meson/meson-1.12.1.ebuild
+++ b/dev-build/meson/meson-1.12.1.ebuild
@@ -37,7 +37,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-cpp/ada/ada-4.0.0.ebuild b/dev-cpp/ada/ada-4.0.0.ebuild
index 5f29d430cdc2..f7201dd452f6 100644
--- a/dev-cpp/ada/ada-4.0.0.ebuild
+++ b/dev-cpp/ada/ada-4.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ada-url/ada/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv ~x86"
 RESTRICT="test"
 
 src_configure() {
diff --git a/dev-cpp/robin-map/robin-map-1.4.1.ebuild b/dev-cpp/robin-map/robin-map-1.4.1.ebuild
index 8171bfc100bd..22927c5641d2 100644
--- a/dev-cpp/robin-map/robin-map-1.4.1.ebuild
+++ b/dev-cpp/robin-map/robin-map-1.4.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Tessil/robin-map"
 else
 	SRC_URI="https://github.com/Tessil/robin-map/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-db/mariadb/mariadb-11.4.13-r1.ebuild b/dev-db/mariadb/mariadb-11.4.13-r1.ebuild
index adc4ed011673..cea347c1fc28 100644
--- a/dev-db/mariadb/mariadb-11.4.13-r1.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.13-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 x86"
 IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
diff --git a/dev-db/mariadb/mariadb-11.8.9-r1.ebuild b/dev-db/mariadb/mariadb-11.8.9-r1.ebuild
index 54742a1faadd..e39d5a1b4c1b 100644
--- a/dev-db/mariadb/mariadb-11.8.9-r1.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.9-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
diff --git a/dev-debug/gdb/gdb-17.2-r1.ebuild b/dev-debug/gdb/gdb-17.2-r1.ebuild
index 508b50f8232e..79131c1590e2 100644
--- a/dev-debug/gdb/gdb-17.2-r1.ebuild
+++ b/dev-debug/gdb/gdb-17.2-r1.ebuild
@@ -78,7 +78,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="babeltrace cet +debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla +xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	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"
 fi
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-28.30.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-28.30.ebuild
index 7b4405600e5b..295da7f30636 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-28.30.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-28.30.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD rpi-eeprom"
 SLOT="0"
-KEYWORDS="-* ~arm ~arm64"
+KEYWORDS="-* arm arm64"
 IUSE="pi4 pi5"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 764162e17b62..0793e16e1b27 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -15,6 +15,8 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808
 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
 DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a
 DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
+DIST openjdk-bootstrap-21.0.12.1_p1-arm.tar.xz 116982300 BLAKE2B a827b4be7abef27845c66e6d207447e8044db8f4f40b46b2b86aa286b8acc43aa8657f01eb06c7c706d5d3715be3899d7d10a48b668841ca67dda56fed49dda1 SHA512 745aef168a4fa2dd1a9c0b496d1ff157e71510e3f883ebb99ad906af250eb6a6a147077951cc73a64a021d110bbd4569dc75079dee5495ece1ec30f0f7fb9bd4
+DIST openjdk-bootstrap-25.0.4.1_p1-arm.tar.xz 125823788 BLAKE2B 98879149ccd5e7400c6dba5ca061d37191bff895bc93850bbd564d828c7c3109df60e87d0e9efe21061f605f18288e88705b2ca017f064d4efee34b33f575325 SHA512 0fa47ea84f908b67ae8825043e3f56bd555e4f6b1ac632abeaf43bba878aebc937a130ea13bbf94a0f9cff07085bc2f2e4f853910f8e3b143e7146888f87a273
 DIST openjdk-bootstrap-25_p36-ppc64.tar.xz 140209032 BLAKE2B 29f4cd87386543e611e70824abbacc1c433d0f5400fb115e4e0905fb9d92a9961c2fc8ee9f126739ce1695e9b6f657015c4fbfceb854e09127bdbb14a6106773 SHA512 98cc7b46d213d01846468a35108bd1c2ffedd3b51f5180561717b07aefaca98d08a642b2118d38b9822c29b2e61bc046833d2524fe63926c3ad4777b135d7026
 DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
 DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
diff --git a/dev-java/openjdk/openjdk-21.0.12.1_p1-r1.ebuild b/dev-java/openjdk/openjdk-21.0.12.1_p1-r1.ebuild
index d9e8c04f1924..6b9827cdbd65 100644
--- a/dev-java/openjdk/openjdk-21.0.12.1_p1-r1.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.12.1_p1-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM_XPAK="21.0.12.1_p1"
 PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
 X86_XPAK="21.0.0_p35"
 
@@ -38,6 +39,7 @@ SRC_URI="
 	https://github.com/${PN}/jdk21u/archive/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
 	!system-bootstrap? (
+		$(bootstrap_uri arm ${ARM_XPAK})
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 		$(bootstrap_uri x86 ${X86_XPAK})
 	)
@@ -46,13 +48,13 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap"
 
 REQUIRED_USE="
 	!system-bootstrap? ( jbootstrap )
-	!system-bootstrap? ( || ( ppc64 x86 ) )
+	!system-bootstrap? ( || ( arm ppc64 x86 ) )
 "
 
 COMMON_DEPEND="
diff --git a/dev-java/openjdk/openjdk-25.0.4.1_p1.ebuild b/dev-java/openjdk/openjdk-25.0.4.1_p1.ebuild
index e3a805c26bcc..f7082b22f93f 100644
--- a/dev-java/openjdk/openjdk-25.0.4.1_p1.ebuild
+++ b/dev-java/openjdk/openjdk-25.0.4.1_p1.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
+ARM_XPAK="25.0.4.1_p1"
 PPC64_XPAK="25_p36" # big-endian bootstrap tarball
 
 # Usage: bootstrap_uri <keyword> <version> [extracond]
@@ -61,6 +62,7 @@ SRC_URI="
 	https://github.com/${PN}/${JDK_REPO}/archive/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
 	!system-bootstrap? (
+		$(bootstrap_uri arm ${ARM_XPAK})
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 	)
 "
@@ -68,13 +70,13 @@ S="${WORKDIR}/${JDK_REPO}-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap"
 
 REQUIRED_USE="
 	!system-bootstrap? ( jbootstrap )
-	!system-bootstrap? ( ppc64 )
+	!system-bootstrap? ( || ( arm ppc64 ) )
 "
 
 COMMON_DEPEND="
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 43d38aa76567..493ddbae2efe 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,3 +1,4 @@
 DIST ocaml-4.14.2.tar.gz 5505119 BLAKE2B 518c2a69ee32e1c141b574a9800a64efc445381eb2808985b5dbb9d5ec54228aa25042a1c410307c3556488ba12a751980396b0d9a01e60a1ea84ac5b52e6dd6 SHA512 61bfa7961aae02458210f10865a5703f7a50a9be2452379e820cf2dfac2c6037da553c31835145e50a776880bdeb2ec78cd7a3147d65f418e7b3e593534e8a04
 DIST ocaml-5.3.0.tar.gz 6239856 BLAKE2B a790293d14a31d34b10f2fac22a416e967c2a06f64001b54665e691a6aecdb71caf60dd6217460257f8d18191551ffa01d0d3d62327c6eb9bc63c254c162752e SHA512 73817ada340bdf4091b3edd7b292bd0074c87b4836f202f48ecf0f620a00feaa70ebc9101b97155e8caa6907646dfdf21eff728fa0e14542df3b5e5436229d06
 DIST ocaml-5.4.0.tar.gz 6448449 BLAKE2B 88a055ac07a7ce126b71d8a242e63b68689bb637f40f0adc08e8f0be28961f7d7a6b3a2a673a137726f5100d4a032b6bba7424b168b283553e859f1bf868b482 SHA512 3684468800f4528c9fd96ef3fdd6aa04f71b77180d3ae8045d429f96b32e23cb3a8a307762c7237b6c56c087f45b59b0dab672a31166e3de254bb0fb9b4eb588
+DIST ocaml-5.5.1.tar.gz 6611164 BLAKE2B 6e79379ea9a761e2565f46d49ccfdcb93fc6a6cea0e9efea03a33e4d49ea12591a9a73520f41f2dc77ab6f986abd09159fa748a6d073981f6db944516b0afb15 SHA512 860fc91424b0fedf8b7045a59215da732dee4def07f6fb25d1dbd09bdf3d0e892e36205788f9c4ccc04ae0d3c3ff83a7797b43c7d6aa8d06ab28f6213ce2bc56
diff --git a/dev-lang/ocaml/ocaml-5.5.1.ebuild b/dev-lang/ocaml/ocaml-5.5.1.ebuild
new file mode 100644
index 000000000000..3223e9ee78b4
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-5.5.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://caml.inria.fr/pub/distrib/ocaml-5.5/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="emacs flambda latex +ocamlopt test xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+	!dev-ml/findlib:0/0"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+	# OCaml generates textrels on 32-bit arches
+	# We can't do anything about it, but disabling it means that tests
+	# for OCaml-based packages won't fail on unexpected output
+	# bug #773226
+	if use arm || use ppc || use x86 ; then
+		append-ldflags "-Wl,-z,notext"
+	fi
+
+	# Upstream build ignores LDFLAGS in several places.
+	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' Makefile.config.in || die "LDFLAGS fix failed"
+
+	# drop failing test (domain_count < nproc)
+	rm testsuite/tests/parallel/recommended_domain_count_unix.ml || die
+
+	# test is not working
+	rm testsuite/tests/native-debugger/linux-gdb-amd64.ml || die
+}
+
+src_configure() {
+	filter-lto #bug 870349
+	local opt=(
+		--bindir="${EPREFIX}/usr/bin"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable test ocamltest) \
+		$(use_enable flambda)
+	)
+
+	econf "${opt[@]}"
+}
+
+src_compile() {
+	env -u P emake world
+
+	if use ocamlopt ; then
+		env -u P emake opt
+		env -u P emake opt.opt
+	fi
+}
+
+src_test() {
+	emake -j
+
+	# OCaml tests only work when run sequentially
+	if use ocamlopt ; then
+		emake -j1 ocamltest.opt
+	else
+		emake -j1 ocamltest
+		#ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
+	fi
+
+	emake -j1 tests
+}
+
+src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
+	default
+
+	dodir /usr/include
+	# Create symlink for header files
+	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+	dodoc Changes README.adoc
+
+	# Create envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${T}"/ocaml.conf
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.98.1.ebuild b/dev-lang/rust-bin/rust-bin-1.98.1.ebuild
index 4c1ae303bd26..618ce739f3d1 100644
--- a/dev-lang/rust-bin/rust-bin-1.98.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.98.1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="$(rust_all_arch_uris "rust-${PV}")
 		rust-src? ( ${RUST_TOOLCHAIN_BASEURL%/}/2026-09-03/rust-src-${PV}.tar.xz )
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 GENTOO_BIN_BASEURI="https://github.com/projg2/rust-bootstrap/releases/download/${PVR}" # omit trailing slash
diff --git a/dev-lang/rust-common/rust-common-1.98.1.ebuild b/dev-lang/rust-common/rust-common-1.98.1.ebuild
index 1037d635a091..44d5013f245f 100644
--- a/dev-lang/rust-common/rust-common-1.98.1.ebuild
+++ b/dev-lang/rust-common/rust-common-1.98.1.ebuild
@@ -32,7 +32,7 @@ else
 		verify-sig? ( https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz.asc )
 	"
 	S="${WORKDIR}/rustc-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
diff --git a/dev-lang/rust/rust-1.98.1.ebuild b/dev-lang/rust/rust-1.98.1.ebuild
index fa51029e3894..0b9cd7ed23f9 100644
--- a/dev-lang/rust/rust-1.98.1.ebuild
+++ b/dev-lang/rust/rust-1.98.1.ebuild
@@ -61,7 +61,7 @@ else
 	"
 	S="${WORKDIR}/${MY_P}-src"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Systems programming language originally developed by Mozilla"
diff --git a/dev-libs/aws-c-mqtt/Manifest b/dev-libs/aws-c-mqtt/Manifest
index 2892be0f1dbe..92a4fc3246c1 100644
--- a/dev-libs/aws-c-mqtt/Manifest
+++ b/dev-libs/aws-c-mqtt/Manifest
@@ -1,5 +1,4 @@
 DIST aws-c-mqtt-0.13.3.tar.gz 444303 BLAKE2B 88636ba6433c93a3984008cf4261d5f6605bd935956fcaafed074b07594f7b405210e1f012a3bdd955d18d572e71653a9fd37280a86ff601bd0ce49fc940c770 SHA512 edd4eade44be803d18f97064adfd98bae4f9c70401f8730876743663da93eb04dbc5aa90b458765430a7e24624f2c9cd7c62c19866235ec6983dd15bf95d8880
 DIST aws-c-mqtt-0.16.0.tar.gz 466531 BLAKE2B 51094d36c3593ae77a430a216e474bdefba88443d506709db7641a04164f41a8d16fcc01e6555ce14e4669a253f61be721e3e5f0226c0275cc98c7aed68689a3 SHA512 10bff6e2e7d84bcc67e62a83ce91e9ecd5e9cae31a41e749707219d4cc9d5bb694718388de1e4d010f7b14cad580f5cdc4becbdfa502ee9f509d350592e4fffb
 DIST aws-c-mqtt-1.0.0.tar.gz 470552 BLAKE2B 02998e120e3515df14bc9327a918da564b7cc041dc78a68e0b179a51e545946606024816ec3f7774e4eeeb29a53ae1aa09a312cb33f439acbfa407a85ce87d82 SHA512 ad0d30e758455fa0b9a2b981cabb206279d45654a8c874319b65bc38b1d1087e7698d01892cae29a4438fe481c2ac81c2ff07e8760fd4fe6cb95ddc90f3621e6
-DIST aws-c-mqtt-1.1.0.tar.gz 473487 BLAKE2B 1f846b9b738186bceeb993cd023b5940b0d34e9244242b7551cb09a30f9e7d9388c743418b33fd5e3d56cd5ad9d1ff3e924ae4e545f388449ed509fdc5835436 SHA512 9933025f21436b61786bd5905bbc8676507843bd12c60f0bf7177812b2db6ab32aeae9d9c3955f9b4c79660f08512a1171d4cfd80a8511edb17aa63766b55d59
 DIST aws-c-mqtt-1.1.1.tar.gz 473456 BLAKE2B 29d03f26b3062f4d914ba2be58136c1744455cc7fb01cc0931975f2d149e50fe8875813334a74ac149b37d8cd9570cd35c1e4832283a7221888bef68655c5b2f SHA512 e6c2df2d3d328317e3a2e9227f4bc7f5d9cbcde3152188e87be18502494918e6cefe6ad341d55bd0e3c7ea20e162032686a273c510f6be1cf081c206261864ce
diff --git a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.0.ebuild b/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1-r1.ebuild
index 80906897f29a..f05348d0d97a 100644
--- a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.0.ebuild
+++ b/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1-r1.ebuild
@@ -10,7 +10,8 @@ HOMEPAGE="https://github.com/awslabs/aws-c-mqtt"
 SRC_URI="https://github.com/awslabs/aws-c-mqtt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
+SLOT="0/$(ver_cut 1-2)-fixed"
+[[ ${PV} != 1.1* ]] && die "Remove -fixed above"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1.ebuild b/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1.ebuild
deleted file mode 100644
index 2d21050782b7..000000000000
--- a/dev-libs/aws-c-mqtt/aws-c-mqtt-1.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2025-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="AWS C MQTT: C99 implementation"
-HOMEPAGE="https://github.com/awslabs/aws-c-mqtt"
-SRC_URI="https://github.com/awslabs/aws-c-mqtt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/aws-c-common-1.0.0:=
-	>=dev-libs/aws-c-http-1.0.0:=
-	>=dev-libs/aws-c-io-1.0.0:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/aws-c-common"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAWS_GET_VERSION_MODULE="${ESYSROOT}/usr/$(get_libdir)/cmake/aws-c-common/modules/AwsGetVersion.cmake"
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use test; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
diff --git a/dev-libs/gmp/gmp-6.3.0-r1.ebuild b/dev-libs/gmp/gmp-6.3.0-r1.ebuild
deleted file mode 100644
index 4de48f340c64..000000000000
--- a/dev-libs/gmp/gmp-6.3.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gmp.asc
-inherit gnuconfig libtool flag-o-matic multilib-minimal toolchain-funcs verify-sig
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-
-MANUAL_PV=6.2.1
-
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="
-	https://gmplib.org/download/gmp/${MY_P}.tar.xz
-	mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )
-	verify-sig? ( https://gmplib.org/download/gmp/${MY_P}.tar.xz.sig )
-"
-S="${WORKDIR}"/${MY_P%a}
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-# The subslot reflects the C & C++ SONAMEs.
-SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="+asm doc +cpudetection +cxx pic static-libs"
-REQUIRED_USE="cpudetection? ( asm )"
-RESTRICT="!cpudetection? ( bindist )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/m4
-	verify-sig? ( sec-keys/openpgp-keys-gmp )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
-	"${FILESDIR}"/${PN}-6.2.1-no-zarch.patch
-)
-
-pkg_pretend() {
-	if use cpudetection && ! use amd64 && ! use x86 ; then
-		elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection"
-		elog "--enable-fat is a no-op on alternative arches."
-		elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made."
-	fi
-}
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# We cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# bug #536894
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
-	fi
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/usr/bin/env sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped} || die
-
-	# Save the upstream files named config.{guess,sub} which are
-	# wrappers around the gnuconfig versions.
-	mkdir "${T}"/gmp-gnuconfig || die
-	mv config.guess "${T}"/gmp-gnuconfig/config.guess || die
-	mv config.sub "${T}"/gmp-gnuconfig/config.sub || die
-	# Grab fresh copies from gnuconfig.
-	touch config.guess config.sub || die
-	gnuconfig_update
-	# Rename the fresh copies to the filenames the wrappers from GMP
-	# expect.
-	mv config.guess configfsf.guess || die
-	mv config.sub configfsf.sub || die
-}
-
-multilib_src_configure() {
-	# Generally a very fragile package
-	strip-flags
-	# Miscompiled with LTO at least on arm64, bug #889948
-	# 6.3.0 says it now supports LTO, but needs retesting on a variety
-	# of platforms. Fix was maybe https://gmplib.org/repo/gmp-6.3/rev/9c324044f4b5.
-	filter-lto
-	# https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html
-	append-cflags $(test-flags-CC -std=gnu17)
-
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-
-	# https://gmplib.org/manual/Notes-for-Package-Builds
-	local myeconfargs=(
-		# -std=gnu99 appended here for bug #919935 to help
-		# prefix building w/ older compilers.
-		CC_FOR_BUILD="$(tc-getBUILD_CC) -std=gnu99"
-
-		--localstatedir="${EPREFIX}"/var/state/gmp
-		--enable-shared
-
-		$(use_enable asm assembly)
-		# fat is needed to avoid gmp installing either purely generic
-		# or specific-to-used-CPU (which our config.guess refresh prevents at the moment).
-		# Both Fedora and opensuse use this option to tackle the issue, bug #883201.
-		#
-		# This only works for amd64/x86, so to get accelerated performance
-		# (i.e. not using the generic C), one needs USE=-cpudetection if
-		# on non-amd64/x86.
-		#
-		# (We do not mask USE=cpudetection on !amd64/x86 because we want
-		# the flag to be useful on other arches to allow opting out of the
-		# config.guess logic below.)
-		$(use_enable cpudetection fat)
-		$(use_enable cxx)
-		$(use_enable static-libs static)
-
-		# --with-pic forces static libraries to be built as PIC
-		# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
-		$(use pic && echo --with-pic)
-
-		# XXX: In the past, we had PGO support with upstream's 'tuneup' script
-		# per https://gmplib.org/manual/Performance-optimization, but we had
-		# a variety of issues with it: bug #454912, bug #650558, and bug #658688.
-	)
-
-	# Move the wrappers from GMP back into place (may have been destroyed by previous econf run)
-	cp "${T}"/gmp-gnuconfig/config.guess "${S}"/config.guess || die
-	cp "${T}"/gmp-gnuconfig/config.sub "${S}"/config.sub || die
-
-	# See bug #883201 again.
-	if ! use cpudetection && ! tc-is-cross-compiler ; then
-		local gmp_host=$("${S}"/config.guess || die "failed to run config.guess")
-
-		if [[ -z ${gmp_host} ]] ; then
-			die "Empty result from GMP's custom config.guess!"
-		fi
-
-		einfo "GMP guessed processor type: ${gmp_host}"
-		ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!"
-		export ac_cv_build="${gmp_host}"
-		export ac_cv_host="${gmp_host}"
-	fi
-
-	# Clang with -fsanitize=address may emit weird section names in its asm,
-	# which causes gmp's configure checks to select a broken way of
-	# specifying `.rodata`. Disable this feature, which was introduced in
-	# Clang 15 (and defaulted to on in Clang 18).
-	if tc-is-clang && [[ "$(clang-major-version)" -ge 15 ]]; then
-		append-cxxflags "-fno-sanitize-address-globals-dead-stripping"
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Should be a standalone lib
-	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
-
-	# This requires libgmp
-	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
-	if ! use static-libs ; then
-		rm -f "${la}" || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/libevdev/libevdev-1.13.7.ebuild b/dev-libs/libevdev/libevdev-1.13.7.ebuild
index 716471236929..eca5ee180daf 100644
--- a/dev-libs/libevdev/libevdev-1.13.7.ebuild
+++ b/dev-libs/libevdev/libevdev-1.13.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${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/mpc/Manifest b/dev-libs/mpc/Manifest
index 7b6b879e0478..22103ba71bec 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,6 +1,2 @@
-DIST mpc-1.3.1.tar.gz 773573 BLAKE2B 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
-DIST mpc-1.3.1.tar.gz.sig 119 BLAKE2B ec48cf3a37c3b4a923b354d5e321d73561361586dd6dee2ccfaf7e05021ec43dd34e6045dec475a47fae36cf5b36d9b3901ba677cb1bfc9016c3f28392c46099 SHA512 5c2e6cccf9c5e6a401095e4abf4c4c8eb44ae4cd81debaa94da817f68f7ef39a732e969d5c264912b0a44fd2a0575e2f903d71def38cb95fa073851e3a537e5c
-DIST mpc-1.4.0.tar.xz 532056 BLAKE2B d00dbc52a92efd619498671475743c9f35797343c731542f881c04c4a0b198f5b36df51bfde3ce520866d1851958409a6dd0de02d85d7b2e0ba00ccb27a30464 SHA512 de297e434b05905101b5a860e732b598da82129bdc28e3efebc0b36a107b6f2f4ae6962f55921ee20193df1dab241caf74dfc5d4dc1ae4b4edefbbcfe5b9c762
-DIST mpc-1.4.0.tar.xz.sig 119 BLAKE2B 6e821ce7e8ba4ba6f5622eaba8859d373bb3dae4bafa6c8d7295b74d55034fe73c7d30388744727164cb1ca124ddf305e9f3055fe9c583f5365468103509e6a1 SHA512 55d8aa606c683543bff8e766b46b5edc35759d1465b0fb51ef953e9c40dfcf4d1853277b7d98d231eee160dbfb68a3b7742d8226d01c8980f6cf4c23ff05d2d1
 DIST mpc-1.4.1.tar.xz 531992 BLAKE2B 793b4cf37e7e805dcbf24bc39903d5d778702e80cf5eac60b840834f09868656856a008cff6b45e7a5a312c3ed21a593d84f45765e9ac456ab3dd38a083acff1 SHA512 cdfbe64e80e30df64dbd536e8104a6bb10471582415d5b45a1dd30eb2a312781b38389a9531243413c14e0f88866a35159b20e77900718f28c1030253a1305b9
 DIST mpc-1.4.1.tar.xz.sig 119 BLAKE2B 433c8192edfc88d30876c26dd500ab6bb6943e6884d251b879f6da5bde0ce569d6509991a5035ba189fa6a04185c89d539539003f0ee1e56d5ccd607244736bc SHA512 1145e1f50c523596178cd3719eef35628467b203949fe350cb1be514095497cccae0b98f652c26e30c96babddf83a09ce12096360feea9b4f5fa96ad488cc71e
diff --git a/dev-libs/mpc/mpc-1.3.1.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
deleted file mode 100644
index c1a56414074c..000000000000
--- a/dev-libs/mpc/mpc-1.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mpc.asc
-inherit multilib-minimal verify-sig
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
-
-if [[ ${PV} == *_rc* ]] ; then
-	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.gz"
-	S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-else
-	SRC_URI="
-		mirror://gnu/${PN}/${P}.tar.gz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )
-	"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="LGPL-3+ FDL-1.3+"
-SLOT="0/3" # libmpc.so.3
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-4.1.0:=[${MULTILIB_USEDEP},static-libs?]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-mpc )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/mpc/mpc-1.4.0.ebuild b/dev-libs/mpc/mpc-1.4.0.ebuild
deleted file mode 100644
index 34561a870468..000000000000
--- a/dev-libs/mpc/mpc-1.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mpc.asc
-inherit multilib-minimal verify-sig
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
-
-if [[ ${PV} == *_rc* ]] ; then
-	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.xz"
-	S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-else
-	SRC_URI="
-		mirror://gnu/${PN}/${P}.tar.xz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
-	"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="LGPL-3+ FDL-1.3+"
-SLOT="0/3" # libmpc.so.3
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-4.1.0:=[${MULTILIB_USEDEP},static-libs?]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-mpc )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index af997c21670a..e20d5fc2d453 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,4 +1,2 @@
-DIST mpfr-4.2.1.tar.xz 1493608 BLAKE2B ad69f53bc910294647523e7613b18a683f1d0f3dd994168ab2a46b66d0371ffa9b8e7cb59495f898470aea69d343e83fc722f11babe4af7b3a12665a1e65860c SHA512 bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475
-DIST mpfr-4.2.1.tar.xz.asc 228 BLAKE2B a50ccf4136c3b460b15540364a49dec05da266a77bce6220832262581fa57cc1e70b7739ea4fdf2e8ad4fd3318151b8c420b09597942493d95e6276f380debfd SHA512 2f409f2a93726fba086882de3ad26d0bcb5d78afc687e44550bf55a98b940ff0d355a655aa18da78bfa2581ef37d72cb630d7642de7ec70590ec80044b3dbe38
 DIST mpfr-4.2.2.tar.xz 1505596 BLAKE2B 6bbf5658e70fbb673a3b65246a6bac708d1571aa6943c6742efd92f468ac71e6f0fe351b757f7133440ea312d9a5fc3549acd89d54f4d975c58bdc204d7b21ec SHA512 eb9e7f51b5385fb349cc4fba3a45ffdf0dd53be6dfc74932dc01258158a10514667960c530c47dd9dfc5aa18be2bd94859d80499844c5713710581e6ac6259a9
 DIST mpfr-4.2.2.tar.xz.asc 228 BLAKE2B 9e43ca847d140f78d658b108a699eeb34817c65f60e513a5540450444ae87fc4a087e71c4590b246db6fad253f1c3593c54935200ef22125ac7d514e590dc158 SHA512 ca6ff27d4ac3ac66735cd0b61e1e958217a2d7a4b30abccfda5e49c228bf594a722878992a1816a8f2531c3420aab6f8cdd3d60fd36a66765e9070e901ceac9d
diff --git a/dev-libs/mpfr/mpfr-4.2.1.ebuild b/dev-libs/mpfr/mpfr-4.2.1.ebuild
deleted file mode 100644
index b0e43e8dd871..000000000000
--- a/dev-libs/mpfr/mpfr-4.2.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vincentlefevre.asc
-inherit multilib-minimal verify-sig
-
-# Upstream distribute patches before a new release is made
-# See https://www.mpfr.org/mpfr-current/#bugs for the latest version (and patches)
-
-# Check whether any patches touch e.g. manuals!
-# https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
-MY_PV=${PV%%_p*}
-MY_PATCH=$(ver_cut 5-)
-MY_PATCHES=()
-MY_P=${PN}-${MY_PV/_/-}
-
-DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/ https://gitlab.inria.fr/mpfr"
-SRC_URI="https://www.mpfr.org/${PN}-$(ver_cut 1-3)/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://www.mpfr.org/${PN}-$(ver_cut 1-3)/${MY_P}.tar.xz.asc )"
-
-if [[ ${PV} == *_p* ]] ; then
-	# If this is a patch release, we have to download each of the patches:
-	# -_pN = N patches
-	# - patch file names are like: patch01, patch02, ..., patch10, patch12, ..
-	#
-	# => name the ebuild _pN where N is the number of patches on the 'bugs' page.
-	patch_url_base="https://www.mpfr.org/${MY_P}"
-	my_patch_index=
-
-	for ((my_patch_index=1; my_patch_index <= MY_PATCH ; my_patch_index++)) ; do
-		printf -v mangled_patch_ver "patch%02d" "${my_patch_index}"
-
-		SRC_URI+=" ${patch_url_base}/${mangled_patch_ver} -> ${MY_P}-${mangled_patch_ver}.patch"
-
-		MY_PATCHES+=( "${DISTDIR}"/${MY_P}-${mangled_patch_ver}.patch )
-	done
-
-	unset patch_url_base my_patch_index mangled_patch_ver
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3+"
-# This is a critical package; if SONAME changes, bump subslot but also add
-# preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
-SLOT="0/6" # libmpfr.so version
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-vincentlefevre )"
-
-PATCHES=(
-	# Apply the upstream patches released out-of-band; generated above
-	"${MY_PATCHES[@]}"
-
-	# Additional patches
-)
-
-HTML_DOCS=( doc/FAQ.html )
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-
-	# Avoid src_unpack noise from patches
-	unpack ${MY_P}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	# 4.1.0_p13's patch10 patches a .texi file *and* the corresponding
-	# info file. We need to make sure the info file is newer, so the
-	# build doesn't try to run makeinfo. Won't be needed on next release.
-	#touch "${S}/doc/mpfr.info" || die
-}
-
-multilib_src_configure() {
-	# bug #476336#19
-	# Make sure mpfr doesn't go probing toolchains it shouldn't
-	ECONF_SOURCE="${S}" \
-		user_redefine_cc=yes \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 682f57185d51..e1cdef8a1b20 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,12 +1,7 @@
 DIST opencl-clang-17.0.10.tar.gz 60029 BLAKE2B 59229343ae8ee3c81f11dcb550bbcf09a4e80aad32438aa9f7180e316ea28a9585db40de35ac9d912ae7962ee7a896bafe27373bcfaf2da74343b99a436b8042 SHA512 c634fea76e8d44c50f998fb5761d3ac4a4d0d1847a40ad746a092f9dfb61f40fb16901a52b348c0be06b694688e2af96e37203b2c1313ca437d5996a5d0680f2
-DIST opencl-clang-17.0.8.tar.gz 41372 BLAKE2B 9c7d6b4ab277084d9731d3ccc5be918d5a2e59381050dc58f0a2c9f3b79efc3b12be69a2044db13186d484c8d1b397b4d4e8e69ca4756588c96f89c92df00190 SHA512 018003729903b2487385b94c6ea609fbef325a087dca14a4f1e4ecdcf40377df7b3bce3bf144539bca4b3018d4c32249411656a9bfa27c1c4e615068ec86165d
-DIST opencl-clang-18.1.7.tar.gz 36888 BLAKE2B eba2f8359c7af4e9b3919631a1e01fd94b6eec9e7bd1d593aebb4c6a43a2b7d54447c9420f2c5f2ab02adf2f4623df2cc3195084d74f9750aff5bd9a726651e2 SHA512 a8940deed549ae76021e14683cea954f5a3a55db6c4ed99e6d1b71ada7c514c2e81798668a3035a42e6bbaca13fafaa09927e31a5c7a65aa6ec0611d29b6f6fc
 DIST opencl-clang-18.1.9.tar.gz 54669 BLAKE2B 7d9085b39b8d8e2756e445d4e9b5e0a6cbbf856b0591270ef00f3d2bb62f53f86a25ec55a026e99f979edab9c5cbffdaaa6d3f76dc6a47fe652be6ff5c032a22 SHA512 a2e5b30e93a6a01622e414bd56391f0292faeb89ec67e45ebe451bd5d34f7649ec50a0bacf21fd79b3463767617948e3bc99aed3350d92756526fac527a83be9
-DIST opencl-clang-19.1.5.tar.gz 41985 BLAKE2B 1dba88914fde11e95c415bd27f77ef5d38be743cb0f799888a0229c0776d5cec36b22d17da36bfbf0bf6639620843cb8b31edae9752381be59c4e75acf60f9e9 SHA512 cdfdcbd920b61bfefa40451846155d760deb176618afae4968713ebacfb323d647f54ca0ed26d753f47c894f362573b323fc52dc51cef95ed9ca525f3cc3f34e
 DIST opencl-clang-19.1.7.tar.gz 60979 BLAKE2B 545d100d7d27d7ae444da85be47347400066938d1b7898af1b49a75cc33b6e128f39a310270c561b0069268681fcd1b8076759d4e7d74d41e8e7e690b548de31 SHA512 1755d2c530ad88689b3a0c0cdeec3db09facef40d1ffef8bf26122387c36cce7014894d9ff79f8d50392785b1164bb587ae3bc54d44f50029dc9c3cc8451db78
-DIST opencl-clang-20.1.5.tar.gz 43134 BLAKE2B ff801e655719b85c6ec1970ef102955768b634924710af393b127d8182497a62d976321888378c996e7b76c11fed75c6f04e0e96f5fd3354aafc158bc96acdb3 SHA512 43f3e82de6eb9a3f875e99e9fb6782bcaf5415744f84abf4cf6f183bc36fb533e69eb0ae30ea1ef7588e4ed4adec2b30c617cf995daa958fd29a0bdc02e975f5
 DIST opencl-clang-20.1.7.tar.gz 62170 BLAKE2B 8a0f556ce8622ad2b20076d8e3e3b0ebfd04237e91fe512054d4e4ffc111debd37f44942c290cd4df215c7e0f4766d6372338fe175048a7215170e65db59b187 SHA512 6f6d0f82c725727508fa3c15c4ec0c15c15bca8ca84582ea6c25373b4ba0eda80192eb93d3675ddb2ffe32c2c673e5c59874d20443a51e00ed45a36acd32b050
-DIST opencl-clang-21.1.5.tar.gz 43121 BLAKE2B 1fbc3331af1cc4b0ff3eebffaf93f8a8029bc22c9524bc8ffc4e5438677f7e1a985c10f5fecc49fcd1fc674fccf1a3ff43969938a61e7f1a4cf89af4a716e958 SHA512 d16e6072167ec2738f335e258b290f37378bfc0ae24376a988d0d2f6f5d5daac3a8326e2c74e0485ed0401e3e0cb28edce405d6762c8234b08f65487c5ac3c69
 DIST opencl-clang-21.1.7.tar.gz 62139 BLAKE2B 1390c234591a8ff0f51091b452eae78744aae80e3e44498e7b740205db5e16c04d12b571be64a8ed3c2b2746205e92f5d0763533c9d4700309d0b8d7e55acd4e SHA512 b039a0fb25881fde55e286c6f96a4334314c3b1dd77c9fa001a735bff9eda839b36cb0c9531c7f61425e02f140778acf69ead26cbd8d59f5a2a87602f814a815
-DIST opencl-clang-22.1.2.tar.gz 44224 BLAKE2B a87780c590ee626b81dc9b110af5d6dd986fa4af27c508519b29e89f803918f330e0c8396f0463a5562ee4ae4344b4c7ecdf0d90c538b56867990a3d02d07cd0 SHA512 79fbf1f5eb93215d70c300795ce3f5ad577dbaf42d1cb30e3e968ad99c558f33c24a3745aa33d7a57ed82e6e0c2533e571dd7dd371b523572b30afd0de1c18cc
 DIST opencl-clang-22.1.4.tar.gz 63211 BLAKE2B 1afd2ec63641f8ee5dcc3f58d6cfcaebabe6eb0fc4910d51209554ab131fa020e3a79f5b66d1e772ac3c4b873996a047780d649a3786bf12ed6b98d802bb5acb SHA512 fdcdd0343b1f06580bd35a8c82971ad03deb52481b0c1469f126f683b7fac7844ff58d652c8cf86d6c54a71c114901d51a2e603786aa03ca57ad503c064e843a
+DIST opencl-clang-23.1.0.tar.gz 9456807 BLAKE2B d78387b8fc292d3dde828fbae44f192b1f25017e0b402876916f3f295319b22d92d7c5bd1f5a71095635d55cd3fc524cfd6584a6790699523a8b6144516c0b4c SHA512 64403cbfc642d8b1d4357434f519b800b2d7213c9c431edceeb57a2187d7330947fedc26133ebb2dafb058902c56bfd189c9a8e5b1cdc69deaf8eebf4a77bb55
diff --git a/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild b/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
deleted file mode 100644
index c75a49e1ee6f..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-17.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 17 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DPREFERRED_LLVM_VERSION="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild
deleted file mode 100644
index 7a6e850b48c6..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-19.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 19 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
deleted file mode 100644
index 1636478fc6cf..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-20.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 20 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild b/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
deleted file mode 100644
index dee45d345675..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-21.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 21 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild b/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
deleted file mode 100644
index 21e6b0daa9c5..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-22.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 22 )
-
-inherit cmake llvm-r2
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-util/spirv-llvm-translator:${SLOT}=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=[static-analyzer]
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
-		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
-		-DUSE_PREBUILT_LLVM="ON"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild b/dev-libs/opencl-clang/opencl-clang-23.1.0.ebuild
index 7c382fbfde29..0ad5fe6d9aeb 100644
--- a/dev-libs/opencl-clang/opencl-clang-18.1.7.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-23.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( 18 )
+LLVM_COMPAT=( 23 )
 
 inherit cmake llvm-r2
 
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
@@ -29,10 +29,15 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}"/${PN}-17.0.0-clang_library_dir.patch )
 
 src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d llvm-core/llvm:${LLVM_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
 		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
 		-DLLVM_VERSION_MAJOR="${LLVM_SLOT}"
+		-DPREFERRED_LLVM_VERSION="${llvm_version##*-}"
 		-DUSE_PREBUILT_LLVM="ON"
 		-Wno-dev
 	)
diff --git a/dev-libs/simdjson/simdjson-4.6.11.ebuild b/dev-libs/simdjson/simdjson-4.6.11.ebuild
index 9b89182eacef..df7a64d3d971 100644
--- a/dev-libs/simdjson/simdjson-4.6.11.ebuild
+++ b/dev-libs/simdjson/simdjson-4.6.11.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
 SLOT="0/33"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+all-impls test tools"
 
 BDEPEND="
diff --git a/dev-libs/wayland/wayland-1.26.0.ebuild b/dev-libs/wayland/wayland-1.26.0.ebuild
index c6e4de75278e..532e10cfe895 100644
--- a/dev-libs/wayland/wayland-1.26.0.ebuild
+++ b/dev-libs/wayland/wayland-1.26.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 inherit meson-multilib
 
diff --git a/dev-ml/llvm/Manifest b/dev-ml/llvm/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/dev-ml/llvm/llvm-24.0.0_pre20261010.ebuild b/dev-ml/llvm/llvm-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..595eeee6c534
--- /dev/null
+++ b/dev-ml/llvm/llvm-24.0.0_pre20261010.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+"
+
+LLVM_COMPONENTS=( llvm cmake libc third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-python/ast-serialize/ast-serialize-0.12.1.ebuild b/dev-python/ast-serialize/ast-serialize-0.12.1.ebuild
index 7142c24913c5..73ac85f79772 100644
--- a/dev-python/ast-serialize/ast-serialize-0.12.1.ebuild
+++ b/dev-python/ast-serialize/ast-serialize-0.12.1.ebuild
@@ -30,7 +30,7 @@ LICENSE+="
 	Unicode-DFS-2016 ZLIB
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/backports-zstd/Manifest b/dev-python/backports-zstd/Manifest
index 950f94000ec7..c81176a48f03 100644
--- a/dev-python/backports-zstd/Manifest
+++ b/dev-python/backports-zstd/Manifest
@@ -1,6 +1,4 @@
-DIST backports_zstd-1.5.0.tar.gz 998556 BLAKE2B 0fbcf631730d01afece73a68d80c1df93d7af0205b105c93a901e4688c5414575fa37a177c7fec0b673edb49bdda7c7c06da1179cd7d84641bf11aee8d68f596 SHA512 47298459a77eb5dcbb47d362414e7f9b1347bba0c9a724a465a55e137d1c4aaffc8e79897aa5d0e30c7855b0cf6e537e8439a18edef452a45407a66be3447276
-DIST backports_zstd-1.5.0.tar.gz.provenance 9628 BLAKE2B b476f6b73845195092ffc97b94199650df9e8f27d4e4ae7b9676d83b0a0c48b8b3c215e63b361b38857241e9ce123f94c18e35976b1095f5c49812b9eb1e4502 SHA512 77101ebd8e3409a67da8ca31d30305cb4753b9e20d73dbb148c77c970addc4035f96777f64f343109d28287ba42c3e347bd8bd027c63cd7a667740114fe03aaa
-DIST backports_zstd-1.6.0.tar.gz 1000009 BLAKE2B a906fd579650bec328ba0ba496952f621095abc0c1febeb2b2b7ba8fe48f16f1562cdae1851305495c1e539e3749f90cc35fe41ae77b961ee7dbbb2548dd0d81 SHA512 6f5e1f595eb9ee98036e06f3bceb10b6bc4b5555185fbaba789dccd9edd41c10594ea8fd1863b8e27e9dad7260772ce345d52462f72d794ce4ef9580dc656613
-DIST backports_zstd-1.6.0.tar.gz.provenance 9813 BLAKE2B 7308538f1a6022da536c6b9881420416e3d8c9f5acbad375d6278518d368879893e33e3b3966474fc39c4d88726d9886ad5d4eae3f7f69cdade173fb4337a5b7 SHA512 56f0bfd41bacba9ecc88da90a32a17f098073703df962f6a212111a27c4b486952eeb36df5a165033bc47e06f9e17e03485651cc8f8cd23fc6393fcdd917229e
 DIST backports_zstd-1.7.0.tar.gz 1003722 BLAKE2B fe514fa58c171afb7fdec75e1bcc29a03a68f613566891ce4838525476abc00d187610e618942b89dad4c038fc3655a57492ff57858b8597ea2c9ced64c9f7c9 SHA512 acbed29d30ca2093834762fbd904062f7b87e039007f62b7ad8b1667faf688249c6df0f3658cd11e76017fe590fa119092e216fc30d0140a289cac6d76e82677
 DIST backports_zstd-1.7.0.tar.gz.provenance 9674 BLAKE2B 2814cfbcafa2f9a9091ede27651aba9ad52c50a370d5b1e59a014f6d724428ebb0a9d95ad1a04e2e18ec70416d1f486f1ac3379c8e63a12cc6338d6c6f30371a SHA512 b5ec5fb57b741ec4e5c3c987509c37614a564a32ff25709492b3bb6a15a7111de539b516e406260f475e4582b55a3074a4028298fea475c27ce37eb40ed67663
+DIST backports_zstd-1.8.0.tar.gz 1006566 BLAKE2B 49507039f47fc95ab9b1e1c83ebc21245509c6035a0c2832e6748b5f5995c80effc2d870d0817a6d01518d49ced745d488cd41b747195a46d53da39f0aad1ad8 SHA512 7323e4253b61b4cb4228eeb48fdabc5e41523b8ccad9f29bc0d14c4dac0415122aa43cb0c0f2c98518b3668df84c06351a3aee45afb483b4f28f53a7213ab735
+DIST backports_zstd-1.8.0.tar.gz.provenance 9766 BLAKE2B aed2bfca20f2a9a7bc0ef2972bfec8bf0de460dcc47e0bedc16613cb38f0e315df8b3f12373b1b2d2d6a03f2ef9d092dba7a64ce4bcbe6005381ac85415ad30e SHA512 d1b72a52df82ed1ad6d62101ee10387a014543828b9e2e072a976f5dda48e3dc99651661d98b075dffee158e06ab61952f162fa717877ee47bf6d445b9e332ca
diff --git a/dev-python/backports-zstd/backports-zstd-1.5.0.ebuild b/dev-python/backports-zstd/backports-zstd-1.5.0.ebuild
deleted file mode 100644
index f67e9c4ae35b..000000000000
--- a/dev-python/backports-zstd/backports-zstd-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +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=setuptools
-PYPI_PN=${PN/-/.}
-PYPI_VERIFY_REPO=https://github.com/Rogdham/backports.zstd
-# this is a backport from py3.14, so don't add it
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of PEP-784: adding Zstandard to the standard library"
-HOMEPAGE="
-	https://github.com/Rogdham/backports.zstd/
-	https://pypi.org/project/backports.zstd/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# remove -flto and other forced cflags
-	sed -i -e 's:kwargs\["extra.*:pass:' setup.py || die
-
-	DISTUTILS_ARGS=(
-		--system-zstd
-	)
-}
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/backports-zstd/backports-zstd-1.6.0.ebuild b/dev-python/backports-zstd/backports-zstd-1.8.0.ebuild
index 0f84ef33bb81..8b72d545ef85 100644
--- a/dev-python/backports-zstd/backports-zstd-1.6.0.ebuild
+++ b/dev-python/backports-zstd/backports-zstd-1.8.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 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"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 8e8c5afacaa8..a8917c442e48 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,4 +1,4 @@
-DIST backrefs-7.0.tar.gz 7012453 BLAKE2B 8c6f9235f65b846621318406e4a31bb8ee325b277d561874329e639854655fa680d1306d75449df7c0dad167aa968f2ec72213415e37ab488ea99f91174a5411 SHA512 4c12a1ff958619a3ebdb033c110efc614b2a3e13767bc72100c6dbf3c8217f15fc2fe85e547221ce01b5f14dc47ccd0d079ce12b4dd55bda458fdf748e1b002c
-DIST backrefs-7.0.tar.gz.provenance 9169 BLAKE2B c8f94a5331b52534c62f0661376c8a984d7f4d1f6cdad501a9c3bdf6efd9562604d33c5b49f753927ebccb29ccca8d2c1f3fef4e4689e529eb311dc01c4368ac SHA512 2e153fb1167218dce95916d642d6e0546cae940e6020bb36ba7889f3262b3b01513db7eb0d07b5a517dbbc2e490b7f0a603784bf473b894ec27325b7bf3120f3
 DIST backrefs-8.0.tar.gz 7013081 BLAKE2B b0cd793beb447d6d0dde92f9da60ce144fb81a042d5bc958f9376fcf697c89285df2cdac93a22a919956d744f957d15c466e2858841ce9beb3ca6050adb1bea4 SHA512 7ce8217d951ec573e044d83e2505db2f0a184c8d1ddf105a26b9bcc9a137afaf50b992fc5dc529cfbd197044696a7346df2781002b8184d543735a8646909bc2
 DIST backrefs-8.0.tar.gz.provenance 9863 BLAKE2B 550c3c18a2bd5c8cd05b8e2da21f185c9e966f2ec35d3e6cb09f054235c9f19d5261ec2e6a1a78447a4f177694d2151b573332056520190260deb26395993ef4 SHA512 3fac94e549e9514ec545714da915d61750c89f88361d6e3b21c3b00088deb251d7e4015864d58af804caf9e599e1ac08724eff83bb1b9d6e17cf0dd3f0ff6a6c
+DIST backrefs-8.1.tar.gz 6999089 BLAKE2B ac897f057f14c434a39195b893c52b0a941c4f9c399c90f58b7762e81b57a4c17bbebb64f0f81208954abe8ad75f3e4e94a39f7138b689b448a1c0803e3cc799 SHA512 9b587fc363c5431cb1d338c3322832da4015c784dbe8f426b3c778dde1708f0adc8355399807b49b29dc1fc9565a71bd8aa6ae590749d8b2ec87bb43535c85fa
+DIST backrefs-8.1.tar.gz.provenance 9753 BLAKE2B d8b1a72a8ef54ddc9967f9f03bce06c51a7aa869290d356d48fa61b6664b8efaf78d5f6d587278b052e567a70aa79b33220638d6476d83a625d934359eeba4fe SHA512 e1a6f13ceb8f3952790940c985b1adc3060c7ef70553ae9d47281beb671fb36bb2ca4c3c32188b34ed1c35f4be3c76d5a8d82e3022e7c9c2ef85543f7d43d33f
diff --git a/dev-python/backrefs/backrefs-7.0.ebuild b/dev-python/backrefs/backrefs-8.1.ebuild
index 8419dc211ea6..30a6d3563133 100644
--- a/dev-python/backrefs/backrefs-7.0.ebuild
+++ b/dev-python/backrefs/backrefs-8.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/beartype/Manifest b/dev-python/beartype/Manifest
index 8b60feb648b9..e89831d9fdac 100644
--- a/dev-python/beartype/Manifest
+++ b/dev-python/beartype/Manifest
@@ -1,2 +1,4 @@
 DIST beartype-0.22.9.tar.gz 1608866 BLAKE2B a53a4b8565b0ed3773b52128752bb83a1b693ce286f96dc92a22bbb50ef195136fa7460ca3aed70090788d506b504d62789254276d609543ff40cd81e4093b13 SHA512 29dad336f6cfe6f19f410af47dbc7ade2eaeac84a917d989b967e023c20d913b7becac91147e79d404fe81b4631252d534fc7283a66b7da0dd160a745500af84
 DIST beartype-0.22.9.tar.gz.provenance 9418 BLAKE2B 684ce17710a9dc33fd8fa6982fbf4b5836f0411191c61c340199ab392ddab2d672f0c71c6a63cd65042bf85562b7e4427ef2084ea99e54ce3ada66a6fa009b31 SHA512 3488aa8a3c0fb680ddf67042b83304009c5a70d9bb667cd5dccee4c4b8c9d4180dd9ae85b9a81510519e4729b20f46e9da6ef729ca99ddc62ea460699d72c499
+DIST beartype-0.23.0.tar.gz 1992744 BLAKE2B 2a49e37ff9f3790a88da767f10d85f41533c087d972d1a333e252eeb0914741d1231e392f8d69e53f6f2dec5ac363bc1646e8a0e22be99e7d578d3a535773d20 SHA512 d1bca602a5ee498c1df2cfc74c01eca2d9df01cc75296012dd0d22ec1fc83495c3dea8b7c810e81de87d35cabe1f9b9ebf3d5f3c5d550e69fedb6f9d376c70de
+DIST beartype-0.23.0.tar.gz.provenance 9712 BLAKE2B 2d398242c9b7b97c2d21427bffc4b7b94bf1cd0c05a3ce5b209d89ef6d13396ffd6c203b33600842706a7bd1252c70edc9d318e5a5c7ea5a3a5066b1d887fc09 SHA512 e2f687bca85053ae3bec36b3974ef9ed80e1e09dd98b25aece5c9f83f8525d909352ecb1ac5641ce8de2ac372dabfb76cede721cf9fe9f5d22cf84cb1ed1c8df
diff --git a/dev-python/beartype/beartype-0.23.0.ebuild b/dev-python/beartype/beartype-0.23.0.ebuild
new file mode 100644
index 000000000000..42752fae45e1
--- /dev/null
+++ b/dev-python/beartype/beartype-0.23.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-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/beartype/beartype
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unbearably fast runtime type checking in pure Python"
+HOMEPAGE="
+	https://pypi.org/project/beartype/
+	https://github.com/beartype/beartype/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.22[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fragile performance test
+	beartype_test/a00_unit/a70_decor/test_decorwrapper.py::test_wrapper_fail_obj_large
+	# test for building docs, apparently broken too
+	beartype_test/a90_func/z90_lib/a00_sphinx
+	# poetry, also broken
+	beartype_test/a90_func/a50_external/test_poetry.py
+	# broken
+	beartype_test/a90_func/a90_pep/test_pep561_static.py::test_pep561_mypy
+)
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 28300811883b..ec4b1b70b12e 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,6 @@
 DIST black-26.10.0.tar.gz 728037 BLAKE2B 77675cb575b0d84316e9df1960a96a780ca5de0e497c131c25391dbd193f17beeac27793abeb9a766a0ebffe3dfae12a7d91c5f4a8fdfbd1a1e1fbd49c1e6bfc SHA512 941ed5eae286d5a43112143f8598597c9e10b1491a550dd024118bd72afeea428640610e514926c6427fd06f9a06f426f7792c26d35a8f28b5c6a489e007f75d
 DIST black-26.10.0.tar.gz.provenance 9467 BLAKE2B 869c55d0087a6e158731cf118a2fb17e99074cb0f316432501c310a8221bcdc9d5ebd4dd1324842f21a7daafbc86a9d6483d709bd71ac57d83b678a301cb489d SHA512 6bd4621be1107b9431c7872ed4c09880f681d11f7cac098ffdca2a567f302edf342a91c662c90c4f15c77a6fec2eb65b4f10e5dbd328b762bfe418cd89fe5a25
+DIST black-26.10.1.tar.gz 741979 BLAKE2B 85e30e28ae6f407ce5588176e6bfc43309f63a735ed1203429e9655d14f57d35f6b12bd75b92957b5b20d1b1c85177c301750b0de84ad896bd820e09e4d563a8 SHA512 f85ce4e2befad618472ba8077817604637dd5a5b424d393121365b790f8cedacefb2ce037755f1720e845187f0ec194d315ef8880516447aafc66b8c80ff9e92
+DIST black-26.10.1.tar.gz.provenance 9637 BLAKE2B a478f8152c2541b33295f3d085d86e8dcbefc1abec454302e73d787b5db3d70119c0d0310f9cce3384462d416d76f56c46f966dbdf75b170ca0410aff03a54f4 SHA512 c48d7a1d9a3feab3219aaa706559ae43c580afcbba32604520a92b806252e8bb8d59c86122f638533c37c9b5e4fb70540a452f08be7f53394f39d7ad163732f6
 DIST black-26.5.1.tar.gz 679439 BLAKE2B 0fc68b6af7ca700f8b4d8ce0ef12eea1234b295a7a9893eb0915a8f243f7756bad17bce8d6552f6e90ca969273b178a7de01fb787966ee2db1faba57102249e8 SHA512 8e17234aeffb5f7a66f1d9d9e2672796ec8ef0c660a3a8c0668061632591aee626a5f8a1a5210900c154ef2ae63919a690512e2d8fe789ac6bcf5d6eaaa055f0
 DIST black-26.5.1.tar.gz.provenance 9300 BLAKE2B 79de1ff83d6d354efa3b8df3599148528d423eecdc24ff4a42821885676e0e3790c06a81bca452829336e148dee88477ed6b4a3ebe971d517932e8811b1a8c07 SHA512 4ebd71e4fd30de1ebedb25e11116a09abbb7f1bb48b99026aed6f792b3d6a67e2b3f2560dfdf9a5bf7d40323105008514a5d8ae80bacd297553559e73f3a317f
diff --git a/dev-python/black/black-26.10.1.ebuild b/dev-python/black/black-26.10.1.ebuild
new file mode 100644
index 000000000000..8ad35b825823
--- /dev/null
+++ b/dev-python/black/black-26.10.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-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/psf/black
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy-extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/pytokens-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.10[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2fc64ba181c2..a14157cdee8f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,14 +1,6 @@
 DIST boto3-1.43.103.gh.tar.gz 1242075 BLAKE2B 907fe54732510a077b049526c5524b1d774c411656aacf5f8ab26619c449fa81b16502aca7a1e69f22d87d12e1deeef526fb55d07ddec432e743df36a514b6ac SHA512 85156ed2492c4eac9dd9c52e71cf6d33431adeb9969f584cbfb0aab9c15080a34f1561f9077f509811daa6561d3ae869d4518764ce7a7f0b3d1a74c15073bb74
-DIST boto3-1.43.104.gh.tar.gz 1244023 BLAKE2B 7534126599f77fcbb7c4223cb961d753491a24b3ad377cf41fc87a844e46f40c7d7e148747a3b60a137b1e768a42ca52500db77be0f30b3501b6da974d95b119 SHA512 8219aa7a87a7840c4b81ff063888b8cf6300e17474aff320e794a7d9128247b167ada9b68811813b355c370398bd7b41b698a4930836da8e29637a4c0a4833eb
-DIST boto3-1.43.105.gh.tar.gz 1246106 BLAKE2B db3c814e94337fb5c1606dc2d6b553fdccb4247560887397cda324d0e975156ac56485cb5e96ff4d4a6140c56cb779be3b91920b522084972d68c78e1f89b7a3 SHA512 ae05d2b6510b48bfa8a294c8a077e7a43a7c47c8b7f331ce4db3c53ab79194a008ee15b8a7f1ce2febb0e362ff4afd251b1b40064f6e25ce900b16aa46b8916d
-DIST boto3-1.43.106.gh.tar.gz 1247663 BLAKE2B 94e62a747d2594c2240e8f0e74ca33e11f627c0251fe2bb281811fb02d0780a56099ff1211e55c90802509e488f13ff1b605f4c517ff45267aac2a297197cb58 SHA512 919fd973d279c6620b60262abe3ed13799cd26232a4e0380664c3d0cbca73617a35d00036b7f76887fc22680c1e83e7f84d6ea63ac80843ad83abbcd82697c75
-DIST boto3-1.43.107.gh.tar.gz 1249178 BLAKE2B 22bc47915a435c0d16d55e297d4454a7782af6b6503ae814945147720615aca45e0061bfb2fa75ea351e00ff14ee13f084a20fa53038372c519d5c4953eb8936 SHA512 55c1b4addac94b5f1ccdcb688ef5fa2f18acb0de58f503159c047d32d1416a1e741c95384895157d422b70ebea371ebbc1efe5b0dc6085956bd911a861d34b53
 DIST boto3-1.43.108.gh.tar.gz 1250263 BLAKE2B 73f98863859b8c1ff06655d84d6b155811ac120dc88afd377272187b000e09346ac9c6843967521d1576753427490080e4104ba811defc96bf7fc1595ba649c2 SHA512 e1a95db416b3f7966bac99d7b54fa839b7dfc5d42e8319516fe0bc8e6882ecb1741c11fffc350b438f7bd07d634b0fc2f0ee50916ac5df8622c533b91ed39856
-DIST boto3-1.43.109.gh.tar.gz 1250335 BLAKE2B 123e603070178356d83cc84f81efa58eff6ff6d0058a303b7365c3ab91420348220b260f7a959c4400b5b058e9b9d9c68cdf293fcb1ceb24dbcef94790335e7d SHA512 34006ec58722b1d8a691bc75a71b96bf66e4ddc4523ef3fcbd528a6de6961fe5b341c27b488047daee7b81f4fd041c1a2b059dc97db4b451ee0e2284400c5f56
-DIST boto3-1.43.110.gh.tar.gz 1253379 BLAKE2B b15c529db3a148a8b955881980fe6ead80d1059739cc93de399a0189e677d0dd2b04fae9d15d855d0d624615e80f5027dececa793cb95695eade998ffd53c9ec SHA512 65ae9d55ccda4851a34a2217d461a4044d9762b77501537ac3c8178a6c9be7a73b8a1d2b45f2b68958732d0a999a3033400421fcb61726187030458c35b3a0c5
 DIST boto3-1.43.111.gh.tar.gz 1253888 BLAKE2B 972d4fbed26dc6ef267f1ee9433d13a9030a405a7dca1da23f2b3b39a6c32e13bbb8a15d202e3c86d067040326934c57161901262c409262c3bd2e41ea003bef SHA512 bd26006eb35ad806c071e185bf86d92c8eeb2345871575cb26812c1bffcdca602a54244074bcd2edce1487b17240caf9975f98037eee02a01dd4d07f1f964190
-DIST boto3-1.43.78.gh.tar.gz 1213393 BLAKE2B b3e4188ba53609873bf6613d5667792d24634d728dfe0e0588917ade93c4d6c9a5a28d2e46bd5ca314723604a9cab9a4fae7ca1e6f9e496cc29671bc68849d7e SHA512 c98ede06cf4934089ba4a62c4fb03da692a5f9e2a415728e9f51979e33942229d8f4cd6fa02ac229b360b63a930fd91890f2ed645d17011d4a42e236943fd780
-DIST boto3-1.43.83.gh.tar.gz 1218064 BLAKE2B 0758e28dd9b086615b045e107aece2ef46bee541110e51fdcd231c60cac0452f4cdfec58ea4041757835c195cd2b8becb3c4e9fd24ad7bc306d90b16af082f63 SHA512 ed110edd551138c5d63ab7ead46a4c9ddb410dea1b5e642045102936af22c4208f357f79fc994434fc6a7df7c16aba99052508103bad7599f8cc558ae1c5f842
 DIST boto3-1.43.89.gh.tar.gz 1225424 BLAKE2B 625bb37a542644c8fe37aab42a115bf8be2e36373d7f6149dcc7e150e327c75b334ef480897be1d4954809b233a47e02854d7b28b4a3904f0e5cdcea3f0440d7 SHA512 1c04fd6df819abbe60d551c6d706f7254fe6d6758e95fd53ec70d4dd892b6f7bf69981cb001fc6ca5bc5885f083718b80a4fd045b146e7f4add16a50ac3a9d38
 DIST boto3-1.43.93.gh.tar.gz 1230597 BLAKE2B 183d94cea0d706147a75674cb85a600ad21c2683618ba18a14e8630f23b19c94c11d0bc03ddc517194dad42dfb9445d1b34076b1f1b3ecbcec51ceccf30e5db0 SHA512 01612175497aada3b3fdf62ffcdb0626dc0fd5090d7d156d2a1f5fad4ec19b904ffecfd4b59880cf71ec07658bf00c2245bdd3c989a7513689ab59a2511e06ea
 DIST boto3-1.43.98.gh.tar.gz 1235430 BLAKE2B 6a08b191374c1c31b69c975cb4281685bee4914b8f2ab32dd2eb13c7742ff7e228a151f0e78b7f323d43ffe9b4dd7e4574104bc4a63cd573726715eceeb13137 SHA512 550c5daf6b3110562ba08e0694cdc19b7cd02e9d00aba22acc3a8272a63124d3e9eea870d7fced18685ee89459f375ace66aca49fcaece88a1d7dbfa1d54022e
diff --git a/dev-python/boto3/boto3-1.43.104.ebuild b/dev-python/boto3/boto3-1.43.104.ebuild
deleted file mode 100644
index fcfc7c9a743e..000000000000
--- a/dev-python/boto3/boto3-1.43.104.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 ~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/boto3/boto3-1.43.105.ebuild b/dev-python/boto3/boto3-1.43.105.ebuild
deleted file mode 100644
index fcfc7c9a743e..000000000000
--- a/dev-python/boto3/boto3-1.43.105.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 ~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/boto3/boto3-1.43.106.ebuild b/dev-python/boto3/boto3-1.43.106.ebuild
deleted file mode 100644
index fcfc7c9a743e..000000000000
--- a/dev-python/boto3/boto3-1.43.106.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 ~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/boto3/boto3-1.43.107.ebuild b/dev-python/boto3/boto3-1.43.107.ebuild
deleted file mode 100644
index fcfc7c9a743e..000000000000
--- a/dev-python/boto3/boto3-1.43.107.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 ~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/boto3/boto3-1.43.109.ebuild b/dev-python/boto3/boto3-1.43.109.ebuild
deleted file mode 100644
index fcfc7c9a743e..000000000000
--- a/dev-python/boto3/boto3-1.43.109.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 ~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/boto3/boto3-1.43.110.ebuild b/dev-python/boto3/boto3-1.43.110.ebuild
deleted file mode 100644
index fcfc7c9a743e..000000000000
--- a/dev-python/boto3/boto3-1.43.110.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 ~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/boto3/boto3-1.43.78.ebuild b/dev-python/boto3/boto3-1.43.78.ebuild
deleted file mode 100644
index 68dfafa9fe85..000000000000
--- a/dev-python/boto3/boto3-1.43.78.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 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/boto3/boto3-1.43.83.ebuild b/dev-python/boto3/boto3-1.43.83.ebuild
deleted file mode 100644
index 68dfafa9fe85..000000000000
--- a/dev-python/boto3/boto3-1.43.83.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 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 7ad407cbdce5..137803226aef 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,14 +1,6 @@
 DIST botocore-1.43.103.gh.tar.gz 17299294 BLAKE2B d589d82cd6d0e1cb53280c606e04159291910f0eb5276d8dc158ae5bdae9e8b866a36f29eb87e7d545c63f73880c4b93edb6690f35c64bdacc48ca8f8825f4e0 SHA512 2d6f2991428ee3d6fd7fd7cc2d1cf28eabcd0732c73d8fda48da8a28c2c2d1a89296800c20ba3769e2b85ad5663484532428d6906eef48f825b8bdcaaababa92
-DIST botocore-1.43.104.gh.tar.gz 17309295 BLAKE2B c57dd3732e4970d0071aea6aa2587802ea62570d0ef51a0de450580e5c1bfa2f09597124cf59c342b6b7670c6b74bffa867154e4deed66fb633a18cff9582a00 SHA512 e00fc7568b208a32f8eb0ba301c121ff43eec522d8ee3719c1825d4609dc4f5be5131ad8160e02b908310f6566fa9897f40b70beb99bf9bc4c29a09b893585d5
-DIST botocore-1.43.105.gh.tar.gz 17320228 BLAKE2B 1d4dc83a26343af7d5fa75cec3cc18f8a01cf8f7b155a90c02d889082627f71f47af143fdda3fb4b678c0d83d01ed7cd0d66075e873db0ec9f739771a72dc4c3 SHA512 9fdb623d22771689611be50bc40ddaa5ef4c1af0aa3c3cc7a12f98e379fe44077ce470c966e9ea2cb349d4af4ac4b0d4def63b9b1acb7dc20be98476cd32ad22
-DIST botocore-1.43.106.gh.tar.gz 17330996 BLAKE2B 3ffd1037830711e44d5f71bffa40a70263d7b8fbf99865a7dfdeff16fefb179c28e30911ed9f542fc48d40a350912cb741f00f3db3b793431424476bf84aef6a SHA512 06fbfa4afcf52c999c36acd125562fadd821bceecbf65628ef7efb2afaf21c1bea6aa0dfea93c7876bb184e0312b14a752e484237afafcbf5fac8f21a8c83339
-DIST botocore-1.43.107.gh.tar.gz 17365768 BLAKE2B 85efbe0a1576e1c7c43b68f8f722c8b99d64ac7a29849735bda62a23fea0f7a7b1e5569797d7631d61d765a7fdcabf4cb5ee5ab16254df6e48fc5cee89efcc15 SHA512 b0024bb05f5ed1e00dbad26cedbc25f53ff3a4dc0bf7f1356ee7262445e450ef4f6c1696db54672943c1e903dcd06122ee50ffc3514fc99930c1c3b9afe0cbb5
 DIST botocore-1.43.108.gh.tar.gz 17372621 BLAKE2B c4a053b10a7a95d78a84254aabe941f721fbb3cf5595a6c84b286e7527d4f90eb86312c211547fe5fa0ca593caa3b8bd2ff4f1e84534e565a171c7acca968b6e SHA512 15db0910153e66c9ad251866d89a3510548be2391e6aaf9f6178dd3149077a9563888a2558602358d31257991aac631bb50b9e3b99ffee18d1d7653cfc462f77
-DIST botocore-1.43.109.gh.tar.gz 17363382 BLAKE2B 99c98bd37df5e5fe900a591f23bfff6994e023775ffe08babce03a95b04797acc35c3032fb283403b0ab1a3d7f8296260c4cff31b68d2fd024f372253d487401 SHA512 a0f0f1e404563d84a8fee428978312c531a4ffab7f4859625b6b6f9552006485fd04e43545d4b9a0c80f9384f1b434a4ce6cac8f23931122678a5bbd41ed21c4
-DIST botocore-1.43.110.gh.tar.gz 17383160 BLAKE2B dd5ecdff3d66631a87d0a0cb2ad323bf324afb9d5fcd5ab19485fcbfd05c4974c0e694ea5766013eed7d12f9a3e22f6ab9f804fd35b0de04e98332c9e84ca462 SHA512 8be7507d614cdc4b3b830e230f236e709b2e0f19ce6bb3c7566aa9abdd7d285ca7baa2acc8f0893a63f14d131d380cf1c7c7c754b791d18ddcc163111fc3cbca
 DIST botocore-1.43.111.gh.tar.gz 17387410 BLAKE2B 36f5cde64e3be6b364ed4b0338531e8dca38e5b817e6e2607a16ef48ae1ad4cd21bcfc48a7c982358ad45b7fab3073f995817da8689ef7a8c0d8a376d079d88e SHA512 fb63e7844d5d74bbae67fe601b18629f4f366128972bd35498263b3f7fc5d3af7fa1a3e39f3cc9673d87954aff6990bcbff350ea8ed28ab6d887fb8e33e6652a
-DIST botocore-1.43.78.gh.tar.gz 17008224 BLAKE2B 137656d64f62025ca47f03c48ba84aa7eccae9dbc752c81f909c3c3f12dd843bb40173075fc7e255492385d8ea8824da08e5d3155bb5ff1dbfd62c858c0a057f SHA512 bd65c7fe451ef0b3bef21e25e557aa37748ca01f71e567b31b852ac356d323f1cfa6dd0e920eff7c52e0db879a34cf99eed6c1b841dfa6065e139362702f9d13
-DIST botocore-1.43.83.gh.tar.gz 17038145 BLAKE2B f74b399b04f9b259e1a2f424719c4b80cc279627174ac96f9b79d85418ecc0442fbd27d7e79ccdf12526ac02489fde4254e360f216103f3cd5ff050b3cf1a838 SHA512 618c0ef0fc89879ee6900606e3378b2876901c4a63ede52529de12898a65e34fc41a8f0ad8ab682b7788626176f9b86904e257b63d88be9d58c53116918b1d12
 DIST botocore-1.43.89.gh.tar.gz 17111395 BLAKE2B 25837125b5d9477b011c065594ffa1b49a2f5d0cf76e1c664aa5401d50dfe8dd9573d0ab3a60f739c796c32965a7dd7608e302a284bfcc97d9f7f4a8a2b698e3 SHA512 c9c0b7636fb7595d4ff3ee2ec7e1ef8ad3000e9e453ce6edb827a1152109fc2fb6b226bd08f27653fc1436444c39be6f160fa4f7c34eb50a7384988686933590
 DIST botocore-1.43.93.gh.tar.gz 17142451 BLAKE2B eec2955aa252ff8bc49c24095006f0c75669f7946dcdaece4c7f640e724910b14c1b1b0b07fb8e6661d96e95fe148201381d70b4685a7282c2c64f2656fde57a SHA512 e021322d630deb94f738aa5096a7b72ffdeffbeaf5d3f6fbc9e835b7f41afa25a738d353e37b4fbd73b5b8889334ccdf4caec64d4c63e4e966e0e245c6117cf0
 DIST botocore-1.43.98.gh.tar.gz 17171860 BLAKE2B 8bb682accc106b35b89f19fc6512314f3251a896d5e3e74b02112d9dc6218c56388685113d1889dbbde18ca9ea2b18acd2386d54603567d334644bebc55a678a SHA512 42700b9fbbf6df97f410cff159aae5dd57f5c114567e80fe4930b42166608609fcd9822f011c0acb8a4fc46c92aedd9a7ea5afa1608a24e47b0e30d78274d0ac
diff --git a/dev-python/botocore/botocore-1.43.104.ebuild b/dev-python/botocore/botocore-1.43.104.ebuild
deleted file mode 100644
index c5a99a77214e..000000000000
--- a/dev-python/botocore/botocore-1.43.104.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
-
-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 ~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
-	)
-
-	# The test suite can eat up a lot of memory when running via xdist,
-	# and slow down some tiny tests.  Let's just run a safe subset
-	# of tests known to be slow-ish in parallel, and the rest in series.
-	local parallel_tests=(
-		tests/functional/*/
-		tests/functional/test_event_alias.py
-		tests/functional/test_[cds-z]*.py
-		tests/unit/
-	)
-
-	epytest "${parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=( "${parallel_tests[@]}" )
-	EPYTEST_XDIST= epytest tests/functional
-}
diff --git a/dev-python/botocore/botocore-1.43.105.ebuild b/dev-python/botocore/botocore-1.43.105.ebuild
deleted file mode 100644
index c5a99a77214e..000000000000
--- a/dev-python/botocore/botocore-1.43.105.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
-
-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 ~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
-	)
-
-	# The test suite can eat up a lot of memory when running via xdist,
-	# and slow down some tiny tests.  Let's just run a safe subset
-	# of tests known to be slow-ish in parallel, and the rest in series.
-	local parallel_tests=(
-		tests/functional/*/
-		tests/functional/test_event_alias.py
-		tests/functional/test_[cds-z]*.py
-		tests/unit/
-	)
-
-	epytest "${parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=( "${parallel_tests[@]}" )
-	EPYTEST_XDIST= epytest tests/functional
-}
diff --git a/dev-python/botocore/botocore-1.43.106.ebuild b/dev-python/botocore/botocore-1.43.106.ebuild
deleted file mode 100644
index c5a99a77214e..000000000000
--- a/dev-python/botocore/botocore-1.43.106.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
-
-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 ~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
-	)
-
-	# The test suite can eat up a lot of memory when running via xdist,
-	# and slow down some tiny tests.  Let's just run a safe subset
-	# of tests known to be slow-ish in parallel, and the rest in series.
-	local parallel_tests=(
-		tests/functional/*/
-		tests/functional/test_event_alias.py
-		tests/functional/test_[cds-z]*.py
-		tests/unit/
-	)
-
-	epytest "${parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=( "${parallel_tests[@]}" )
-	EPYTEST_XDIST= epytest tests/functional
-}
diff --git a/dev-python/botocore/botocore-1.43.107.ebuild b/dev-python/botocore/botocore-1.43.107.ebuild
deleted file mode 100644
index c5a99a77214e..000000000000
--- a/dev-python/botocore/botocore-1.43.107.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
-
-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 ~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
-	)
-
-	# The test suite can eat up a lot of memory when running via xdist,
-	# and slow down some tiny tests.  Let's just run a safe subset
-	# of tests known to be slow-ish in parallel, and the rest in series.
-	local parallel_tests=(
-		tests/functional/*/
-		tests/functional/test_event_alias.py
-		tests/functional/test_[cds-z]*.py
-		tests/unit/
-	)
-
-	epytest "${parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=( "${parallel_tests[@]}" )
-	EPYTEST_XDIST= epytest tests/functional
-}
diff --git a/dev-python/botocore/botocore-1.43.109.ebuild b/dev-python/botocore/botocore-1.43.109.ebuild
deleted file mode 100644
index c5a99a77214e..000000000000
--- a/dev-python/botocore/botocore-1.43.109.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
-
-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 ~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
-	)
-
-	# The test suite can eat up a lot of memory when running via xdist,
-	# and slow down some tiny tests.  Let's just run a safe subset
-	# of tests known to be slow-ish in parallel, and the rest in series.
-	local parallel_tests=(
-		tests/functional/*/
-		tests/functional/test_event_alias.py
-		tests/functional/test_[cds-z]*.py
-		tests/unit/
-	)
-
-	epytest "${parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=( "${parallel_tests[@]}" )
-	EPYTEST_XDIST= epytest tests/functional
-}
diff --git a/dev-python/botocore/botocore-1.43.110.ebuild b/dev-python/botocore/botocore-1.43.110.ebuild
deleted file mode 100644
index c5a99a77214e..000000000000
--- a/dev-python/botocore/botocore-1.43.110.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
-
-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 ~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
-	)
-
-	# The test suite can eat up a lot of memory when running via xdist,
-	# and slow down some tiny tests.  Let's just run a safe subset
-	# of tests known to be slow-ish in parallel, and the rest in series.
-	local parallel_tests=(
-		tests/functional/*/
-		tests/functional/test_event_alias.py
-		tests/functional/test_[cds-z]*.py
-		tests/unit/
-	)
-
-	epytest "${parallel_tests[@]}"
-
-	local EPYTEST_IGNORE=( "${parallel_tests[@]}" )
-	EPYTEST_XDIST= epytest tests/functional
-}
diff --git a/dev-python/botocore/botocore-1.43.78.ebuild b/dev-python/botocore/botocore-1.43.78.ebuild
deleted file mode 100644
index f0582e46c71f..000000000000
--- a/dev-python/botocore/botocore-1.43.78.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 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/botocore/botocore-1.43.83.ebuild b/dev-python/botocore/botocore-1.43.83.ebuild
deleted file mode 100644
index f0582e46c71f..000000000000
--- a/dev-python/botocore/botocore-1.43.83.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1
-
-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 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/charset-normalizer/charset-normalizer-3.5.2.ebuild b/dev-python/charset-normalizer/charset-normalizer-3.5.2.ebuild
index 93afafb101ea..f5e3939547c8 100644
--- a/dev-python/charset-normalizer/charset-normalizer-3.5.2.ebuild
+++ b/dev-python/charset-normalizer/charset-normalizer-3.5.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="native-extensions"
 
 BDEPEND="
diff --git a/dev-python/clang/Manifest b/dev-python/clang/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/dev-python/clang/Manifest
+++ b/dev-python/clang/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/dev-python/clang/clang-24.0.0_pre20261010.ebuild b/dev-python/clang/clang-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..aa99ad725bb8
--- /dev/null
+++ b/dev-python/clang/clang-24.0.0_pre20261010.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-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 llvm.org
+
+DESCRIPTION="Python bindings for llvm-core/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=llvm-core/clang-${PV}:*
+	!llvm-core/llvm:0[clang(-),python(-)]
+	!llvm-core/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/{bindings/python,include} )
+llvm.org_set_globals
+
+distutils_enable_tests unittest
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	eunittest
+}
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index fdff4cf06c5d..268c70f2c7d3 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1 +1,2 @@
 DIST executing-2.2.1.tar.gz 1129488 BLAKE2B 92060a941c3da32812475d1c3123d230a929e13042bd43c85494b4d72bee268c360475822aefda1059ce9144f77d1762390412ac61f435201531df30b718e1e6 SHA512 f5d00c47de7133c0d81b45982ec833bcf8ff80902695eadf563b276864c9844b1dd3865be12099a531fa6c872fd8cd2d72c7c6c7b2d601b8675d6758e6b179ae
+DIST executing-2.3.0.tar.gz 1338003 BLAKE2B 65d141f89d7314c4fd798dd731a4e9a0e084a6a558aa4f08702ef24663e638c42c8f784994707f0e237ee218f87f6ce4ddc222c6257f7d5664432c977a1a7246 SHA512 e640fadf9c18bd5918516c124c6034488cc276933272d423dca0e69f1ba4a3a2dc866969459503b46dfae69ad30d816136e5f613d8090313f9af8b1ffb06d458
diff --git a/dev-python/executing/executing-2.3.0.ebuild b/dev-python/executing/executing-2.3.0.ebuild
new file mode 100644
index 000000000000..8b3539ead2b2
--- /dev/null
+++ b/dev-python/executing/executing-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{13..14} )
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/asttokens-2.1.0[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/ipython[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_ipython.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "getting node's source code" dev-python/asttokens
+}
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.75.2.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.75.2.ebuild
index 4f2cd7d551b0..4254e74223b2 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.75.2.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.75.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-8[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio-status/grpcio-status-1.83.1.ebuild b/dev-python/grpcio-status/grpcio-status-1.83.1.ebuild
index 44049e1200fc..706a28c2d024 100644
--- a/dev-python/grpcio-status/grpcio-status-1.83.1.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.83.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/src/python/grpcio_status
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio/grpcio-1.83.1.ebuild b/dev-python/grpcio/grpcio-1.83.1.ebuild
index e1393626c01f..7968e6ffb67c 100644
--- a/dev-python/grpcio/grpcio-1.83.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.83.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="
 	dev-libs/openssl:=
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/dev-python/lit/lit-24.0.0_pre20261010.ebuild b/dev-python/lit/lit-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..48b365e13379
--- /dev/null
+++ b/dev-python/lit/lit-24.0.0_pre20261010.ebuild
@@ -0,0 +1,41 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		llvm-core/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from llvm-core/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/matplotlib/matplotlib-3.11.2.ebuild b/dev-python/matplotlib/matplotlib-3.11.2.ebuild
index 57100e039aea..c2849b4eaa56 100644
--- a/dev-python/matplotlib/matplotlib-3.11.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.11.2.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
 if [[ ${PV} != *_rc* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
diff --git a/dev-python/munkres/munkres-2.0.0.ebuild b/dev-python/munkres/munkres-2.0.0.ebuild
index 6fac36cecfbb..4f1163274bf2 100644
--- a/dev-python/munkres/munkres-2.0.0.ebuild
+++ b/dev-python/munkres/munkres-2.0.0.ebuild
@@ -22,6 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390
 BDEPEND="
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/mypy/mypy-2.4.0.ebuild b/dev-python/mypy/mypy-2.4.0.ebuild
index 5127cec44177..5ae93ab721f3 100644
--- a/dev-python/mypy/mypy-2.4.0.ebuild
+++ b/dev-python/mypy/mypy-2.4.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
diff --git a/dev-python/nanobind/nanobind-3.1.0.ebuild b/dev-python/nanobind/nanobind-3.1.0.ebuild
index b46039c14810..022374c465c7 100644
--- a/dev-python/nanobind/nanobind-3.1.0.ebuild
+++ b/dev-python/nanobind/nanobind-3.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	>=dev-cpp/robin-map-1.3.0
diff --git a/dev-python/narwhals/Manifest b/dev-python/narwhals/Manifest
index 7377bd09a77f..970c4553dc3c 100644
--- a/dev-python/narwhals/Manifest
+++ b/dev-python/narwhals/Manifest
@@ -1,4 +1,4 @@
-DIST narwhals-2.25.0.tar.gz 677076 BLAKE2B 3a1630bf71ca2f6dfa77c2702ef5f227de8d5d3e52ea563183edd6d3928386bb550206f1c9fffaf3c53599eaae051e8fa02facec8f607fec13a6573199571c9b SHA512 225190b5e31f3fd5ac514527bd8dcb3c50ae7f4abd3620ae1cf5a28b5f88b5c115b590705eb3c63de97dd8c5e172fd892286c3f896439815a3a83c076c18b3ba
-DIST narwhals-2.25.0.tar.gz.provenance 10179 BLAKE2B 37ae8a1329c6676e349ad725e743d6eaff306a55fe4e1ce9a4a95ee0dd4d68cb41f4e92fa93ed8dbd98ca3460744b6dcc2894eb4a6ce979e2deb9de066a5f919 SHA512 89a3a5fab107d06b619de9a62b5c3a21a808ea117ba9517004fa6b715c16e5399020e60d5cac2d7278b9a3e689ed70e9dc56efad24e3900941774058d9274691
 DIST narwhals-2.26.0.tar.gz 686970 BLAKE2B 145d115bb50f94519de8a734fc98f0473d4d7f4a2d2ede0035dfdaeb1e9d571f4950620127e4f9ca1ba79fe326e3985a72b81924a7449710d7f97217ff1aed92 SHA512 39f9273e785565b39aa4e34602e7484002dd515deb47ce457d48f1365b047bcd8c53cf66f8cd6ada024a9937b2224de6f8037b1beb8340c07317667fe7e54076
 DIST narwhals-2.26.0.tar.gz.provenance 10073 BLAKE2B e22d566a8d8004daaf6276d91a6866f186f2ed88ce17974daee46bcca0fdc5ba7466173d87ece8646a1af1886192773b2bbc1607a924ec1e13c5c6a1b01b2b07 SHA512 2cdc70379ba0b5adab29b64762584aa5de69c6f3e436922e132d7a35f0fcedb2a7743848a8149cb4a4f3c44669c82f880c764a62a1d489a29f458ed9092cd431
+DIST narwhals-2.27.1.tar.gz 735013 BLAKE2B 5067a274e50309276ead99fe363022d4168d2db321fd9f2cd6cce394341f8f266eac860af581939bbbf5011396b9a4531a9da37f365ca801a47f49476908e4a9 SHA512 949a12f3b3a35a2825c3239f5b6d6aae093c4b98c81141ecf1ce8c62f506cbb0ad52f0cd9d2ea383c87dcd3124d1eaa66559ad25e2390e47300247a715f8f765
+DIST narwhals-2.27.1.tar.gz.provenance 9961 BLAKE2B c01dcef1c4ae00c432704416919f6fbddbccf46d5e1d042c457023411cddb87955e08880f960920e9cf52c948bfbd800531132283f1922e51361f19cb4ca9600 SHA512 7edc3d670a7055c01cb62e4f858941bf533dbde123a0f95e490882a865dfbd81022770f325ebc83cdd0366c0df415fbb231faea8e8d3d1ce482967e7fbac2767
diff --git a/dev-python/narwhals/narwhals-2.25.0.ebuild b/dev-python/narwhals/narwhals-2.27.1.ebuild
index 659973ad0528..359955646416 100644
--- a/dev-python/narwhals/narwhals-2.25.0.ebuild
+++ b/dev-python/narwhals/narwhals-2.27.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index bbc30f941e6b..4ea2858982f3 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,2 @@
-DIST nuitka-4.2.1.tar.gz 4632551 BLAKE2B d507e98d69171380e1bed4b36094b3ff4ea1ffbcb54d2cd42822e5ff3be2f7d3fba2a0a7b45c56bf83c54525df834133ed94f29a30200aa56ea6da6aa1a09a75 SHA512 478ad3ef299ce5c2df85eeea4f27dfd754c0821367d775f00dba59734063c60ed6bbf6b10d7a9046242ef6b67d6a372671992d7bd6327a00d89c471f939a18c2
 DIST nuitka-4.2.2.tar.gz 4635975 BLAKE2B 0fca85450b40118fe2a7531484ae55eb873da150167b0c23d73d7c2ffed12fc8ffd0b45c2163be2e22821a0cb0fa58631674af472b1443caa471efe443c756a9 SHA512 cb1d20bcb2c056fb2b4909fbf6bffff645a336da3b2439ce720df812c8649f002f774ae88124dba8a98837d5de41d510ab4196fd6d1a6084ebda9b2089ec8445
-DIST nuitka-4.2.tar.gz 4628471 BLAKE2B fb3322dcdded4404b2d4dfd25837ed61f41ab05581af5dfc315b9625395196abd1af3c9e20414ef5a8404b00cc98389a4d58ccb55ed7cb990d5f85050768faf1 SHA512 067a1851bf017ac399dfe251ed07c6bd3aea9bea8bea44ba21c3769d9a11203d1d31e5ceb2b53131ac0b55ea5730abfb0e08b55628a056031f9dc6a1d8836a34
+DIST nuitka-4.3.tar.gz 4766934 BLAKE2B a301fe19910984a4d9d37691a0ff25de9ad032cad274ca3fa0f282d9720f95abe1fea24e088043c7ca43ab2a05d300a587298ec38850829cc57547bbab906ec6 SHA512 eab95922623f88be6601831f0604ec0538d32d98f45450513869a5f3193af8fc31d7626f73d5375f5553f4e72d261f7423ec92369cfdc5298e0dc22da543eefc
diff --git a/dev-python/nuitka/nuitka-4.2.ebuild b/dev-python/nuitka/nuitka-4.2.ebuild
deleted file mode 100644
index 9cf157377a76..000000000000
--- a/dev-python/nuitka/nuitka-4.2.ebuild
+++ /dev/null
@@ -1,58 +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_PN=${PN^}
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.15[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-4.2-disable-update-check.patch"
-	)
-	distutils-r1_src_prepare
-
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka.1 doc/nuitka-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" dev-util/patchelf
-}
diff --git a/dev-python/nuitka/nuitka-4.2.1.ebuild b/dev-python/nuitka/nuitka-4.3.ebuild
index 9cf157377a76..9cf157377a76 100644
--- a/dev-python/nuitka/nuitka-4.2.1.ebuild
+++ b/dev-python/nuitka/nuitka-4.3.ebuild
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.45.1.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.45.1.ebuild
index ce870dea8751..add4c171cdea 100644
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.45.1.ebuild
+++ b/dev-python/opentelemetry-api/opentelemetry-api-1.45.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.45.1.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.45.1.ebuild
index 9b5d6e0bef64..e6fbeb5956c7 100644
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.45.1.ebuild
+++ b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.45.1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.45.1.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.45.1.ebuild
index 7b7a57f46e61..6d3fb462ed30 100644
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.45.1.ebuild
+++ b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.45.1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest
index 770812f25990..a78fc0eba08c 100644
--- a/dev-python/parse/Manifest
+++ b/dev-python/parse/Manifest
@@ -1,2 +1,2 @@
-DIST parse-1.22.1.tar.gz 36970 BLAKE2B 8d8b47d00f944bd3dd4957b9d4b3de376d35b51dc331105a81841260a74107b0958d31b8793e692e52ce4c2465c434cff47486fe00d143b39ff92d3bc05df899 SHA512 42aac258a9de08fc91816a97af04c378e3e1f9bcee554fb421185e799e2c4b1e2cd0cad5602ffb3043bb347851f0b2c1571a11c4a9cd82d3d0011d12cbbc0496
 DIST parse-1.22.2.tar.gz 37675 BLAKE2B 5db3a9da69016fe6db06473c2301b690f7520babe22baedfe7957cb881e155cdf22321143dcb3742852afaac57556e6202a75d81d2d76e974632455162a3830f SHA512 6370c28c90cd452d094be43f5e745c474d700f069bcf631d4dcc77d9861633e6916e9699bfb00988a15221388c7a21a9c967f47de964567c8f7c09edd5958dc3
+DIST parse-1.22.3.tar.gz 37944 BLAKE2B 3f602047c62d173d8f013a658646f9178ed5405efd6d4cb66c0a09d69851c84ee8b99c2e4a91675ce8c26cc5642d8cd3fb407b2e1f565c50fe2db4e53affca43 SHA512 fd79c50286a205549f158581487067ac1011cca84e5945c984da27cabf4d232dcf507a8985666bc25869a31e4d1a154ab18d7983d9eb6bfd0f5c0662b0a30abe
diff --git a/dev-python/parse/parse-1.22.1.ebuild b/dev-python/parse/parse-1.22.3.ebuild
index 0a4993c43494..b535eb96f205 100644
--- a/dev-python/parse/parse-1.22.1.ebuild
+++ b/dev-python/parse/parse-1.22.3.ebuild
@@ -8,11 +8,14 @@ PYTHON_COMPAT=( python3_{13..14} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Parse strings using a specification based on the Python format() syntax"
-HOMEPAGE="https://github.com/r1chardj0n3s/parse/"
+HOMEPAGE="
+	https://github.com/r1chardj0n3s/parse/
+	https://pypi.org/project/parse/
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-python/pikepdf/pikepdf-10.16.0.ebuild b/dev-python/pikepdf/pikepdf-10.16.0.ebuild
index 36cba4fc97f1..be5c4a003487 100644
--- a/dev-python/pikepdf/pikepdf-10.16.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-10.16.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
diff --git a/dev-python/pillow/pillow-12.2.0-r1.ebuild b/dev-python/pillow/pillow-12.2.0-r1.ebuild
index 212de0098fd6..94156fc8087b 100644
--- a/dev-python/pillow/pillow-12.2.0-r1.ebuild
+++ b/dev-python/pillow/pillow-12.2.0-r1.ebuild
@@ -122,7 +122,13 @@ python_configure_all() {
 	EOF
 
 	tc-export PKG_CONFIG
+
 	export MAX_CONCURRENCY=$(makeopts_jobs)
+	# For 32-bit, just cap at 4 jobs to avoid pybind11 allocating
+	# like crazy (bug #970414).
+	if [[ $(tc-get-ptr-size) == 4 ]]; then
+		MAX_CONCURRENCY=$(( MAX_CONCURRENCY < 4 ? MAX_CONCURRENCY : 4 ))
+	fi
 }
 
 src_test() {
diff --git a/dev-python/pillow/pillow-12.2.0.ebuild b/dev-python/pillow/pillow-12.2.0.ebuild
index a3e39684aa20..5cf72382f102 100644
--- a/dev-python/pillow/pillow-12.2.0.ebuild
+++ b/dev-python/pillow/pillow-12.2.0.ebuild
@@ -123,7 +123,13 @@ python_configure_all() {
 	fi
 
 	tc-export PKG_CONFIG
+
 	export MAX_CONCURRENCY=$(makeopts_jobs)
+	# For 32-bit, just cap at 4 jobs to avoid pybind11 allocating
+	# like crazy (bug #970414).
+	if [[ $(tc-get-ptr-size) == 4 ]]; then
+		MAX_CONCURRENCY=$(( MAX_CONCURRENCY < 4 ? MAX_CONCURRENCY : 4 ))
+	fi
 }
 
 src_test() {
diff --git a/dev-python/pillow/pillow-12.3.0.ebuild b/dev-python/pillow/pillow-12.3.0.ebuild
index 8b9406bcbb77..91d8be33736b 100644
--- a/dev-python/pillow/pillow-12.3.0.ebuild
+++ b/dev-python/pillow/pillow-12.3.0.ebuild
@@ -35,7 +35,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="avif examples imagequant +jpeg jpeg2k lcms raqm test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="
 	raqm? ( truetype )
@@ -122,7 +122,13 @@ python_configure_all() {
 	EOF
 
 	tc-export PKG_CONFIG
+
 	export MAX_CONCURRENCY=$(makeopts_jobs)
+	# For 32-bit, just cap at 4 jobs to avoid pybind11 allocating
+	# like crazy (bug #970414).
+	if [[ $(tc-get-ptr-size) == 4 ]]; then
+		MAX_CONCURRENCY=$(( MAX_CONCURRENCY < 4 ? MAX_CONCURRENCY : 4 ))
+	fi
 }
 
 src_test() {
diff --git a/dev-python/pooch/pooch-1.9.0.ebuild b/dev-python/pooch/pooch-1.9.0.ebuild
index 0a79b1587d30..d3795eb447ce 100644
--- a/dev-python/pooch/pooch-1.9.0.ebuild
+++ b/dev-python/pooch/pooch-1.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/proto-plus/proto-plus-1.28.4.ebuild b/dev-python/proto-plus/proto-plus-1.28.4.ebuild
index b58c988e3920..413dc1c62f94 100644
--- a/dev-python/proto-plus/proto-plus-1.28.4.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.28.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-8[${PYTHON_USEDEP}]
diff --git a/dev-python/pybind11/pybind11-3.1.0.ebuild b/dev-python/pybind11/pybind11-3.1.0.ebuild
index ce967ed0d859..987722704c1f 100644
--- a/dev-python/pybind11/pybind11-3.1.0.ebuild
+++ b/dev-python/pybind11/pybind11-3.1.0.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# Avoid spurious reports about LTO (bug #938436), but check carefully
+# on bumps.
+CMAKE_WARN_UNUSED_CLI=no
 DISTUTILS_USE_PEP517=scikit-build-core
 PYTHON_COMPAT=( python3_{13..14} )
 
@@ -51,6 +54,8 @@ python_configure() {
 	DISTUTILS_ARGS=(
 		# disable forced lto
 		-DHAS_FLTO=OFF
+		-DHAS_FLTO_AUTO=OFF
+		-DHAS_FLTO_THIN=OFF
 		# https://github.com/pybind/pybind11/issues/5087
 		-DPYBIND11_FINDPYTHON=OFF
 		-DPYBIND11_INSTALL=ON
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.2.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.2.0.ebuild
index cb43830d9eb9..0c3fb008e13f 100644
--- a/dev-python/pyftpdlib/pyftpdlib-2.2.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-2.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 84ca891c334c..48ca12a11017 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -8,3 +8,5 @@ DIST pymdown_extensions-12.0.tar.gz 867035 BLAKE2B 2a95a81964b16f816c435892c9498
 DIST pymdown_extensions-12.0.tar.gz.provenance 9995 BLAKE2B 2c231bb3f412bbdad5abbeb7627be427e8ba3bc6eec22f2128ad089e71d639599494edaf9a9e84db8093ea484955843b23f642fd33c7d1f93c5a3ae0ee02175f SHA512 36de2ab58cf83c00e4f207b6421eddf225646ee38bf79dbfad6a969dde532c8d8352ba39e173567a455037710cc9dfd77e658607a02fad987e43bded7e2f82c7
 DIST pymdown_extensions-12.1.tar.gz 868245 BLAKE2B f3503d27b7c819cb88c2b3325c80cebef2dbaa7e8e85e19c1ab4f9b2ef5924a35785626205f3b11d05a2f8bd9e42667d4bcc6c0a81a5c03e4b68e5dcee8c506f SHA512 eff6bb92df1e87cd68007a6543f075a6b8276c8718c25ab95dec1e948995ee60ed80cb9067f9fef8819710fb5306b8b94ca44d4640c8777de6b765d0c06a1743
 DIST pymdown_extensions-12.1.tar.gz.provenance 9948 BLAKE2B 30fc0aec28f48da59c4a236f7b5f5802970975781fb446f01e0040f4ba77f246fde8b3c22a3a149b9d15f01db5d3724029d08f8edce20d0211c6cdcc6fdbf8fe SHA512 cbac49f1d07b4f99f01a649d22ff4ed31bb8e08ac322706265a9e9f2509de841e515015f1378bd55ec117e15a972116823f2f67c04d5e0be1b2532d48d11feef
+DIST pymdown_extensions-12.2.tar.gz 870226 BLAKE2B 863911fdcce9dd869374c39bf619262c506232f90bfdd30af9507a88fa22e65c5c464527476d62048f0599ace1a17e4badf50995ddb60cde8c9b77662ba55f3f SHA512 3313070cb2333ad79a1e8473d42b58c916e038550513a3fef3b757e0233b4ca49b736343a12e71caab49f17b0431ebf7c4bcd427c85bc12853993590abdcbb58
+DIST pymdown_extensions-12.2.tar.gz.provenance 10067 BLAKE2B f9813283c6dedcdc6734941cafa437665f1ba831a1814bdba4953e4e1191065cf2e67c803312d2bd1ba9914a23ea88dc16883e6a05692ceba1896364780f4b43 SHA512 60233f1016da17697737158a3c06fb3ebf988125556ea4d0fe884cfbe106cea922bc17e4c0ca3b0f2499958e28c0de69f505ed01d51cd0bf81421e2f47042285
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-12.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-12.2.ebuild
new file mode 100644
index 000000000000..1c6dfb8c42e4
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-12.2.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/pyproject-api/Manifest b/dev-python/pyproject-api/Manifest
index 774861f94389..e87fcb009d53 100644
--- a/dev-python/pyproject-api/Manifest
+++ b/dev-python/pyproject-api/Manifest
@@ -8,3 +8,5 @@ DIST pyproject_api-1.11.3.tar.gz 24944 BLAKE2B eb6fa0bd6e916ffc6bc646dfef4f7bb52
 DIST pyproject_api-1.11.3.tar.gz.provenance 9587 BLAKE2B 870cb60500be31d83bf689fd7f7c1fd88f6f915c686d3bcd81e55d608ad5bd3abeae67894b3828c8af7a51b9f2a240cd3c2b679ebc0815557a6d0ea494ee7185 SHA512 9f321129d820f67a75726dc51cf7906bfe02d9b594e71107023b1a6ac2e44204620e8b5555256a1581fe1d85e8c80db48c9fcb92bb6fe888bcb21234a2b4e31b
 DIST pyproject_api-1.11.4.tar.gz 25169 BLAKE2B 63a575c9479eada172ccd8b0d0c6c314bd7dd8b6854da4db7add865fc03c270e3f55da1c9bed37b9286c45618f0e8df2585b39e42fe854ce2a1304de9a3e8e6f SHA512 f0cbc1189f71882124136502e3bbb25b525a6aade73c7fd12eb189cb189d8599ef724143420017de5da13def4c0d1fbd3d9dfc81d1cf14ac3d1064e9a506f0f6
 DIST pyproject_api-1.11.4.tar.gz.provenance 9996 BLAKE2B de6e9239594f62de4727261689c77a490d13e255d989404ec846e6ae7c0584fa9a25a66cffce2f92efe9662fbba6e0527b4d6aa881ea9cab1527bbb5abee0c0d SHA512 5b4d3a7ec13a4b932ee35fc2727e81ee4b410ccfc347a82faf88ebf7f04375995998459df253025f93925bda9aea2d4afbcf90a8b4b848742efa8e8e6f5c4728
+DIST pyproject_api-1.11.5.tar.gz 25745 BLAKE2B 5b6c28de1052a399d228faa4914ec35d13532235fa8ee45f4a9f12e8b12805913048c96793ee8575211d94d03dbb4aa2ab03aee28ae588aaf7525e4fcd45f6e6 SHA512 89fab8c160b4ce4829f8e59931ff4e28d9df79f2d9ae906b869f04e618a584f77a147b6c24324a58a253a1799f0d8a33e871f41ab345cbedd7d059aa38162e99
+DIST pyproject_api-1.11.5.tar.gz.provenance 9851 BLAKE2B 34be212a597d98768857f2d3093a15c3ba7b083b033fd0d1b28ba170c09ac4eea52c9d550f97487df407391839c66a06f2bafcc509a4b5fef9749192f89ed054 SHA512 129667f5b5394c6ee459c861092816d9776bec7110a98f3c8dde2208e2478705966e9485c1ea04c0f29cd12bd5dfbc9858464df611dc782688b11771c8efbf96
diff --git a/dev-python/pyproject-api/pyproject-api-1.11.5.ebuild b/dev-python/pyproject-api/pyproject-api-1.11.5.ebuild
new file mode 100644
index 000000000000..0fbc85990c81
--- /dev/null
+++ b/dev-python/pyproject-api/pyproject-api-1.11.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-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/tox-dev/pyproject-api
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="API to interact with the python pyproject.toml based projects"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-api/
+	https://pypi.org/project/pyproject-api/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-26.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/setuptools-70.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wheel-0.40.2[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-mock )
+distutils_enable_tests pytest
diff --git a/dev-python/pyspellchecker/Manifest b/dev-python/pyspellchecker/Manifest
index 74b677fa52fc..ab8ee649ad2f 100644
--- a/dev-python/pyspellchecker/Manifest
+++ b/dev-python/pyspellchecker/Manifest
@@ -1 +1,2 @@
 DIST pyspellchecker-0.9.0.gh.tar.gz 79001668 BLAKE2B dda2a818c139afcc8564185a8338f68bccd9c5b4c9f109803b9c27fb18bafc48e6357550ad8659520472d54b05104fd517253b9deb5f4ce9d46bd6fcdf42ce71 SHA512 4c1cd3af70090aba1d799f8a0b71518c553f8e94c5b961065bd28ba3385a9cfb87c78e166ffa556e32e90fe2708fddb2dda0e37ee10e2699655670eee579aeb6
+DIST pyspellchecker-0.9.1.gh.tar.gz 79002554 BLAKE2B f1bf2dd3c0f3e9db8a1ae09c9269a1c3939d6a6a49b81b26cff69e7afd8e328393e315c8f6e3e294afb722b6212ff3dd098bc6d323248798a7b937cd779a0939 SHA512 312a174cdde0b18fc743541aaad7e05f9d76120d2b467bab569cfcb871fafefee582bb6b45214f765f0b5b5b6d01a6e9e718362308fa2b80e12e0d97d3dd0b2f
diff --git a/dev-python/pyspellchecker/pyspellchecker-0.9.1.ebuild b/dev-python/pyspellchecker/pyspellchecker-0.9.1.ebuild
new file mode 100644
index 000000000000..08e9805c128f
--- /dev/null
+++ b/dev-python/pyspellchecker/pyspellchecker-0.9.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2025-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="Pure python spell checker based on work by Peter Norvig"
+HOMEPAGE="
+	https://github.com/barrust/pyspellchecker/
+	https://pypi.org/project/pyspellchecker/
+"
+SRC_URI="
+	https://github.com/barrust/pyspellchecker/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -p '*_test.py'
+}
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.6.0.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.6.0.ebuild
index fe890232a6e4..31aa7f855069 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.6.0.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pyftpdlib[${PYTHON_USEDEP}]
diff --git a/dev-python/scipy/scipy-1.18.1.ebuild b/dev-python/scipy/scipy-1.18.1.ebuild
index 7e083b298726..2e3b708a40d6 100644
--- a/dev-python/scipy/scipy-1.18.1.ebuild
+++ b/dev-python/scipy/scipy-1.18.1.ebuild
@@ -106,7 +106,10 @@ src_prepare() {
 	distutils-r1_src_prepare
 
 	# unpin system dependencies
-	sed -i -e "s@version : '@&>=@" meson.build || die
+	sed -i \
+		-e "s@boost_version = '@&>=@" \
+		-e "s@version : '@&>=@" \
+		meson.build || die
 }
 
 python_configure_all() {
diff --git a/dev-python/selenium/selenium-4.51.0.ebuild b/dev-python/selenium/selenium-4.51.0.ebuild
index 6bc9836d962e..bc4a69c1401e 100644
--- a/dev-python/selenium/selenium-4.51.0.ebuild
+++ b/dev-python/selenium/selenium-4.51.0.ebuild
@@ -30,7 +30,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test test-rust"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 0f8fff516bf0..f2707bda2d8b 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1,3 @@
 DIST soupsieve-2.10.gh.tar.gz 160025 BLAKE2B 17d1ba7b9cb21ea79de01fb7d5481c75762deee8bd2024b141b55815da3c2214563f00cceaead7f65d51b40e956842bc6ecf94427e0e96582dd4e7fee5fb2dff SHA512 c7fe75fa3a4a55b73baaa185386220a3638a2e0b6f649e4df1838205e2f693c2612ab485737b28ed4c2a04815a4faddc941b2d0e1318dcc99047e60f01039b9d
 DIST soupsieve-2.9.2.gh.tar.gz 157707 BLAKE2B b57eef6a67ddf33c03bdd418a22229877b206022298e534ba6fa59992f7a21adaf3c6bee13e381140e812a390dd67f73f4e7147eefc169dc3d6a6432c6c23715 SHA512 262d422900fd0f60760a02668e556b8eee4589b578f397083b87b78e6b03e7c43055fac70e290666e64b111d0e9f0ed21f8ed989ff5a1ff5a05ed8adbf341726
+DIST soupsieve-3.0.1.gh.tar.gz 119766 BLAKE2B 01a1f300d336182a3e055fcad4ee5d321c311ace28363f5c800e36cc5c7c813b66786b3e8f464c90511be236ff64709122759a5332c7127f7d4c11fc27dab461 SHA512 4609a5c9701e1b51a1dfa447bb33993a2ce3a781c9f0b8fa1fdee1fed3bdd05b9e79f25967d82f64252be8c66b823f652365236dcfd4a82c5b835a5fc8504955
diff --git a/dev-python/soupsieve/soupsieve-3.0.1.ebuild b/dev-python/soupsieve/soupsieve-3.0.1.ebuild
new file mode 100644
index 000000000000..a386cbdf6652
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-3.0.1.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
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1
+
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="
+	https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/
+"
+SRC_URI="
+	https://github.com/facelessuser/soupsieve/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-1.7.0.ebuild b/dev-python/starlette/starlette-1.7.0.ebuild
index a96a3849de3a..032fc6fce554 100644
--- a/dev-python/starlette/starlette-1.7.0.ebuild
+++ b/dev-python/starlette/starlette-1.7.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # TODO: default to httpx2? add some flags?
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 90373233f12e..9db20b629001 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -18,3 +18,5 @@ DIST tox-4.64.8.tar.gz 326058 BLAKE2B 2c9d954bed23e88cdf3d0dc8ad24db7ad9b8eaa804
 DIST tox-4.64.8.tar.gz.provenance 9156 BLAKE2B e4094d1cdd0d65a9cb65d35a18cf8fc6980b0bb7478ccc0057e038325e1368173b9fe3f54c391ca27addb73cd49b29dfac3d17fe5468f9be1767602d7298fc55 SHA512 b15a95e7a4fd9b67449740da39a58f2062688bb7df0ee60a7f44e1b082caf682cf8f7a9e4bc4255eb102443f659b9b18051a8069c4749875eeb328bff5a1590d
 DIST tox-4.64.9.tar.gz 331588 BLAKE2B de9f2da818c516b51492acdf437b3b16d7e06736d83c7e14ba094b96be00d67cb9d4c97261671d2a76ba0b1c67581d4287d127c175c8ce8e10d020eca6c9487a SHA512 284c5df3c6d76a7e913b225ad943ab27d40756f2f8df9fcf34df18c87ddc9149c9c5b1740cb6b66b513d478947dce13e16fd765efd430097afc5337c11534caf
 DIST tox-4.64.9.tar.gz.provenance 9544 BLAKE2B b1dd15e89b1e22227b138d4f5999aa926d3993cf28898f98c6b93eca23522de63675cbdeaa4c71590606143eaa5bfae14b77b61579ef1ea3d191e509c698d255 SHA512 61078355d7e17261071e375cb6c5181e764d29a028a5d288ae37243f22d3544194f123527ac10ad36cb6f1e926a59e511323223f771e8eb4aacb919cd5e8f653
+DIST tox-4.65.2.tar.gz 343387 BLAKE2B 3639dc0956edcb9e7351b28c435bcc20be48b9011907fd0c946140347e6e0a2c6d4e6fa7c591b91baccbdc3434f9d716ebd0339934e9a1edbc3f023add9edb28 SHA512 5327a2c0a52834f52788a86a34b066999dd6d1f5ff7387950e2bbd1737ad17eb0444135a908b6a93b80834b7704fde3ac616e73de2d54125588c60b0df9fb78c
+DIST tox-4.65.2.tar.gz.provenance 9796 BLAKE2B 9ec3ebdcf067036a77802d1c016f84594e721ed9ff9a2fe1c0c2bc7221bfe9040c3026a860c8f094f35eabc300ae74f1f6c259a84edbaa54d031549eba8f0644 SHA512 a9f9db00a3f34cef34f3c3f9415c96ef1ddf1c028cefad63b0368e8a4275e321efae705752921c7397dfaf1c6222954deeafc3be27530cbbb7f90d6ddb0d7cc1
diff --git a/dev-python/tox/tox-4.65.2.ebuild b/dev-python/tox/tox-4.65.2.ebuild
new file mode 100644
index 000000000000..9d80c8ee22b8
--- /dev/null
+++ b/dev-python/tox/tox-4.65.2.ebuild
@@ -0,0 +1,84 @@
+# 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/tox-dev/tox
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pyproject-api[${PYTHON_USEDEP}]
+	dev-python/python-discovery[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.15[${PYTHON_USEDEP}]
+	' 3.12)
+"
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/distlib[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=( pytest-{mock,rerunfailures,timeout,xdist} time-machine )
+EPYTEST_RERUNS=3
+# upstream timeouts are quite short
+: ${EPYTEST_TIMEOUT:=180}
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream lower bounds are meaningless
+	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# devpi_process is not packaged, and has lots of dependencies
+	cat > "${T}"/devpi_process.py <<-EOF || die
+		def IndexServer(*args, **kwargs): raise NotImplementedError()
+	EOF
+
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
+		tests/tox_env/python/virtual_env/package/test_package_pyproject.py::test_pyproject_installpkg_pep517_envs
+		# require tombi
+		tests/session/cmd/test_schema.py::test_schema_tombi_lint
+	)
+	local EPYTEST_IGNORE=(
+		# requires devpi*
+		tests/test_provision.py
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/txredisapi/Manifest b/dev-python/txredisapi/Manifest
index d70bc17c00f2..35e096a44225 100644
--- a/dev-python/txredisapi/Manifest
+++ b/dev-python/txredisapi/Manifest
@@ -1 +1,2 @@
 DIST txredisapi-1.4.12.gh.tar.gz 55552 BLAKE2B 48f5060a75464873d464ff9900dc539ffd470867ef71f2c35863caada3f957dec388d6f340b01fd47026bf954e46dbc162103e3d5c4ff5693a0264fb8d7cdccc SHA512 71903954b3d3cdc82e020a094538ccae5dfc2676b042dd115b6e8a1e00c33ddb07cf1d2a1df81db563165ea327c53e1a22ae4acb09d6717612154fbc5f74e450
+DIST txredisapi-1.6.0.tar.gz 64723 BLAKE2B 7c50ee81ca779f337989e705ca51ffe84357ff6ca07fe5a3683f9b75db3fc9925c30710378dab84dbbed832778170ac162282ca0977c57f47366272b0c402133 SHA512 197afb9bc37f0aaed9248cc28da1774d9d5d61461bd70b203a26e765eaefd080dfb91c218cd5e356c8b828b37f6f45aa04502727d53bc81484ba839f0106eab2
diff --git a/dev-python/txredisapi/txredisapi-1.6.0.ebuild b/dev-python/txredisapi/txredisapi-1.6.0.ebuild
new file mode 100644
index 000000000000..5cb7e3890f7c
--- /dev/null
+++ b/dev-python/txredisapi/txredisapi-1.6.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Non-blocking redis client for python"
+HOMEPAGE="
+	https://github.com/IlyaSkriblovsky/txredisapi/
+	https://pypi.org/project/txredisapi/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP},ssl(-)]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+		dev-python/hiredis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	sed -i "/redis_sock =/s:/tmp:${T}:" tests/test_unix_connection.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# paralellized tests with -j parameter fail
+	"${EPYTHON}" -m twisted.trial tests || die "tests failed with ${EPYTHON}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+		unixsocket ${T}/redis.sock
+		unixsocketperm 700
+		${extra_conf}
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+pkg_postinst() {
+	optfeature "Use hiredis protocol parser" dev-python/hiredis
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index b36383cc67b3..f2ac1761d057 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,2 +1,2 @@
 DIST wcmatch-11.0.1.gh.tar.gz 150081 BLAKE2B c80a055c02d0fc671fae4ef7dd291c8e58bdf91a446394a22c845a6b5c0ad9842874631f0e446b7e407d34e61a938c9e18e6925b459205b85e93bed00d42fd9d SHA512 72ae74717212fd9d1cc8c726c6e07f6b2aa88fc6c508d03a8f616dc902fe5b08d356454b392fbfb4bc626df25c55153be8ec1cd42cc345a532a4cf489ea412c3
-DIST wcmatch-11.0.gh.tar.gz 146821 BLAKE2B 800a6ba2c4aefdef6f68292427fd8250e358344fd0d8720360e83a11139713c9f657bb4feddf832b97bd893acf5092f3fa354ba41ef70fe6d3791085cf6fbc7c SHA512 a39fdd325b9f91a6e99e6b9f6a823029e306734eaf70c155a77192cab9651d04da005c8c02cf60ccb2bfad6b5c47493c3c988dcc6a0f7786c2b05da1801629ca
+DIST wcmatch-11.1.gh.tar.gz 134230 BLAKE2B 8f87a7db63317b7e06cab2a0ef1192db4fec701ff0c3a759df0e7315dadded6575302ef66f1ec73202dc3a6d92cbac9186ede3286592101e3e36798ce5647667 SHA512 4729a2d1a70753e5bfe4183099a1fd052316b7249c1d69b55d776d87459d20fa01b4146d606e80afb52c3eb457d5d612409d1846cf2c56563306c7fc3530df0d
diff --git a/dev-python/wcmatch/wcmatch-11.0.ebuild b/dev-python/wcmatch/wcmatch-11.1.ebuild
index c26aa7d6a6a6..920e5350faaf 100644
--- a/dev-python/wcmatch/wcmatch-11.0.ebuild
+++ b/dev-python/wcmatch/wcmatch-11.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/bracex-3.0[${PYTHON_USEDEP}]
@@ -42,3 +42,9 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	# https://github.com/python/cpython/issues/155823
+	local -x PYTHON_JIT=0
+	epytest
+}
diff --git a/dev-util/diffoscope/diffoscope-329.ebuild b/dev-util/diffoscope/diffoscope-329.ebuild
index 7300956155bc..8aff790468e5 100644
--- a/dev-util/diffoscope/diffoscope-329.ebuild
+++ b/dev-util/diffoscope/diffoscope-329.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java libguestfs llvm
 lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 0bb276b30338..a9ea9ea3d4e8 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,2 +1,3 @@
 DIST glslang-1.4.350.0.tar.gz 4328907 BLAKE2B 1f45d69f04310d9beb0e51ba283e1e9e777e288831e21423c9b26cbfc7b0f9bfba5c0383c6a58e2cb0661f266867bea529ca07e393630777e031a55f1c499d7d SHA512 bf93a225f007b8ccb605fe33ed6642d26f2211f77c3530c2418b272c26d7706e94a2da89759cb249c26d2ccfc9e91110f55550f9112fd7ca724867f225ac3e44
 DIST glslang-1.4.357.0.tar.gz 4412438 BLAKE2B 78b4a1b8ac947fd10cf8561f7bdf5b0726f3c36c76750926374f82ae5a3ea7f2d4000455fa18edadbc0eaf8d3ec5655b4f66771c054f5e1668227347a805e6a4 SHA512 471ea08f786564fd08469f79544c1959c7ccbd62f422d2a03b464410e265914d607b97e6dbec54ecbb601270d58528f01238faa55ca5387ddf0cdecb626d0ec4
+DIST glslang-1.4.363.0.tar.gz 4636143 BLAKE2B b15bfe98434339ae3b56628b0dc7d82a2150b2dfb12ded733bb537868328bdbbf54cd9c6c61eb145df9d6843017bb81ac28897d67a49a47117e0ffbdfba946ef SHA512 55c3441a6b1912b1014455f43fa1dcc1c0e91bdf7b4180ae18f2d9ea8ec59326d57b0251494c772da45b7d0f376ef2a55865d7835230673ce7b32ad5eb027535
diff --git a/dev-util/glslang/glslang-1.4.363.0.ebuild b/dev-util/glslang/glslang-1.4.363.0.ebuild
new file mode 100644
index 000000000000..409c02b0f8a2
--- /dev/null
+++ b/dev-util/glslang/glslang-1.4.363.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	GIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0/16.6"
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
+"
+
+DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.4.357.0-Fix-format-specifier-for-64-bit-index-in-error-messa.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PCH=OFF
+		-DALLOW_EXTERNAL_SPIRV_TOOLS=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# bug #977176 (https://github.com/KhronosGroup/glslang/issues/4180)
+		$(usev arm 'glslang-testsuite')
+	)
+	cmake_src_test
+}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 36aadaf854a1..409c02b0f8a2 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V ge
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
 LICENSE="BSD"
-SLOT="0/16.4"
+SLOT="0/16.6"
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]
@@ -29,6 +29,10 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/1.4.357.0-Fix-format-specifier-for-64-bit-index-in-error-messa.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PCH=OFF
diff --git a/dev-util/selenium-manager/selenium-manager-4.51.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.51.0.ebuild
index cd1cea07b9a9..b052ec8eb5fd 100644
--- a/dev-util/selenium-manager/selenium-manager-4.51.0.ebuild
+++ b/dev-util/selenium-manager/selenium-manager-4.51.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 CRATES="
 "
-RUST_MIN_VER="1.88.0"
+RUST_MIN_VER="1.89.0"
 
 inherit cargo
 
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 4a7a54696378..945bd3d75cda 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,2 +1,3 @@
 DIST spirv-headers-1.4.350.0.tar.gz 565401 BLAKE2B 27531f159554bdb0bf74cbb520a10a4cbf7ea2fff3508001d87820bd7e675fb0d27e7941874b02c78f5f48d021159f61859314344c21cc57213a855029f6e3f2 SHA512 5a91928cecb4b4fcf4badffc2e20ba93803f7bb0f3e5bf0f92eba18e689b856b80885bcc61838cadf76423b872952465c53da76ecec0b73164dad1a391192c28
 DIST spirv-headers-1.4.357.0.tar.gz 571830 BLAKE2B 5120efbef62e8e246afc0b9ed747ec3797fb4279b3a87fb3b87e1a21d568dbb93c7e00c8123fb840da3057345242de8df86baedcc9634236b4aa101a66f0e3ad SHA512 54ef13eb8375dd3f1b4f30814c83fa5c994f4a73a446ceb6741d244fcffa1571b9d61fedc9c68974f65240adae14ec9b91a04575c78ab1c97442e28439ac71b5
+DIST spirv-headers-1.4.363.0.tar.gz 594073 BLAKE2B d279562574fdf414775228c9db182cad8feb4d9fb8448f660996f6dac581851f0ddf76a1cf5c3cd62e7c76f23c85962f357d3e2d54323ea33e4524f63794d538 SHA512 a07ba9e90d38069056e2ca309d439588d25495bde83bc195b391e7879c8e82c9e272e4350291c7389a19904f07aa84581668e9d40299b673ab0d3243cdc5b037
diff --git a/dev-util/spirv-headers/spirv-headers-1.4.363.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.4.363.0.ebuild
new file mode 100644
index 000000000000..20674be0385f
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.4.363.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://registry.khronos.org/SPIR-V/ https://github.com/KhronosGroup/SPIRV-Headers"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPIRV_HEADERS_ENABLE_TESTS=OFF
+		-DSPIRV_HEADERS_ENABLE_INSTALL=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 86270dbb205d..afdb8f0d8081 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,21 +1,10 @@
 DIST SPIRV-LLVM-Translator-cea7c0e5fa6114f2e3ae83a6652bda7a6bccbc2b.tar.gz 1939159 BLAKE2B 800445bac3d1f26e26db2e7dae77f0163bac67af6094a7e6781465bea829e6f15c2423c89d8b0d26f10caeebc93c7e136ef7c2746e763be8a9f1f7b00c247cb2 SHA512 8ffc7011576c8a66c5d4df7cc69288791f9905aa379226a3bba304f9a603275fbe77f80bed1326ac63015b4fd731b8594143be37449b74c50287695b13b7d5d3
 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.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.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.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.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-22.1.2.tar.gz 1870249 BLAKE2B 56dd66732727e2d002422392b41e0d7d745f9c3866953178759f862d0155539f6be2b54519fc6be1a694036d198d50c5f778cb709bef3c83d1dbb5416c7020ac SHA512 d224b29029dae66dac430834b927a0683e3e15fb555c2ba83764403b8cdc28bfcccbe8e9ec2e3d1854c9d32b02d0b8282a3d883441c7ce33c1fc5339c0a373f0
 DIST spirv-llvm-translator-22.1.6.tar.gz 1884210 BLAKE2B b20a0bcd6df8f914936f295d36546a4ec50e4baeea0f1c7e268adfa7cf9eb59835b5d2c1b07c3e4a3d5b61f8c79c141fca560ebf025fd23c65bf0c55bad4f273 SHA512 da0326c93a3988c11a32a298e82b07b33978e2d5ae080d65a243a8125017d63824d1d42d759232f7bf138663eba25e57e45b2d4b2e9f77c01f1e21b80353f461
 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.18.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.18.ebuild
deleted file mode 100644
index a7150b71c36c..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.18.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 17 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic llvm-r2 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
-	llvm-core/llvm:${SLOT}=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/spirv-headers-1.4.328.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="$(get_llvm_prefix)"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-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-17.0.23.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.23.ebuild
deleted file mode 100644
index 040e5095131a..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.23.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 17 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic llvm-r2 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
-	llvm-core/llvm:${SLOT}=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/spirv-headers-1.4.341.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="$(get_llvm_prefix)"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-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.18.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.18.ebuild
deleted file mode 100644
index bd4944ce9f70..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.18.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.328.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-18.1.23.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.23.ebuild
deleted file mode 100644
index 16f3bdf86c8e..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.23.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 18 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.341.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-19.1.13.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.13.ebuild
deleted file mode 100644
index b205cb801ebb..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 19 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.328.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-19.1.18.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.18.ebuild
deleted file mode 100644
index 69ccca20d6be..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-19.1.18.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 19 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.341.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-20.1.13.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.13.ebuild
deleted file mode 100644
index 414ba6787e13..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.13.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 20 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.341.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-20.1.8.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.8.ebuild
deleted file mode 100644
index 21fc2ebebaed..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-20.1.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 20 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.328.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-21.1.3.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.3.ebuild
deleted file mode 100644
index abfd3576864d..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.3.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
-
-LLVM_COMPAT=( 21 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.328.0
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		llvm-core/clang:${SLOT}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-DecorateUniformId.spvasm.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-21.1.7.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.7.ebuild
deleted file mode 100644
index ee8ade40beb4..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-21.1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 21 )
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake-multilib flag-o-matic llvm-r2 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.341.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="$(get_llvm_prefix)"
-		-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/spirv-llvm-translator/spirv-llvm-translator-22.1.2.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.2.ebuild
deleted file mode 100644
index 0eef6b90330e..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.1.2.ebuild
+++ /dev/null
@@ -1,66 +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.341.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/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 8493a55e233c..8c75b2dcd47d 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1,3 @@
 DIST spirv-tools-1.4.350.0.tar.gz 3472744 BLAKE2B 5c64656f356e9b413306c10cb6547d8272cdafcc816ff6c9760ba0f9f343085c12f9e5c5bee8c0067f659bbe42b3a7ca7b48e3bfdc6fd3e40bde1499ab48c77b SHA512 765c71b082c77450b0823d9b04cdcfe8990ff83c9c12ab7d2318c1d7c3caf5d0db175ee8618472544c7ef9e18637d679ce07b6b43b2d6040cdb0435a59dd780b
 DIST spirv-tools-1.4.357.0.tar.gz 3518451 BLAKE2B 50d398f014fbe9111628d0a7a43530dabcd2645890038b714e374ebe459675702a998fbf0c64abef627697be6ee71c1cc749a8db0aa046f8e3578d8d652089dc SHA512 e853b7a08d1d1001a45e8d8f7179be7b02d803959d598bd9d097f096b33fd2a380bcecc8c9c1c446941b9df41018271b45d7995f79f8d360e15feb0c32d43f39
+DIST spirv-tools-1.4.363.0.tar.gz 3556753 BLAKE2B 1c0527c2bbf0f2ea6f92174cbbc888c01ac6acd4768f29578096dc84ab8f207e66236658d9b0cd9435772a9b9191d1c1757d30889e364652e6862ab239bd8647 SHA512 8237e02f950736ef8cff7a2cfaa4800f8beaf10e171624da02f0e73193da302afbba107e6d1840dbacebe81d1aeb0f22a69a20d504cd01371cc7302f83395ec0
diff --git a/dev-util/spirv-tools/spirv-tools-1.4.363.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.4.363.0.ebuild
new file mode 100644
index 000000000000..d8776283d0fc
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.4.363.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=SPIRV-Tools
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="~dev-util/spirv-headers-${PV}"
+# RDEPEND=""
+BDEPEND="${PYTHON_DEPS}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/
+		-DSPIRV_WERROR=OFF
+		-DSPIRV_SKIP_TESTS=$(usex !test)
+		-DSPIRV_TOOLS_BUILD_STATIC=OFF
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# Not relevant for us downstream
+		spirv-tools-copyrights
+		# Tests fail upon finding symbols that do not match a regular expression
+		# in the generated library. Easily hit with non-standard compiler flags
+		spirv-tools-symbol-exports.*
+	)
+
+	multilib-minimal_src_test
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 645c673c4b44..7c09f46a79f6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-headers-1.4.350.0.tar.gz 3271466 BLAKE2B a0a38003554b45af669a12c42e74f11615bce1e7179dabc1712bce79351979adc8c5600074ed799a817197e8b4874bb9657ffda94f2e15176b9a49bf1eaa4a6d SHA512 b7987072292d81bae34d28878b3cc12845db0a51710b4d5c21cf804d7c593b1db9ee736f10b8d7696150a25d9e8e2d3d1e17e670c6cca029858de027d5df08ea
 DIST vulkan-headers-1.4.357.0.tar.gz 3376379 BLAKE2B 32577c17eee332d4e3175f252beeb54e66f75e474da6907eb90f061de7e189552a8c08e169fdbeb65f03fe183e6ddf944c48df244a40c83ac10c837c342690b0 SHA512 253975e391fe23a3a63f9c10b7510e5e5bce6b15b36a81499eba9ceb1000cbf69b00807442b4678e69d4b6a2a8ec14c6c0d9d05ec739c277ca1cd8ee7d5d84f6
+DIST vulkan-headers-1.4.363.0.tar.gz 3416321 BLAKE2B 2635e80dd015f6f60eadc32a9a0457929642a58771ac4c3165143e369261e6d402f35d4d98c7b0454c67a6e9af940182fedb20e19ca090ad9a5b2eadeee04ecc SHA512 262e4fabdcea0e13c18aac831b2ad6d99d17c83ae0e740d658792a5f48985befe128e9cd6e69309b21580eda17aecf564359379344300bf2a352a95830f9f944
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.4.363.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.4.363.0.ebuild
new file mode 100644
index 000000000000..2fabf107bb09
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.4.363.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DVULKAN_HEADERS_ENABLE_MODULE=OFF
+		-DVULKAN_HEADERS_ENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	# VULKAN_HEADERS_ENABLE_MODULE doesn't seem to be working so just
+	# delete the modules manually
+	cmake_src_install
+	find "${ED}" -name "*.cppm" -type f -delete || die
+}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 676fea6e007d..c281b22784ca 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-tools-1.4.350.0.tar.gz 811196 BLAKE2B 39edf6f29d738119aedeea1c8c7c09e106876a1401343d517552994d65fb6815dcbc5d3567f3c4ffc21c80397065af90bbda668df5838671f8e9eb96cb95380e SHA512 2d2afbcb06bb1ee08ffb3cbe133b531fe6341e90fa0dca4d5459dbdedf201521e798226768a7e307f8b6c08b388114a34a9a581a294f6226ca7a2fcd6f63f813
 DIST vulkan-tools-1.4.357.0.tar.gz 820293 BLAKE2B 97aa989b6f831cff0e0270986654ee9241703137623c134bf9d3dee980b805241e222dbe6ee23b523e484821716b4fcd642b259af9d0cc172bc5e854bc7533eb SHA512 edfaf3cb0b7ce0547b7379764aea706443a70cbf1b1074089404ec22f4b84ed3ac55050c1cb230093345f22d6332e9a9459054c730da1e4be636cd09f820c4fa
+DIST vulkan-tools-1.4.363.0.tar.gz 821847 BLAKE2B 64d631e62416856b8c7e5e0cd20b60d38f030ad38a116cf7b5e731ac9973baeb626dff2063cd8243b2313fc5d64f0659db07a732eb9b9ec29a00ed47efd11155 SHA512 0a1b918e58da6b3453696618210ce08bedcb5c6b1340d700bd6368c0c45c3a65bb7beaa92a78cb76d640bee7ce67065cc19318b5da3fafe30b1dcb2837ea9923
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.363.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.363.0.ebuild
new file mode 100644
index 000000000000..97d3bb675d86
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.4.363.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland test X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+	test? ( ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?] )
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG -DGIT_BRANCH_NAME=\\\"gentoo\\\" -DGIT_TAG_INFO=\\\"${PV//./_}\\\""
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use cube; then
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
+	fi
+}
diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest
index 9a9954af4a4a..e12304710221 100644
--- a/dev-util/vulkan-utility-libraries/Manifest
+++ b/dev-util/vulkan-utility-libraries/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-utility-libraries-1.4.350.0.tar.gz 1319190 BLAKE2B c94d37438fe929b35e75cf20902c92e9707792760a45132dd4b928e270073a2fa06ee226856c389bf40d29ec221cae2610020767689eb1c70f3010fd004013f3 SHA512 ee3d0fbd0eb1444e6464c899417ee526198479291d2cad55c859c94507b69ef0e339bfff6a9926f74d2b5ef1c4c8d7318833b42d031205f4edf8a0f8bbdccc11
 DIST vulkan-utility-libraries-1.4.357.0.tar.gz 1342012 BLAKE2B 5721e19cb07d3b3af60fc2cd8cabf99b6c8a1e0899bd7314726f22cf3dc34d7436f54ed3545e1e5148a4a53a25d90a58bf09e08e351a054f982b6cbb493a75d9 SHA512 97c8d4bdfaa6faed17d004f2fc27ef342e887cc63da1d121a5fd7ea3e35c24c5c770fb33fa088685d047d069b9d68336d48bdc4a3f0fa88d1336e2f09476c63c
+DIST vulkan-utility-libraries-1.4.363.0.tar.gz 1346915 BLAKE2B 855cc21fa9be4bdfefaded48bc598200bf2d9a12d2af4d554d397618ede95df3314c359a4588de070d034610396c371655fb8618969f0bbf524d7197a660570b SHA512 65ec2e2e45bd892f8964cb9397e202777dc04051e33cb78278292cb32f955b77d8b9f0615170bca7a181aa808fe1d06717601d1cc955af21550d06f7b4f58be6
diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.363.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.363.0.ebuild
new file mode 100644
index 000000000000..9235b8cdb089
--- /dev/null
+++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.4.363.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Utility-Libraries
+PYTHON_COMPAT=( python3_{13..14} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib dot-a python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="vulkan-sdk-${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Share code across various Vulkan repositories"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="~dev-util/vulkan-headers-${PV}
+	test? (
+		dev-cpp/gtest
+		>=dev-cpp/magic_enum-0.9.7
+	)"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.313.0-magic_enum-0.9.7.patch
+)
+
+src_configure() {
+	lto-guarantee-fat
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	strip-lto-bytecode
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.26.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.26.0.ebuild
index 1921f278534e..6de88652c29f 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.26.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.26.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index ed8817e24411..1b83e09b2b5e 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -72,12 +72,12 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 			_LLVM_SOURCE_TYPE=snapshot
 
 			case ${PV} in
+				24.0.0_pre20261010)
+					EGIT_COMMIT=53310c92e86e1c285b1fe3aaf76158addd0a2036
+					;;
 				24.0.0_pre20260929)
 					EGIT_COMMIT=9fe649af67007493c02108b484c8b9259e3d522e
 					;;
-				24.0.0_pre20260919)
-					EGIT_COMMIT=3dcd66d0110335d7d1a5921fd085914b66ffbd3c
-					;;
 				*)
 					die "Unknown snapshot: ${PV}"
 					;;
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 089bb69dfc19..af7564a193e9 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1,2 @@
-DIST scummvm-2026.2.0.tar.xz 227253688 BLAKE2B f6627dd4c517338cae58ddf3cec923b702e76e665b3047cbc0be53a09eb005ae33ca611ccf3397cf911388be45aaeb0dc469f7c8136c953bb8ffacfc0611404b SHA512 093369a5e3d849e9d4fb12a247fa8af68314d7bba59bdc2e5270d0e01fdd711761fa9707e8b61acac1967e223f2db12aa208a397000ee6630f5b2adf365d490d
 DIST scummvm-2026.3.0.tar.xz 225168520 BLAKE2B 93e1fb51a2b12997eed54ea71b558b75e670c24e08d3e889a7c2d80d86cd2174eea5a60db8035187857f22e684fff4628aea8f07650c3b0a2a4e9798ac566190 SHA512 32542906f33a3937833ff3fe29d90fbaa042c803ddaa305779999a49888427d9028edd10694cad71dadb6add917ffa9e7d342c061e60dcfe21eb459419b49c63
+DIST scummvm-2026.4.0.tar.xz 223042856 BLAKE2B 9befd82660d90f64122fd0e2d588cc62d2db9d6ce5c25b6e2bdeb31e62b202dc1e90f46847675de0a6ad32d0f60dc891b6fbd9907b2e680c311595da7af3567e SHA512 03a09cb67615c85ab3d52b446c251b25c8417814808c44223c5029c39dce7f6a81abfaf0c6f82050d15eda71f3ef3cff9a9576767aa6ce4c65274d147299098f
diff --git a/games-engines/scummvm/scummvm-2026.3.0.ebuild b/games-engines/scummvm/scummvm-2026.3.0.ebuild
index b6115354a11a..f0187dd6ab64 100644
--- a/games-engines/scummvm/scummvm-2026.3.0.ebuild
+++ b/games-engines/scummvm/scummvm-2026.3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
 else
 	SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S=${WORKDIR}/${P/_/}
 fi
 
diff --git a/games-engines/scummvm/scummvm-2026.2.0.ebuild b/games-engines/scummvm/scummvm-2026.4.0.ebuild
index b6115354a11a..b6115354a11a 100644
--- a/games-engines/scummvm/scummvm-2026.2.0.ebuild
+++ b/games-engines/scummvm/scummvm-2026.4.0.ebuild
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 8bd2f4592fa6..c868886038e1 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -112,12 +112,10 @@ DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.58.5.tar.xz 6194788 BLAKE2B 59ba9c58a595458bb985dc632aa4ab8ae7e204cd5d546a70884a5c4ecf7e28a7216eff9c03e5f9bb7848a775a8ffafe61f3ab5ba9ae5365cfc2f6333fc41e750 SHA512 3ae72f90ea2d696902120d7100fd5681906b1e732f0d59caaef84a6858060614438be461ecb80cce6f6144bccb2058fd184af360387fd35a070e8b12ea2e94a9
-DIST librsvg-2.60.0.tar.xz 6742880 BLAKE2B 8831ff0aa9f2dc564ab6fd9d48d44e770831fd76107bf4ba883b1e549fdc4bcd63425336b817d6da373123e1d861faa32e205c0377b260c662c1d919a1ff42ec SHA512 e42251e00ee4231641028ad3764757d77686f417c6ac6dab879c887f93ba437c54a5e4bd49c1965b30ef1f1d4100561f0ff7fe6bdab182fae9a1fc9042af2ea8
-DIST librsvg-2.62.2-crates.tar.xz 18985444 BLAKE2B 91097253eaa0561598277541ef02e0fedb0500c520b0987aebedc27239204469e40318946924e225a7e172f3c8c99f73346df8863749ded8b6239f4209a3e645 SHA512 cf8a303b59447c1daddb86aa64e548d983ff8de4f28bf1ef5a5e33e6de8c01721f200b3c3c0aa2aa1f75d5e4d21150c1dbd026e911c37f797a7b42311021ae32
-DIST librsvg-2.62.2.tar.xz 6761980 BLAKE2B 466490038e4076c590477d5a48a4419251711d52552b55a33a4a4f05856a0fdbc9f91b14979b4d4cb1951fb20fee4c0d4a2e43fdb6d4f1a6c510e6623a5f268c SHA512 e24bfe516918b329c1dd88b2349a34ef7264aee52a2f1cd28fc22f83b36bd5709bb1841aa308d315d217d77fdd32c18189b901b77f24315ea7f9dfcd40cef0eb
 DIST librsvg-2.62.3-crates.tar.xz 18985328 BLAKE2B ee3dd63b624d8925216219b1c388b0516263a697fa108dd64e6c114452eea806b92785ad380f45898eb24e128d08702b1af40172f19d1bc0eaee3ab615e487b8 SHA512 65ce46ec2705e557818da2f57a72b585e7ce7257032d9df10f2280f2a2a7b404c6504ac164d11bf04641cbdba5d486e31ae47873a278200d14fb96e26abdeba0
 DIST librsvg-2.62.3.tar.xz 6760876 BLAKE2B 712ead74447cf3f66b5817df23860061a92371cf2c7a7d211649f3a2a23e427a9a384a0f3e3204a102f4b1571659c35f2267cde13b5e407b6c736246981d755a SHA512 c2c0f28268e47ec78f98d86cd2536be3e0c3706039b04ac2286d87a6ac7ee0dfb75a4adc4f8bd9c3b6b1f5c94fecafc6d84dfe67f7e4ebfad59f7227e509300d
-DIST librsvg-c-2.60.0-crates.tar.xz 18160688 BLAKE2B 8624aca85919be67b9047bff63733e0aeb52f17231ac8be4fb7e6512a5a093751eae057124d559afef38b3b5701b89595b215186fd5e2d0907e26b5a5ca43043 SHA512 00d49f44ed320109dfd704bea8021622d29ac246b9eecfdc91ee6b7410158de34fb54a83e839dc868e08ff1e93d65b4efb39edd91405a3c0f35cb2d05f88935b
+DIST librsvg-2.62.4-crates.tar.xz 17539364 BLAKE2B de197d4a48ef185165c48f03b191db8445bd04e07986e422464bd589cb4637170378d5f179c8269534128bf12352be79d50e36f42539412f9b0f11d2e33a178b SHA512 00f95128da12098d2f2d017f7270a69da961b83a0e4471cb74b98ae78bd239aa730f93df63193e5bb2a4845348d5be482472305e0f6824ee2f496d452ff51c00
+DIST librsvg-2.62.4.tar.xz 6761864 BLAKE2B e53f99e5329f4d1c8b64b1dcd81f9f1f43ac7669a25e92787b31b5e112c324c961ae1d92c5b014c83281cfac6a224d58a7b6c8181aad7bb6d2a9568cf3d0a8be SHA512 8955efc20376a42394ea02db31c7bc1ed8174e3ab428910e85e82d6c9b19de3a11d12dd640f4ea6be3ea8f0ba41c585f3c331d375771dff7423a69db1f4769a9
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
 DIST locale_config-0.3.0.crate 20808 BLAKE2B 68b0519639c816af82b941a417d4a74896033e9c5110081d495e1cc3a3e7613ddaf2a665770c6199749b89be131a35592dc4cd7cc2789928199b22205300aa9d SHA512 c7d77156e957559172f589f90405b2e9f5306041887990a60a31630af2de81c00fbba2bcdf52bd163fe431f85694dc6d2d380671f38f2724d7e4d178d89998da
diff --git a/gnome-base/librsvg/librsvg-2.60.0.ebuild b/gnome-base/librsvg/librsvg-2.60.0.ebuild
deleted file mode 100644
index 464690aae82d..000000000000
--- a/gnome-base/librsvg/librsvg-2.60.0.ebuild
+++ /dev/null
@@ -1,147 +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} )
-
-CRATES="
-"
-
-RUST_MIN_VER="1.77.2"
-RUST_MULTILIB=1
-
-inherit cargo gnome2 meson-multilib python-any-r1 rust-toolchain toolchain-funcs vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-c-${PV}-crates.tar.xz"
-
-LICENSE="LGPL-2.1+"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
-	Unicode-3.0
-"
-
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-IUSE="+gtk-doc +introspection test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=x11-libs/cairo-1.17.0[glib,svg(+),${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/cargo-c
-	x11-libs/gdk-pixbuf
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	gtk-doc? ( dev-util/gi-docgen )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-	usr/lib.*/gdk-pixbuf*/*/loaders/*
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.60.0-libxml2-2.15.0-tests.patch
-)
-
-pkg_setup() {
-	rust_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_setup
-	gnome2_src_prepare
-}
-
-src_configure() {
-	meson-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Davif=disabled
-		$(meson_native_use_feature introspection)
-		-Dpixbuf=enabled
-		-Dpixbuf-loader=enabled
-		$(meson_native_use_feature gtk-doc docs)
-		$(meson_native_use_feature vala)
-		$(meson_use test tests)
-	)
-
-	if ! multilib_is_native_abi || tc-is-cross-compiler; then
-		emesonargs+=(
-			# Set the rust target, which can differ from CHOST
-			-Dtriplet="$(rust_abi)"
-		)
-	fi
-
-	cargo_env meson_src_configure
-}
-
-src_compile() {
-	meson-multilib_src_compile
-}
-
-multilib_src_compile() {
-	cargo_env meson_src_compile
-}
-
-multilib_src_test() {
-	cargo_env meson_src_test
-}
-
-src_test() {
-	meson-multilib_src_test
-}
-
-src_install() {
-	meson-multilib_src_install
-}
-
-multilib_src_install() {
-	cargo_env meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_preinst() {
-	multilib_foreach_abi gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.62.2-r1.ebuild b/gnome-base/librsvg/librsvg-2.62.4.ebuild
index d934f4625d91..09caaf69ed5a 100644
--- a/gnome-base/librsvg/librsvg-2.62.2-r1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.62.4.ebuild
@@ -11,7 +11,7 @@ CRATES="
 RUST_MIN_VER="1.92.0"
 RUST_MULTILIB=1
 
-inherit cargo gnome2 meson-multilib python-any-r1 rust-toolchain vala
+inherit cargo gnome2 meson-multilib python-any-r1 rust-toolchain toolchain-funcs vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
@@ -25,9 +25,9 @@ LICENSE+="
 "
 
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-IUSE="+gtk-doc +introspection test +vala"
+IUSE="avif gtk-doc +introspection test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
@@ -35,7 +35,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=x11-libs/cairo-1.17.0[glib,svg(+),${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.18.0[glib,svg(+),${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
@@ -43,6 +43,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.9.1-r4:2=[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
 
+	avif? ( >=media-libs/dav1d-1.3.0:=[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
 "
 DEPEND="${RDEPEND}"
@@ -62,10 +63,6 @@ QA_FLAGS_IGNORED="
 	usr/lib.*/gdk-pixbuf*/*/loaders/*
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.60.0-libxml2-2.15.0-tests.patch
-)
-
 pkg_setup() {
 	rust_pkg_setup
 	python-any-r1_pkg_setup
@@ -82,7 +79,7 @@ src_configure() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Davif=disabled
+		$(meson_native_use_feature avif)
 		$(meson_native_use_feature introspection)
 		-Dpixbuf=enabled
 		-Dpixbuf-loader=enabled
diff --git a/gnome-base/nautilus/nautilus-50.3.1.ebuild b/gnome-base/nautilus/nautilus-50.3.1.ebuild
index be404ec98320..3c92660c3556 100644
--- a/gnome-base/nautilus/nautilus-50.3.1.ebuild
+++ b/gnome-base/nautilus/nautilus-50.3.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://apps.gnome.org/Nautilus/"
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 
 IUSE="+cloudproviders gtk-doc gnome +gstreamer +introspection +previewer selinux"
 REQUIRED_USE="gtk-doc? ( introspection )"
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-6.6.4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.6.4.ebuild
index a6390ee7f257..9e7c20c80d35 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-6.6.4.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="systemd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.6.4.ebuild
index 669f305b46f1..4948f6e5538b 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon/cinnamon-6.6.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.6.9.ebuild
index a0d18da4225c..faed92bd2355 100644
--- a/gnome-extra/cinnamon/cinnamon-6.6.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.6.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager wayland"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/cjs/cjs-140.1.ebuild b/gnome-extra/cjs/cjs-140.1.ebuild
index 8157073101f5..484dcf65b185 100644
--- a/gnome-extra/cjs/cjs-140.1.ebuild
+++ b/gnome-extra/cjs/cjs-140.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD CC0-1.0 MIT MPL-2.0 || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="examples readline sysprof test"
 
 RDEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.36.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.36.0.ebuild
index 072e9ad25f3f..d3ce2555a1a0 100644
--- a/gnome-extra/nm-applet/nm-applet-1.36.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.36.0.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 GNOME_ORG_MODULE="network-manager-applet"
 
-inherit gnome.org gnome2-utils meson xdg
+inherit flag-o-matic gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="NetworkManager connection editor and applet"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
+HOMEPAGE="https://gitlab.gnome.org/GNOME/network-manager-applet"
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="appindicator +modemmanager selinux teamd"
 KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
+IUSE="appindicator +modemmanager selinux teamd"
+
 # >=networkmanager-1.46 for ensuring stable-ssid checkbox feature will work
 RDEPEND="
 	>=dev-libs/glib-2.40:2
@@ -39,6 +40,10 @@ BDEPEND="
 "
 
 src_configure() {
+	# Workaround for LLD (bug #947147)
+	# https://gitlab.gnome.org/GNOME/network-manager-applet/-/work_items/197
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local emesonargs=(
 		-Dappindicator=$(usex appindicator ayatana no)
 		$(meson_use modemmanager wwan)
diff --git a/llvm-core/clang-common/Manifest b/llvm-core/clang-common/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-core/clang-common/Manifest
+++ b/llvm-core/clang-common/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/clang-common/clang-common-24.0.0_pre20261010.ebuild b/llvm-core/clang-common/clang-common-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..d37eeaebbf4a
--- /dev/null
+++ b/llvm-core/clang-common/clang-common-24.0.0_pre20261010.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common llvm.org multilib shell-completion
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="
+	default-compiler-rt default-libcxx default-lld
+	bootstrap-prefix cet emacs hardened llvm-libunwind
+"
+
+PDEPEND="
+	default-compiler-rt? (
+		llvm-runtimes/clang-runtime:${LLVM_MAJOR}[compiler-rt]
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( >=llvm-core/lld-${PV} )
+	!default-lld? ( sys-devel/binutils )
+"
+# enforce flags on clang-runtime as well to aid transition
+PDEPEND+="
+	llvm-runtimes/clang-runtime[default-compiler-rt(-)?,default-libcxx(-)?,default-lld(-)?,llvm-libunwind(-)?]
+	emacs? ( >=app-editors/emacs-26.3:* )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-26.3:* )
+"
+
+LLVM_COMPONENTS=( clang/utils clang/tools/clang-format )
+llvm.org_set_globals
+
+SITEFILE="50clang-gentoo.el"
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on llvm-core/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on llvm-core/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  llvm-core/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between llvm-core/clang and llvm-core/clang-common"
+	fi
+}
+
+_doclang_cfg() {
+	local triple="${1}"
+
+	local tool
+	for tool in ${triple}-clang{,++}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+			@gentoo-common-ld.cfg
+		EOF
+		if [[ ${triple} == x86_64* ]]; then
+			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
+				@gentoo-cet.cfg
+			EOF
+		fi
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
+			-lc++abi
+		EOF
+	fi
+
+	newins - "${triple}-clang-cpp.cfg" <<-EOF
+		# This configuration file is used by the ${triple}-clang-cpp driver.
+		@gentoo-common.cfg
+	EOF
+	if [[ ${triple} == x86_64* ]]; then
+		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
+			@gentoo-cet.cfg
+		EOF
+	fi
+
+	# Install symlinks for triples with other vendor strings since some
+	# programs insist on mangling the triple.
+	local vendor
+	for vendor in gentoo pc unknown; do
+		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
+		for tool in clang{,++,-cpp}; do
+			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
+				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
+			fi
+		done
+	done
+}
+
+doclang_cfg() {
+	local triple="${1}"
+
+	_doclang_cfg ${triple}
+
+	# LLVM may have different arch names in some cases. For example in x86
+	# profiles the triple uses i686, but llvm will prefer i386 if invoked
+	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+	#
+	# To make sure the correct triples are installed,
+	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+	# and compare with CHOST values in profiles.
+
+	local abi=${triple%%-*}
+	case ${abi} in
+		armv4l|armv4t|armv5tel|armv6j|armv7a)
+			_doclang_cfg ${triple/${abi}/arm}
+			;;
+		i686)
+			_doclang_cfg ${triple/${abi}/i386}
+			;;
+		sparc)
+			_doclang_cfg ${triple/${abi}/sparcel}
+			;;
+		sparc64)
+			_doclang_cfg ${triple/${abi}/sparcv9}
+			;;
+	esac
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile ../tools/clang-format/clang-format.el
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by llvm-runtimes/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+		# bug #870001
+		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
+	EOF
+
+	# clang-cpp does not like link args being passed to it when directly
+	# invoked, so use a separate configuration file.
+	newins - gentoo-common-ld.cfg <<-EOF
+		# This file contains flags common to clang and clang++
+		@gentoo-hardened-ld.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-Xarch_host -fstack-clash-protection
+		-Xarch_host -fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	newins - gentoo-cet.cfg <<-EOF
+		-Xarch_host -fcf-protection=$(usex cet full none)
+	EOF
+
+	if use kernel_Darwin; then
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# There was -Wl,-z,relro here, but it's not supported on Mac
+			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
+		EOF
+	else
+		newins - gentoo-hardened-ld.cfg <<-EOF
+			# Some of these options are added unconditionally, regardless of
+			# USE=hardened, for parity with sys-devel/gcc.
+			-Wl,-z,relro
+			-Wl,-z,now
+		EOF
+	fi
+
+	dodir /usr/include/gentoo
+
+	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
+	/* __has_include is an extension, but it's fine, because this is only
+	for Clang anyway. */
+	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
+	# include <stdc-predef.h>
+	#endif
+	EOF
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
+	#ifndef _FORTIFY_SOURCE
+	# if defined(__has_feature)
+	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+	# else
+	#  define __GENTOO_HAS_FEATURE(x) 0
+	# endif
+	#
+	# if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
+	# elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
+	# elif defined(__SANITIZE_ADDRESS__)
+	# elif __GENTOO_HAS_FEATURE(address_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(memory_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
+	# elif __GENTOO_HAS_FEATURE(thread_sanitizer)
+	# elif defined(_GENTOO_NO_FORTIFY_SOURCE)
+	# else
+	#  define _FORTIFY_SOURCE ${fortify_level}
+	# endif
+	#
+	# undef __GENTOO_HAS_FEATURE
+	#endif
+	EOF
+
+	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
+	# non-hardened?
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-Xarch_host -D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
+			-Xarch_host -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+		EOF
+	fi
+
+	# We only install config files for supported ABIs because unprefixed tools
+	# might be used for crosscompilation where e.g. PIE may not be supported.
+	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
+	local abi
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		doclang_cfg "${abi_chost}"
+	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			# Gentoo Prefix on Darwin
+			-Wl,-search_paths_first
+		EOF
+		if use bootstrap-prefix ; then
+			# bootstrap-prefix is only set during stage2 of bootstrapping
+			# Prefix, where EPREFIX is set to EPREFIX/tmp.
+			# Here we need to point it at the future lib dir of the stage3's
+			# EPREFIX.
+			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+				-Wl,-rpath,${EPREFIX}/../usr/lib
+				-Wl,-L,${EPREFIX}/../usr/lib
+				-isystem ${EPREFIX}/../usr/include
+				-stdlib++-isystem ${EPREFIX}/../usr/include/c++/v1
+			EOF
+		fi
+		# Using -Wl,-L instead of -L to trick compiler driver to put it
+		# after -isysroot's internal -L
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			-Wl,-rpath,${EPREFIX}/usr/lib
+			-Wl,-L,${EPREFIX}/usr/lib
+			-isystem ${EPREFIX}/usr/include
+			-stdlib++-isystem ${EPREFIX}/usr/include/c++/v1
+			-isysroot ${EPREFIX}/MacOSX.sdk
+		EOF
+	fi
+
+	if use emacs ; then
+		elisp-install clang ../tools/clang-format/clang-format.{el,elc}
+		elisp-make-site-file "${SITEFILE}" clang
+	fi
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/llvm-core/clang/Manifest b/llvm-core/clang/Manifest
index edb883275bc5..ac595121797b 100644
--- a/llvm-core/clang/Manifest
+++ b/llvm-core/clang/Manifest
@@ -22,4 +22,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/clang/clang-24.0.0_pre20261010.ebuild b/llvm-core/clang/clang-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..6b6ecbdf3a84
--- /dev/null
+++ b/llvm-core/clang/clang-24.0.0_pre20261010.ebuild
@@ -0,0 +1,468 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit cmake llvm.org multilib multilib-minimal
+inherit prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=llvm-core/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( ~llvm-core/lld-${PV} )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	llvm-runtimes/clang-runtime:${LLVM_MAJOR}
+	llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( clang clang-tools-extra cmake mlir/utils/pygments utils/docs )
+LLVM_TEST_COMPONENTS=( llvm/utils )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=llvm+eq
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_cond_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+
+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+					# built only with tests
+					c-index-test)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eerror "get_distribution_components() is outdated!"
+			eerror "   Add: ${add[*]}"
+			eerror "Remove: ${remove[*]}"
+			die "Update get_distribution_components()!"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		aarch64-resource-headers
+		arm-common-resource-headers
+		arm-resource-headers
+		core-resource-headers
+		cuda-resource-headers
+		hexagon-resource-headers
+		hip-resource-headers
+		hlsl-resource-headers
+		mips-resource-headers
+		opencl-resource-headers
+		openmp-resource-headers
+		ppc-htm-resource-headers
+		ppc-resource-headers
+		riscv-resource-headers
+		spirv-resource-headers
+		systemz-resource-headers
+		utility-resource-headers
+		ve-resource-headers
+		webassembly-resource-headers
+		windows-resource-headers
+		x86-resource-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			clang
+			clang-format
+			clang-installapi
+			clang-linker-wrapper
+			clang-nvlink-wrapper
+			clang-offload-bundler
+			clang-refactor
+			clang-repl
+			clang-scan-deps
+			clang-ssaf-analyzer
+			clang-ssaf-format
+			clang-ssaf-linker
+			clang-ssaf-src-edit-merge
+			clang-sycl-linker
+			diagtool
+			hmaptool
+			offload-arch
+
+			# needed for cross-compiling Clang
+			clang-tblgen
+		)
+
+		if use extra; then
+			out+=(
+				# extra tools
+				clang-apply-replacements
+				clang-change-namespace
+				clang-doc
+				clang-include-cleaner
+				clang-include-fixer
+				clang-move
+				clang-query
+				clang-reorder-fields
+				clang-tidy
+				clang-tidy-headers
+				clangd
+				find-all-symbols
+				modularize
+				pp-trace
+			)
+
+			use kernel_Darwin && out+=( ClangdXPCLib )
+		fi
+
+		if llvm_are_manpages_built; then
+			out+=( docs-clang-man )
+			use extra && out+=( docs-clang-tools-man )
+		fi
+
+		if use doc; then
+			out+=( docs-clang-html )
+			use extra && out+=( docs-clang-tools-html )
+		fi
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang/${LLVM_MAJOR}"
+		-DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		-DCLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+		-DCLANG_ENABLE_LIBXML2=$(usex xml)
+		-DCLANG_ENABLE_OBJC_REWRITER=ON
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# TODO: CLANG_ENABLE_HLSL?
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if ! use elibc_musl; then
+		mycmakeargs+=(
+			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+			if use extra; then
+				mycmakeargs+=(
+					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				)
+			fi
+		fi
+		mycmakeargs+=(
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+		)
+	fi
+	if multilib_native_use extra; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		has_version -b llvm-core/clang:${LLVM_MAJOR} ||
+			die "llvm-core/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check-clang )
+	if multilib_native_use extra; then
+		test_targets+=(
+			check-clang-tools
+			check-clangd
+		)
+	fi
+	cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	if use extra; then
+		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	fi
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
+	if multilib_native_use extra; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+	if use extra; then
+		elog "Some of them are vim integration scripts (with instructions inside)."
+		elog "The run-clang-tidy.py script requires the following additional package:"
+		elog "  dev-python/pyyaml"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/llvm-core/flang/Manifest b/llvm-core/flang/Manifest
index fb359f903c22..38a15c40bb4a 100644
--- a/llvm-core/flang/Manifest
+++ b/llvm-core/flang/Manifest
@@ -6,4 +6,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/flang/flang-24.0.0_pre20261010.ebuild b/llvm-core/flang/flang-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..c71c6def54db
--- /dev/null
+++ b/llvm-core/flang/flang-24.0.0_pre20261010.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="LLVM's Fortran frontend"
+HOMEPAGE="https://flang.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+clang +debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/clang-${PV}[debug=]
+	~llvm-core/llvm-${PV}[debug=]
+	~llvm-core/mlir-${PV}[debug=]
+"
+RDEPEND="
+	${DEPEND}
+"
+PDEPEND="
+	>=llvm-runtimes/flang-rt-${PV}:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? ( llvm-core/clang )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( flang cmake )
+LLVM_TEST_COMPONENTS=(
+	clang/test/Driver mlir/test/lib
+	# for building flang-rt
+	runtimes flang-rt libc/shared llvm/{cmake,utils}
+	# openmp
+	openmp third-party/unittest
+)
+LLVM_USE_TARGETS=llvm+eq
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && tc-is-gcc; then
+		ewarn "Building using GCC requires lots of memory (up to 10 GiB per process)."
+		ewarn "Consider enabling USE=clang."
+		ewarn "See https://gcc.gnu.org/PR119705"
+	fi
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/build
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	if use clang; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DMLIR_LINK_MLIR_DYLIB=ON
+		# flang does not feature a dylib, so do not install libraries
+		# or headers
+		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON
+		# installed by llvm-runtimes/flang-rt
+		-DFLANG_INCLUDE_RUNTIME=OFF
+
+		# TODO: always enable to obtain reproducible tools
+		-DFLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+}
+
+build_runtimes() {
+	local -x FC=${BUILD_DIR}/bin/flang
+	local -x F77=${FC}
+	local CMAKE_USE_DIR=${WORKDIR}/runtimes
+	local BUILD_DIR=${WORKDIR}/runtimes_build
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		# cmake.eclass does not set if it we don't inherit fortran-2
+		# and upstream code relies on it being set before Fortran logic
+		# kicks in and reds envvars
+		-DCMAKE_Fortran_COMPILER="${FC}"
+		# we may not have a runtime yet
+		-DCMAKE_Fortran_COMPILER_WORKS=TRUE
+		# tests rddequire modules now
+		-DRUNTIMES_FORTRAN_MODULES=ON
+
+		-DLLVM_ENABLE_RUNTIMES="flang-rt;openmp"
+		# this package forces NO_DEFAULT_PATHS
+		-DLLVM_BINARY_DIR="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_DEFAULT_TARGET_TRIPLE="${CHOST}"
+
+		# install inside the test tree
+		-DRUNTIMES_INSTALL_RESOURCE_PATH="${WORKDIR}/lib/clang/${LLVM_MAJOR}"
+		# work hard not to install anything else
+		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON
+		-DOPENMP_INSTALL_LIBDIR="${T}/discard"
+
+		-DFLANG_RT_INCLUDE_TESTS=OFF
+		-DLIBOMP_FORTRAN_MODULES_ONLY=ON
+		-DLIBOMP_USE_HWLOC=OFF
+		-DLIBOMP_OMPD_GDB_SUPPORT=OFF
+		-DLIBOMP_OMPT_SUPPORT=OFF
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+	cmake_build install
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	build_runtimes
+
+	cmake_build check-flang
+}
diff --git a/llvm-core/lld/Manifest b/llvm-core/lld/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-core/lld/Manifest
+++ b/llvm-core/lld/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/lld/lld-24.0.0_pre20261010.ebuild b/llvm-core/lld/lld-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..c91ec8e98967
--- /dev/null
+++ b/llvm-core/lld/lld-24.0.0_pre20261010.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,zstd=]
+	virtual/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!llvm-core/lld:0
+"
+BDEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+PDEPEND="
+	>=llvm-core/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/dtlto )
+LLVM_USE_TARGETS=llvm+eq
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# https://gcc.gnu.org/PR121495 (bug #958469)
+	use arm64 && tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && append-flags -mearly-ra=none
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/llvm-core/lldb/Manifest b/llvm-core/lldb/Manifest
index ac121f812789..ab69a425dfcf 100644
--- a/llvm-core/lldb/Manifest
+++ b/llvm-core/lldb/Manifest
@@ -15,4 +15,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/lldb/lldb-24.0.0_pre20261010.ebuild b/llvm-core/lldb/lldb-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..482a225e5f5d
--- /dev/null
+++ b/llvm-core/lldb/lldb-24.0.0_pre20261010.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+IUSE="+debug debuginfod +libedit lzma ncurses +python test +tree-sitter +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	tree-sitter? ( dev-libs/tree-sitter:= )
+	xml? ( dev-libs/libxml2:= )
+	~llvm-core/clang-${PV}
+	~llvm-core/llvm-${PV}[debuginfod=]
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		>=dev-lang/swig-3.0.11
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		llvm-core/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+LLVM_USE_TARGETS=llvm+eq
+llvm.org_set_globals
+
+src_configure() {
+	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_TREESITTER=$(usex tree-sitter)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/llvm-core/llvm-common/Manifest b/llvm-core/llvm-common/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-core/llvm-common/Manifest
+++ b/llvm-core/llvm-common/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/llvm-common/llvm-common-24.0.0_pre20261010.ebuild b/llvm-core/llvm-common/llvm-common-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..4548489cd9bc
--- /dev/null
+++ b/llvm-core/llvm-common/llvm-common-24.0.0_pre20261010.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="emacs"
+
+RDEPEND="
+	!llvm-core/llvm:0
+"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+LLVM_COMPONENTS=( llvm/utils )
+llvm.org_set_globals
+
+SITEFILE="50llvm-gentoo.el"
+BYTECOMPFLAGS="-L emacs"
+
+src_compile() {
+	default
+
+	use emacs && elisp-compile emacs/*.el
+}
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r vim/*/
+	# some users may find it useful
+	newdoc vim/README README.vim
+	dodoc vim/vimrc
+
+	if use emacs ; then
+		elisp-install llvm emacs/*.{el,elc}
+		elisp-make-site-file "${SITEFILE}" llvm
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/llvm-core/llvm/Manifest b/llvm-core/llvm/Manifest
index edb883275bc5..ac595121797b 100644
--- a/llvm-core/llvm/Manifest
+++ b/llvm-core/llvm/Manifest
@@ -22,4 +22,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/llvm/llvm-24.0.0.9999.ebuild b/llvm-core/llvm/llvm-24.0.0.9999.ebuild
index 9ec376eb2839..6ff58d50c5a8 100644
--- a/llvm-core/llvm/llvm-24.0.0.9999.ebuild
+++ b/llvm-core/llvm/llvm-24.0.0.9999.ebuild
@@ -258,6 +258,7 @@ get_distribution_components() {
 			count
 			not
 			yaml-bench
+			UnicodeCharSetsGenerator
 			UnicodeNameMappingGenerator
 
 			# tools
diff --git a/llvm-core/llvm/llvm-24.0.0_pre20261010.ebuild b/llvm-core/llvm/llvm-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..6ff58d50c5a8
--- /dev/null
+++ b/llvm-core/llvm/llvm-24.0.0_pre20261010.ebuild
@@ -0,0 +1,576 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="
+	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
+	test xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/zlib:=[${MULTILIB_USEDEP}]
+	debuginfod? (
+		net-misc/curl:=
+		dev-cpp/cpp-httplib:=
+	)
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
+	)
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!llvm-core/llvm:0
+"
+PDEPEND="
+	llvm-core/llvm-common
+	llvm-core/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=llvm-core/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake libc mlir/utils/pygments third-party utils/docs )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
+BDEPEND+="
+	$(python_gen_any_dep '
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
+
+python_check_deps() {
+	llvm_are_manpages_built || return 0
+
+	python_has_version -b "dev-python/myst-parser[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	local outdated
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eerror "ALL_LLVM_EXPERIMENTAL_TARGETS are outdated!"
+		eerror "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eerror "Expected: ${exp_targets[*]}"
+		eerror
+		outdated=1
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eerror "ALL_LLVM_PRODUCTION_TARGETS are outdated!"
+		eerror "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eerror "Expected: ${prod_targets[*]}"
+		outdated=1
+	fi
+
+	[[ ${outdated} ]] && die "Update ALL_LLVM*_TARGETS"
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMSupportLSP|LLVMTableGen)
+						;;
+					# for mlir-tblgen
+					LLVMCodeGenTypes)
+						;;
+					# used by lldb
+					LLVMDebuginfod|LLVMHTTP)
+						;;
+					# testing libraries
+					LLVMTestingAnnotations|LLVMTestingSupport)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+					# used only w/ USE=debuginfd
+					llvm-debuginfod)
+						use debuginfod || continue
+						;;
+					# used only w/ USE=xml
+					llvm-mt)
+						use xml || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eerror "get_distribution_components() is outdated!"
+			eerror "   Add: ${add[*]}"
+			eerror "Remove: ${remove[*]}"
+			die "Update get_distribution_components()!"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Disable lit tests (we run them in dev-python/lit).
+	> utils/lit/CMakeLists.txt || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+		# mlir-tblgen
+		LLVMCodeGenTypes
+		LLVMSupportLSP
+
+		# testing libraries
+		llvm_gtest
+		llvm_gtest_main
+		LLVMTestingAnnotations
+		LLVMTestingSupport
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# library used by lldb
+			LLVMDebuginfod
+			LLVMHTTP
+
+			# utilities
+			llvm-tblgen
+			llvm-test-mustache-spec
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeCharSetsGenerator
+			UnicodeNameMappingGenerator
+
+			# tools
+			clang-offload-packager
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llubi
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-calc-occupancy
+			llvm-cas
+			llvm-cat
+			llvm-cfi-verify
+			llvm-cgdata
+			llvm-config
+			llvm-cov
+			llvm-ctxprof-util
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-extract-bundle-entry
+			llvm-gpu-loader
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-ir2vec
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-ml64
+			llvm-modextract
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-offload-binary
+			llvm-offload-wrapper
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-readtapi
+			llvm-reduce
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			reduce-chunk-list
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+		use debuginfod && out+=(
+			llvm-debuginfod
+		)
+		use xml && out+=(
+			llvm-mt
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
+	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
+	# LLVM with LTO anyway (which is not necessarily its fault).
+	tc-is-gcc && filter-lto
+
+	# https://github.com/llvm/llvm-project/issues/219693
+	append-flags -fno-strict-aliasing
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=ON
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_INSTALL_GTEST=ON
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZLIB=FORCE_ON
+		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
+		-DLLVM_ENABLE_CURL=$(usex debuginfod)
+		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
+		-DLLVM_UNREACHABLE_OPTIMIZE=OFF
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	use kernel_Darwin && mycmakeargs+=(
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+	)
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MAIN_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/llvm-core/mlir/Manifest b/llvm-core/mlir/Manifest
index fb359f903c22..38a15c40bb4a 100644
--- a/llvm-core/mlir/Manifest
+++ b/llvm-core/mlir/Manifest
@@ -6,4 +6,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/mlir/mlir-24.0.0_pre20261010.ebuild b/llvm-core/mlir/mlir-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..1a5782b91869
--- /dev/null
+++ b/llvm-core/mlir/mlir-24.0.0_pre20261010.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org multilib-minimal python-any-r1
+
+DESCRIPTION="Multi-Level Intermediate Representation (library only)"
+HOMEPAGE="https://mlir.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}[debug=,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	llvm-core/llvm:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( mlir cmake )
+# tablegen tests use *.td files there
+LLVM_TEST_COMPONENTS=( llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	llvm.org_src_prepare
+
+	# https://github.com/llvm/llvm-project/issues/120902
+	sed -i -e '/LINK_LIBS/s:PUBLIC:PRIVATE:' \
+		lib/ExecutionEngine/CMakeLists.txt || die
+
+	# this test is completely unpredictable, no clue why
+	rm test/mlir-pdll-lsp-server/view-output.test || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					mlir-libraries|distribution)
+						continue
+						;;
+					# dylib
+					MLIR)
+						;;
+					# installed test libraries
+					MLIRTestAliasAnalysis|MLIRTestAnalysis|MLIRTestDialect|MLIRTestIR)
+						;;
+					MLIROpenACCTestPasses)
+						;;
+					# static libraries
+					MLIR*)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eerror "get_distribution_components() is outdated!"
+			eerror "   Add: ${add[*]}"
+			eerror "Remove: ${remove[*]}"
+			die "Update get_distribution_components()!"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		mlir-cmake-exports
+		mlir-headers
+
+		# the dylib
+		MLIR
+
+		# shared libraries
+		mlir_apfloat_wrappers
+		mlir_arm_runner_utils
+		mlir_arm_sme_abi_stubs
+		mlir_async_runtime
+		mlir_c_runner_utils
+		mlir_float16_utils
+		mlir_runner_utils
+
+		# test libraries required by flang
+		MLIROpenACCTestPasses
+		MLIRTestAliasAnalysis
+		MLIRTestAnalysis
+		MLIRTestDialect
+		MLIRTestIR
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# tools
+			mlir-irdl-to-cpp
+			mlir-linalg-ods-yaml-gen
+			mlir-lsp-server
+			mlir-opt
+			mlir-pdll
+			mlir-pdll-lsp-server
+			mlir-query
+			mlir-reduce
+			mlir-rewrite
+			mlir-runner
+			mlir-src-sharder
+			mlir-tblgen
+			mlir-translate
+			tblgen-lsp-server
+			tblgen-to-irdl
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	# bug #956603
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		# this controls building libMLIR.so
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DMLIR_BUILD_MLIR_C_DYLIB=OFF
+		-DMLIR_LINK_MLIR_DYLIB=ON
+		-DMLIR_INCLUDE_TESTS=ON
+		-DMLIR_INCLUDE_INTEGRATION_TESTS=OFF
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		# this enables installing mlir-tblgen and mlir-pdll
+		-DLLVM_BUILD_UTILS=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		-DLLVM_BUILD_TOOLS=ON
+		# TODO
+		-DMLIR_ENABLE_CUDA_RUNNER=0
+		-DMLIR_ENABLE_ROCM_RUNNER=0
+		-DMLIR_ENABLE_SYCL_RUNNER=0
+		-DMLIR_ENABLE_SPIRV_CPU_RUNNER=0
+		-DMLIR_ENABLE_VULKAN_RUNNER=0
+		-DMLIR_ENABLE_BINDINGS_PYTHON=0
+		-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-mlir
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+}
diff --git a/llvm-core/polly/Manifest b/llvm-core/polly/Manifest
index 6e58c590dcf3..a8825672a95e 100644
--- a/llvm-core/polly/Manifest
+++ b/llvm-core/polly/Manifest
@@ -8,4 +8,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-core/polly/polly-24.0.0_pre20261010.ebuild b/llvm-core/polly/polly-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..09e649cc972e
--- /dev/null
+++ b/llvm-core/polly/polly-24.0.0_pre20261010.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit cmake llvm.org python-any-r1
+
+DESCRIPTION="Polyhedral optimizations for LLVM"
+HOMEPAGE="https://polly.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+# vendored isl (fork?)
+LICENSE+=" MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( polly cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-polly
+}
diff --git a/llvm-runtimes/compiler-rt-sanitizers/Manifest b/llvm-runtimes/compiler-rt-sanitizers/Manifest
index 5e29ebba0991..bf906ae5fb7a 100644
--- a/llvm-runtimes/compiler-rt-sanitizers/Manifest
+++ b/llvm-runtimes/compiler-rt-sanitizers/Manifest
@@ -20,4 +20,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-24.0.0_pre20261010.ebuild b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..a2313c010d9c
--- /dev/null
+++ b/llvm-runtimes/compiler-rt-sanitizers/compiler-rt-sanitizers-24.0.0_pre20261010.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
+# base targets
+IUSE+=" +copyprof +ctx-profile +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan nsan rtsan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-core/clang-linker-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-stdlib-config:${LLVM_MAJOR}
+		llvm-runtimes/compiler-rt:${LLVM_MAJOR}
+	)
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=(
+	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	# builds freestanding code
+	filter-flags -fstack-protector*
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang-${LLVM_MAJOR}
+		local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
+		strip-unsupported-flags
+
+		# The full clang configuration might not be ready yet. Use the partial
+		# configuration files that are guaranteed to exist even during initial
+		# installations and upgrades.
+		local flags=(
+			--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,stdlib,linker}.cfg
+		)
+		local -x CFLAGS="${CFLAGS} ${flags[@]}"
+		local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+		local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by llvm-runtimes/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		# in CMakeLists.txt order
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=$(usex ctx-profile)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_COPYPROF=$(usex copyprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath "${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dest=( "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ ! -e ${sys_dest} ]] && die "Unable to find ${sys_dest}"
+		[[ ${#sys_dest[@]} -ne 1 ]] && die "Non-deterministic compiler-rt install: ${sys_dest[*]}"
+		local sys_dir=( "${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}/lib/${sys_dest##*/}" )
+		[[ ! -e ${sys_dir} ]] && die "${sys_dir} is missing"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a "${sys_dest}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/llvm-runtimes/compiler-rt/Manifest b/llvm-runtimes/compiler-rt/Manifest
index 4b0c09c4dccd..7b1420e46574 100644
--- a/llvm-runtimes/compiler-rt/Manifest
+++ b/llvm-runtimes/compiler-rt/Manifest
@@ -15,4 +15,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/compiler-rt/compiler-rt-24.0.0_pre20261010.ebuild b/llvm-runtimes/compiler-rt/compiler-rt-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..5ce8a36d05fc
--- /dev/null
+++ b/llvm-runtimes/compiler-rt/compiler-rt-24.0.0_pre20261010.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang +debug test"
+REQUIRED_USE="atomic-builtins? ( clang )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-core/clang-linker-config:${LLVM_MAJOR}
+	)
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake third-party/siphash )
+LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	if target_is_not_host || tc-is-cross-compiler ; then
+		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
+		CHOST=${CTARGET} strip-unsupported-flags
+		# overrides host docs otherwise
+		DOCS=()
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	target_is_not_host && return
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	if use clang || use test; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang && ! is_crosspkg; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang-${LLVM_MAJOR}
+			local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
+		fi
+
+		strip-unsupported-flags
+
+		# The full clang configuration might not be ready yet. Given that compiler-rt
+		# require runtime, use only the linker configuration.
+		local flags=(
+			--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-linker.cfg
+		)
+		local -x CFLAGS="${CFLAGS} ${flags[@]}"
+		local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+		local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+	fi
+
+	if ! is_crosspkg && ! test_compiler ; then
+		local nolib_flags=( -nodefaultlibs -lc )
+
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -e main )
+
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$(usex !atomic-builtins)
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# in CMakeLists.txt order
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_COPYPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64 && ! target_is_not_host; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if is_crosspkg; then
+		# Needed to target built libc headers
+		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+
+			# Without this, compiler-rt install location is not unique
+			# to target triples, only to architecture.
+			# Needed if you want to target multiple libcs for one arch.
+			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+
+			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
+			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
+			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath "${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/llvm-runtimes/flang-rt/Manifest b/llvm-runtimes/flang-rt/Manifest
index fb359f903c22..38a15c40bb4a 100644
--- a/llvm-runtimes/flang-rt/Manifest
+++ b/llvm-runtimes/flang-rt/Manifest
@@ -6,4 +6,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/flang-rt/flang-rt-24.0.0_pre20261010.ebuild b/llvm-runtimes/flang-rt/flang-rt-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..3909a21e22d9
--- /dev/null
+++ b/llvm-runtimes/flang-rt/flang-rt-24.0.0_pre20261010.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org python-any-r1
+
+DESCRIPTION="LLVM's Fortran runtime"
+HOMEPAGE="https://flang.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions"
+SLOT="${LLVM_MAJOR}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<llvm-core/flang-21.0.0_pre20250221-r1
+"
+BDEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+	llvm-core/flang
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=(
+	runtimes flang-rt cmake flang libc/shared llvm/{cmake,utils}
+)
+LLVM_TEST_COMPONENTS=( third-party/unittest )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# the code is not portable
+	local -x FC=flang F77=flang
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		# cmake.eclass does not set if it we don't inherit fortran-2
+		# and upstream code relies on it being set before Fortran logic
+		# kicks in and reds envvars
+		-DCMAKE_Fortran_COMPILER="${FC}"
+		# we may not have a runtime yet
+		-DCMAKE_Fortran_COMPILER_WORKS=TRUE
+		# tests require modules now, and we probably want them anyway
+		-DRUNTIMES_FORTRAN_MODULES=ON
+
+		-DLLVM_ENABLE_RUNTIMES="flang-rt"
+		# this package forces NO_DEFAULT_PATHS
+		-DLLVM_BINARY_DIR="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		# set correct install paths
+		-DRUNTIMES_INSTALL_RESOURCE_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# do not install flang-rt C++ headers, they cause collisions
+		# across slots and do not seem to be used by anything
+		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON
+		-DLLVM_DEFAULT_TARGET_TRIPLE="${CHOST}"
+
+		-DFLANG_RT_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-flang-rt
+}
diff --git a/llvm-runtimes/libclc/Manifest b/llvm-runtimes/libclc/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-runtimes/libclc/Manifest
+++ b/llvm-runtimes/libclc/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/libclc/libclc-24.0.0_pre20261010.ebuild b/llvm-runtimes/libclc/libclc-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..3d86dd3619d5
--- /dev/null
+++ b/llvm-runtimes/libclc/libclc-24.0.0_pre20261010.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake llvm.org multibuild python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+IUSE="+spirv test video_cards_nvidia video_cards_radeonsi"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	llvm-core/clang:${LLVM_MAJOR}
+	spirv? (
+		>=dev-util/spirv-llvm-translator-23:*
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+src_configure() {
+	MULTIBUILD_VARIANTS=()
+
+	use spirv && MULTIBUILD_VARIANTS+=(
+		"spirv32-unknown-unknown"
+		"spirv64-unknown-unknown"
+		"spirv64-unknown-vulkan"  # formerly clspv
+	)
+	use video_cards_nvidia && MULTIBUILD_VARIANTS+=(
+		"nvptx64-nvidia-cuda"
+	)
+	use video_cards_radeonsi && MULTIBUILD_VARIANTS+=(
+		"amdgcn-amd-amdhsa-llvm"
+	)
+
+	multibuild_foreach_variant my_configure
+}
+
+my_configure() {
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DCMAKE_CLC_COMPILER="$(type -P clang-${LLVM_MAJOR})"
+		-DLLVM_DEFAULT_TARGET_TRIPLE="${MULTIBUILD_VARIANT}"
+		-DLLVM_INCLUDE_TESTS="$(usex test)"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	multibuild_foreach_variant cmake_build check-libclc
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/llvm-runtimes/libcxx/Manifest b/llvm-runtimes/libcxx/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-runtimes/libcxx/Manifest
+++ b/llvm-runtimes/libcxx/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/libcxx/libcxx-24.0.0_pre20261010.ebuild b/llvm-runtimes/libcxx/libcxx-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..f14ad30309f5
--- /dev/null
+++ b/llvm-runtimes/libcxx/libcxx-24.0.0_pre20261010.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +libcxxabi +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-core/clang-linker-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-unwindlib-config:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		dev-debug/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=(
+	runtimes libcxx{,abi} libc llvm/{cmake,utils} cmake
+)
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	local install_prefix=${EPREFIX}
+	is_crosspkg && install_prefix+=/usr/${CTARGET}
+
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${install_prefix}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Workaround for bgo #961153.
+	# TODO: Fix the multilib.eclass, so it sets CTARGET properly.
+	if ! is_crosspkg; then
+		export CTARGET=${CHOST}
+	fi
+
+	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
+		local -x CC=${CTARGET}-clang-${LLVM_MAJOR}
+		local -x CXX=${CTARGET}-clang++-${LLVM_MAJOR}
+		strip-unsupported-flags
+
+		# The full clang configuration might not be ready yet. Use the partial
+		# configuration of components that libunwind depends on.
+		local flags=(
+			--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,unwindlib,linker}.cfg
+		)
+		local -x CFLAGS="${CFLAGS} ${flags[@]}"
+		local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+		local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local nostdlib_flags=( -nostdlib++ )
+	if ! test_compiler && test_compiler "${nostdlib_flags[@]}"; then
+		local -x LDFLAGS="${LDFLAGS} ${nostdlib_flags[*]}"
+		ewarn "${CXX} seems to lack runtime, trying with ${nostdlib_flags[*]}"
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(llvm_cmake_use_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_INSTALL_MODULES=ON
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+	)
+	if is_crosspkg; then
+		# Needed to target built libc headers
+		local -x CFLAGS="${CFLAGS} -isystem ${ESYSROOT}/usr/${CTARGET}/usr/include"
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+			# Install inside the cross sysroot.
+			-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/${CTARGET}/usr"
+		)
+	fi
+	if use kernel_Darwin; then
+		# For Darwin it ships libc++ in system by default, conflicting prefix
+		mycmakeargs+=( -DLIBCXX_ABI_NAMESPACE=__gentoo1 )
+	fi
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		local libdir=$(get_libdir)
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build libcxx-test-suite-install-cxx
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		local libdir=$(get_libdir)
+		cp "${BUILD_DIR}"/{,libcxx/test-suite-install/}"${libdir}"/libc++_shared.so || die
+		if use static-libs; then
+			cp "${BUILD_DIR}"/{,libcxx/test-suite-install/}"${libdir}"/libc++_static.a || die
+		fi
+	fi
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		local libdir=$(get_libdir)
+		is_crosspkg && into /usr/${CTARGET}/usr
+		dolib.so "${libdir}"/libc++_shared.so
+		use static-libs && dolib.a "${libdir}"/libc++_static.a
+	fi
+
+	local install_prefix=
+	is_crosspkg && install_prefix=/usr/${CTARGET}
+	insinto "${install_prefix}/usr/share/libc++/gdb"
+	doins ../libcxx/utils/gdb/libcxx/printers.py
+
+	local lib_version=$(sed -n -e 's/^LIBCXX_LIBRARY_VERSION:STRING=//p' CMakeCache.txt || die)
+	[[ -n ${lib_version} ]] || die "Could not determine LIBCXX_LIBRARY_VERSION from CMakeCache.txt"
+
+	insinto "${install_prefix}/usr/share/gdb/auto-load/usr/$(get_libdir)"
+	newins - "libc++.so.${lib_version}-gdb.py" <<-EOF
+		__import__("sys").path.insert(0, "${EPREFIX}/usr/share/libc++/gdb")
+		__import__("printers").register_libcxx_printer_loader()
+	EOF
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv "${libdir}"/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > "${libdir}"/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv "${libdir}"/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > "${libdir}"/libc++.so || die
+}
diff --git a/llvm-runtimes/libcxxabi/Manifest b/llvm-runtimes/libcxxabi/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-runtimes/libcxxabi/Manifest
+++ b/llvm-runtimes/libcxxabi/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/libcxxabi/libcxxabi-24.0.0_pre20261010.ebuild b/llvm-runtimes/libcxxabi/libcxxabi-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..345fcaaf3fbb
--- /dev/null
+++ b/llvm-runtimes/libcxxabi/libcxxabi-24.0.0_pre20261010.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="+clang +static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	${RDEPEND}
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-core/clang-linker-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-unwindlib-config:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/{cmake,utils} cmake )
+LLVM_TEST_COMPONENTS=( libc llvm/include/llvm/{Demangle,Testing} )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+test_compiler() {
+	target_is_not_host && return
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+multilib_src_configure() {
+	# Workaround for bgo #961153.
+	# TODO: Fix the multilib.eclass, so it sets CTARGET properly.
+	if ! is_crosspkg; then
+		export CTARGET=${CHOST}
+	fi
+
+	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
+		local -x CC=${CTARGET}-clang-${LLVM_MAJOR}
+		local -x CXX=${CTARGET}-clang++-${LLVM_MAJOR}
+		strip-unsupported-flags
+
+		# The full clang configuration might not be ready yet. Use the partial
+		# configuration of components that libunwind depends on.
+		local flags=(
+			--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,unwindlib,linker}.cfg
+		)
+		local -x CFLAGS="${CFLAGS} ${flags[@]}"
+		local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+		local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+	fi
+
+	local nostdlib_flags=( -nostdlib++ )
+	if ! test_compiler && test_compiler "${nostdlib_flags[@]}"; then
+		local -x LDFLAGS="${LDFLAGS} ${nostdlib_flags[*]}"
+		ewarn "${CXX} seems to lack stdlib, trying with ${nostdlib_flags[*]}"
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this is broken with standalone builds, and also meaningless
+		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(llvm_cmake_use_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if is_crosspkg; then
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+			# Install inside the cross sysroot.
+			-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/${CTARGET}/usr"
+		)
+	fi
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/llvm-runtimes/libgcc/Manifest b/llvm-runtimes/libgcc/Manifest
index 76506c788f97..79af48fccc99 100644
--- a/llvm-runtimes/libgcc/Manifest
+++ b/llvm-runtimes/libgcc/Manifest
@@ -10,4 +10,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/libgcc/libgcc-24.0.0_pre20261010.ebuild b/llvm-runtimes/libgcc/libgcc-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..c680449c282c
--- /dev/null
+++ b/llvm-runtimes/libgcc/libgcc-24.0.0_pre20261010.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang, compatible with libgcc_s"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="debug test"
+
+DEPEND="
+	~llvm-runtimes/libunwind-${PV}[static-libs]
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/gcc
+"
+BDEPEND="
+	llvm-core/clang:${LLVM_MAJOR}
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake llvm-libgcc third-party/siphash )
+LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if target_is_not_host || tc-is-cross-compiler ; then
+		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
+		CHOST=${CTARGET} strip-unsupported-flags
+		# overrides host docs otherwise
+		DOCS=()
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# We need to build a separate copy of compiler-rt, because we need to disable the
+	# COMPILER_RT_BUILTINS_HIDE_SYMBOLS option - compatibility with libgcc requires
+	# visibility of all symbols.
+
+	llvm_prepend_path -b "${LLVM_MAJOR}"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	export CC=${CTARGET}-clang CXX=${CTARGET}-clang++
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DCOMPILER_RT_BUILTINS_HIDE_SYMBOLS=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	# disable building non-native runtimes since we don't do multilib
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=OFF
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+src_compile() {
+	cmake_src_compile
+
+	local rtlib=$(
+		"${CC}" -rtlib=compiler-rt -resource-dir="${BUILD_DIR}" \
+			-print-libgcc-file-name || die
+	)
+
+	# Use the llvm-libgcc's version script to produce libgcc.{a,so}, which
+	# combines compiler-rt and libunwind into a libgcc replacement.
+	#
+	# What we do here is similar to what upstream does[0], with the following
+	# differences:
+	#
+	# * We build the local copy of compiler-rt manually, to have a full control
+	#   over CMake options.
+	# * Upstream links the locally built copy of libunwind statically. We link the
+	#   system-wide libunwind dynamically.
+	#
+	# [0] https://github.com/llvm/llvm-project/blob/llvmorg-19.1.7/llvm-libgcc/CMakeLists.txt#L102-L120
+	"${CC}" -E -xc \
+		"${WORKDIR}/llvm-libgcc/gcc_s.ver.in" \
+		-o gcc_s.ver || die
+	"${CC}" -nostdlib \
+		${LDFLAGS} \
+		-Wl,--version-script,gcc_s.ver \
+		-Wl,--undefined-version \
+		-Wl,--whole-archive \
+		"${rtlib}" \
+		-Wl,-soname,libgcc_s.so.1.0 \
+		-lc -lunwind -shared \
+		-o libgcc_s.so.1.0 || die
+	# Generate libgcc_s.so ldscript for inclusion of libunwind as a
+	# dependency so that `clang -lgcc_s` works out of the box.
+	gen_ldscript libgcc_s.so.1.0 libunwind.so.1.0 > libgcc_s.so || die
+	cp "${rtlib}" libgcc.a || die
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	dolib.so libgcc_s.so.1.0 libgcc_s.so
+	dolib.a libgcc.a
+	dosym libgcc_s.so.1.0 "/usr/${libdir}/libgcc_s.so.1"
+	dosym libunwind.a "/usr/${libdir}/libgcc_eh.a"
+}
diff --git a/llvm-runtimes/libunwind/Manifest b/llvm-runtimes/libunwind/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-runtimes/libunwind/Manifest
+++ b/llvm-runtimes/libunwind/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/libunwind/libunwind-24.0.0_pre20261010.ebuild b/llvm-runtimes/libunwind/libunwind-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..264dc5aae763
--- /dev/null
+++ b/llvm-runtimes/libunwind/libunwind-24.0.0_pre20261010.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib crossdev flag-o-matic llvm.org llvm-utils
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="cet +clang +debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-core/clang-linker-config:${LLVM_MAJOR}
+		llvm-runtimes/clang-rtlib-config:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/{cmake,utils} cmake )
+LLVM_TEST_COMPONENTS=( libc libcxxabi )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+test_compiler() {
+	target_is_not_host && return
+	local compiler=${1}
+	shift
+	${compiler} ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+multilib_src_configure() {
+	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
+	fi
+
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	# Workaround for bgo #961153.
+	# TODO: Fix the multilib.eclass, so it sets CTARGET properly.
+	if ! is_crosspkg; then
+		export CTARGET=${CHOST}
+	fi
+
+	if use clang; then
+		local -x CC=${CTARGET}-clang-${LLVM_MAJOR}
+		local -x CXX=${CTARGET}-clang++-${LLVM_MAJOR}
+		strip-unsupported-flags
+
+		# The full clang configuration might not be ready yet. Use the partial
+		# configuration files that are guaranteed to exist even during initial
+		# installations and upgrades.
+		local flags=(
+			--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-{rtlib,linker}.cfg
+		)
+		local -x CFLAGS="${CFLAGS} ${flags[@]}"
+		local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+		local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+	fi
+
+	# Check whether C compiler runtime is available.
+	if ! test_compiler "$(tc-getCC)"; then
+		local nolib_flags=( -nodefaultlibs -lc )
+		if test_compiler "$(tc-getCC)" "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "$(tc-getCC)" "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -e main )
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+	# Check whether C++ standard library is available,
+	local nostdlib_flags=( -nostdlib++ )
+	if ! test_compiler "$(tc-getCXX)" &&
+		test_compiler "$(tc-getCXX)" "${nostdlib_flags[@]}"
+	then
+		local -x LDFLAGS="${LDFLAGS} ${nostdlib_flags[*]}"
+		ewarn "${CXX} seems to lack runtime, trying with ${nostdlib_flags[*]}"
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# Respect upstream build type assumptions (bug #910436) where they do:
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
+	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
+	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
+	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
+	#       -UNDEBUG
+	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
+	use debug || append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
+		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_CET=$(usex cet)
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# cross-unwinding increases unwinding footprint (to account
+		# for the worst case) and causes some breakage on AArch64
+		# https://github.com/llvm/llvm-project/issues/152549
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=OFF
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if is_crosspkg; then
+		mycmakeargs+=(
+			# Without this, the compiler will compile a test program
+			# and fail due to no builtins.
+			-DCMAKE_C_COMPILER_WORKS=1
+			-DCMAKE_CXX_COMPILER_WORKS=1
+			# Install inside the cross sysroot.
+			-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/${CTARGET}/usr"
+		)
+	fi
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(llvm_cmake_use_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/llvm-runtimes/openmp-amdgcn-amd-amdhsa/Manifest b/llvm-runtimes/openmp-amdgcn-amd-amdhsa/Manifest
index 9c942e2fddd0..cc6aebd08fb9 100644
--- a/llvm-runtimes/openmp-amdgcn-amd-amdhsa/Manifest
+++ b/llvm-runtimes/openmp-amdgcn-amd-amdhsa/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/openmp-amdgcn-amd-amdhsa/openmp-amdgcn-amd-amdhsa-24.0.0_pre20261010.ebuild b/llvm-runtimes/openmp-amdgcn-amd-amdhsa/openmp-amdgcn-amd-amdhsa-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..97ae1a52b3f2
--- /dev/null
+++ b/llvm-runtimes/openmp-amdgcn-amd-amdhsa/openmp-amdgcn-amd-amdhsa-24.0.0_pre20261010.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org
+
+DESCRIPTION="OpenMP target library for amdgcn devices"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+
+RDEPEND="
+	!<llvm-runtimes/offload-22[llvm_targets_AMDGPU(-)]
+"
+BDEPEND="
+	~llvm-core/clang-${PV}:${LLVM_MAJOR}[llvm_targets_AMDGPU]
+	llvm-core/lld:${LLVM_MAJOR}[llvm_targets_AMDGPU]
+"
+
+LLVM_COMPONENTS=(
+	runtimes openmp cmake llvm/{cmake,utils} libc/shared
+	offload/include
+)
+llvm.org_set_globals
+
+src_configure() {
+	local -x CC=${CHOST}-clang-${LLVM_MAJOR}
+	local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
+	local triple=${PN#openmp-}
+	filter-flags '-m*'
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}
+		-DLLVM_ENABLE_RUNTIMES=openmp
+		-DOPENMP_INSTALL_LIBDIR="$(get_libdir)/${triple}"
+	)
+	cmake_src_configure
+}
diff --git a/llvm-runtimes/openmp-nvptx64-nvidia-cuda/Manifest b/llvm-runtimes/openmp-nvptx64-nvidia-cuda/Manifest
index 9c942e2fddd0..cc6aebd08fb9 100644
--- a/llvm-runtimes/openmp-nvptx64-nvidia-cuda/Manifest
+++ b/llvm-runtimes/openmp-nvptx64-nvidia-cuda/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/openmp-nvptx64-nvidia-cuda/openmp-nvptx64-nvidia-cuda-24.0.0_pre20261010.ebuild b/llvm-runtimes/openmp-nvptx64-nvidia-cuda/openmp-nvptx64-nvidia-cuda-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..76075d09ffee
--- /dev/null
+++ b/llvm-runtimes/openmp-nvptx64-nvidia-cuda/openmp-nvptx64-nvidia-cuda-24.0.0_pre20261010.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org
+
+DESCRIPTION="OpenMP target library for nvptx64 devices"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+
+RDEPEND="
+	!<llvm-runtimes/offload-22[llvm_targets_NVPTX(-)]
+"
+BDEPEND="
+	~llvm-core/clang-${PV}:${LLVM_MAJOR}[llvm_targets_NVPTX]
+	llvm-core/lld:${LLVM_MAJOR}[llvm_targets_NVPTX]
+"
+
+LLVM_COMPONENTS=(
+	runtimes openmp cmake llvm/{cmake,utils} libc/shared
+	offload/include
+)
+llvm.org_set_globals
+
+src_configure() {
+	local -x CC=${CHOST}-clang-${LLVM_MAJOR}
+	local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
+	local triple=${PN#openmp-}
+	filter-flags '-m*'
+	strip-unsupported-flags
+
+	local mycmakeargs=(
+		-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}
+		-DLLVM_ENABLE_RUNTIMES=openmp
+		-DOPENMP_INSTALL_LIBDIR="$(get_libdir)/${triple}"
+	)
+	cmake_src_configure
+}
diff --git a/llvm-runtimes/openmp-spirv64-intel/Manifest b/llvm-runtimes/openmp-spirv64-intel/Manifest
index 1833e35bb034..b72b918d583c 100644
--- a/llvm-runtimes/openmp-spirv64-intel/Manifest
+++ b/llvm-runtimes/openmp-spirv64-intel/Manifest
@@ -2,4 +2,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/openmp-spirv64-intel/openmp-spirv64-intel-24.0.0_pre20261010.ebuild b/llvm-runtimes/openmp-spirv64-intel/openmp-spirv64-intel-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..fd6ed0f1280f
--- /dev/null
+++ b/llvm-runtimes/openmp-spirv64-intel/openmp-spirv64-intel-24.0.0_pre20261010.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake flag-o-matic llvm.org
+
+DESCRIPTION="OpenMP target library for spirv64 Intel devices"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+
+BDEPEND="
+	~llvm-core/clang-${PV}:${LLVM_MAJOR}[llvm_targets_SPIRV]
+	llvm-core/lld:${LLVM_MAJOR}[llvm_targets_SPIRV]
+"
+
+LLVM_COMPONENTS=(
+	runtimes openmp cmake llvm/{cmake,utils} libc/shared
+	offload/include
+)
+llvm.org_set_globals
+
+src_configure() {
+	local -x CC=${CHOST}-clang-${LLVM_MAJOR}
+	local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
+	local triple=${PN#openmp-}
+	filter-flags '-m*'
+	strip-unsupported-flags
+	# incompatible with the spirv target, https://bugs.gentoo.org/981726
+	filter-flags -frecord-gcc-switches
+
+	# https://github.com/llvm/llvm-project/issues/186598
+	filter-ldflags '-Wl,*'
+
+	local mycmakeargs=(
+		-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}
+		-DLLVM_ENABLE_RUNTIMES=openmp
+		-DOPENMP_INSTALL_LIBDIR="$(get_libdir)/${triple}"
+	)
+	cmake_src_configure
+}
diff --git a/llvm-runtimes/openmp/Manifest b/llvm-runtimes/openmp/Manifest
index 7558e83dda9b..f5bfc238314d 100644
--- a/llvm-runtimes/openmp/Manifest
+++ b/llvm-runtimes/openmp/Manifest
@@ -14,4 +14,5 @@ DIST llvm-project-23.1.2.src.tar.xz 179200068 BLAKE2B 554cddd2a3e273ba876da7815e
 DIST llvm-project-23.1.2.src.tar.xz.sig 119 BLAKE2B 20a19a2a584c6298841e20f95bf13e42c5f591f82087abd26f77f1d7f87b575dc661fd8bc72f6a7faad485cf75ff4219fb810fbb3a73b0a5992014157e5094fc SHA512 fe76751211cfb1a56935f0e6fd9536309eb02111acb3f32f4badf7e45e6f0283125cf2ece00baa420afc488667c7e1fbb06f0567aa33ff9459f41281cb25e10c
 DIST llvm-project-23.1.3.src.tar.xz 179220548 BLAKE2B 1ce328590eb86e5a8d117a1d5c2c4b691d9c1a897f239ba197e14f47b660e927313133e94a518c43ceed163fc081760d5d33e2685a94af1031184a0960ffb5c7 SHA512 eb76f37804564a2595ca8de4864e96cf13c0a3f07922f6bce4d11771547525785c0fde54457aadf7aa1bcaac496475f1dde00e1b152c1df560669c6e3e1318bf
 DIST llvm-project-23.1.3.src.tar.xz.sig 466 BLAKE2B 0f5bc2af1f860f908ecb10b057170a832d42c5d916b63b86b75e529466d1ab2f6b2258c3b51a3cb0f236d9553d2990550343f371062d5224fb319bb9d4be26cd SHA512 7eabfb513a5516cab7d2d366117abd36bdb9d1a50e8ab0b21991d8143222e965ac53dbbacc80c8977ed8aaee57b480b7fdbdae0ba847f62c031da69989d34d2d
+DIST llvm-project-53310c92e86e1c285b1fe3aaf76158addd0a2036.tar.gz 320028470 BLAKE2B f71cfa7241e3272e3f85200a2f83ffa2ec99b713d444102ce4e0b8420019a6f0f7818ce4a04a2f59be455cd2c26f557c814afbd4613ea09c6133e9faeaf90f42 SHA512 c9304de60fa1ef194b0d1ef158a6d0638465a723a86fbac922184fbd808044e43cd709bc4b5f15cbf04f6ddc465bedc7220978a4913959e4094c9e0ca9a2022a
 DIST llvm-project-9fe649af67007493c02108b484c8b9259e3d522e.tar.gz 318504162 BLAKE2B 43f10fa26c665d9986a093fa8287f302b54dee2b0e74c3c835fd7642c233a3574b3e03e82380f24b1d277b1063ae3bca05a2061b9fa794559f695aa9689e5134 SHA512 7000bf65c5d696a1a870ba8a7f645958970f535a3b68cc7df8da8f3fa31afe4fb02049532919a5974721618b212b3ed7796fd0e1e63de69484517cd91a2289e9
diff --git a/llvm-runtimes/openmp/openmp-24.0.0_pre20261010.ebuild b/llvm-runtimes/openmp/openmp-24.0.0_pre20261010.ebuild
new file mode 100644
index 000000000000..f30f83b2b5d2
--- /dev/null
+++ b/llvm-runtimes/openmp/openmp-24.0.0_pre20261010.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib crossdev flag-o-matic llvm.org python-single-r1
+inherit toolchain-funcs
+
+DESCRIPTION="OpenMP runtime libraries for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+IUSE="
+	+clang +debug fortran gdb-plugin hwloc offload ompt test
+	cuda level-zero rocm
+"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		dev-libs/libffi:=
+		~llvm-core/llvm-${PV}
+		level-zero? ( dev-libs/level-zero:= )
+		rocm? ( dev-libs/rocr-runtime:= )
+	)
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - llvm-core/llvm provide test utils (e.g. FileCheck)
+# - llvm-core/clang provides the compiler to run tests
+RDEPEND="
+	${DEPEND}
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	offload? (
+		!llvm-runtimes/offload
+		cuda? ( ~llvm-runtimes/openmp-nvptx64-nvidia-cuda-${PV} )
+		level-zero? ( ~llvm-runtimes/openmp-spirv64-intel-${PV} )
+		rocm? ( ~llvm-runtimes/openmp-amdgcn-amd-amdhsa-${PV} )
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	clang? ( llvm-core/clang )
+	fortran? (
+		llvm-core/flang:${LLVM_MAJOR}
+		llvm-runtimes/flang-rt:${LLVM_MAJOR}
+	)
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	offload? (
+		virtual/pkgconfig
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		llvm-core/clang:${LLVM_MAJOR}
+		llvm-core/llvm:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=(
+	runtimes openmp offload cmake libc llvm/{cmake,include,utils}
+	third-party/unittest
+)
+llvm.org_set_globals
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/offload/OffloadAPI.h
+	/usr/include/offload/OffloadPrint.hpp
+	/usr/include/offload/cuda/cuda_runtime.h
+	/usr/include/offload/hip/hip_runtime.h
+	/usr/include/offload/kernel/DefineLanguageNames.inc
+	/usr/include/offload/kernel/LanguageErrors.h
+	/usr/include/offload/kernel/LanguageLaunch.h
+	/usr/include/offload/kernel/LanguageRuntime.h
+	/usr/include/offload/kernel/Types.h
+	/usr/include/offload/kernel/UndefineLanguageNames.inc
+)
+
+pkg_pretend() {
+	if [[ ${LLVM_ALLOW_GPU_TESTING} ]]; then
+		ewarn "LLVM_ALLOW_GPU_TESTING set.  This package will run tests against your"
+		ewarn "GPU if it is supported.  Note that these tests may be flaky, fail or"
+		ewarn "hang, or even cause your GPU to crash (requiring a reboot)."
+	fi
+}
+
+pkg_setup() {
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	if use clang && ! is_crosspkg; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if use fortran; then
+		local -x FC=flang-${LLVM_MAJOR} F77=flang-${LLVM_MAJOR}
+		strip-unsupported-flags
+	else
+		local -x FC= F77=
+	fi
+
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLLVM_ENABLE_RUNTIMES=openmp
+		-DLLVM_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLLVM_BINARY_DIR="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+		# this breaks building static target libs
+		-DBUILD_SHARED_LIBS=OFF
+	)
+
+	if multilib_is_native_abi && use fortran; then
+		mycmakeargs+=(
+			# cmake.eclass does not set if it we don't inherit fortran-2
+			# and upstream code relies on it being set before Fortran logic
+			# kicks in and reds envvars
+			-DCMAKE_Fortran_COMPILER="${FC}"
+			-DRUNTIMES_FORTRAN_MODULES=ON
+			-DRUNTIMES_INSTALL_RESOURCE_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		)
+	fi
+
+	if multilib_is_native_abi && use offload; then
+		local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+		local plugins="host"
+
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			if use rocm; then
+				plugins+=";amdgpu"
+			fi
+			if use cuda; then
+				plugins+=";cuda"
+			fi
+			if use level-zero; then
+				plugins+=";level_zero"
+			fi
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="openmp;offload"
+			-DOFFLOAD_INCLUDE_TESTS=$(usex test)
+			-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
+			-DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
+		)
+
+		[[ ! ${LLVM_ALLOW_GPU_TESTING} ]] && mycmakeargs+=(
+			# prevent trying to access the GPU
+			-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
+			-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
+			-DLIBOMPTARGET_OFFLOAD_ARCH=LIBOMPTARGET_OFFLOAD_ARCH-NOTFOUND
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang-${LLVM_MAJOR}")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++-${LLVM_MAJOR}")"
+		# may be set to empty above
+		-DOPENMP_TEST_Fortran_COMPILER="${FC}"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local targets=( check-openmp )
+	if multilib_is_native_abi && use offload; then
+		targets+=( check-offload check-offload-unit )
+	fi
+
+	if multilib_is_native_abi && use fortran; then
+		# hack header search around by copying the modules to a directory
+		# that is already given via -I
+		cp "${BUILD_DIR}/$(get_libdir)/clang"/*/finclude/flang/*/*.mod \
+			"${WORKDIR}/offload/test/" || die
+	fi
+
+	cmake_build "${targets[@]}"
+}
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8115f9e6cb27..85c4571a9f17 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
 DIST mutt-2.3.2.tar.gz 5570204 BLAKE2B 2f256d98e81be88f60543411dd6ebb9f3c640b73503de097acffc5bbcf39c63221dc9c1357288a48af5e9aa1f69b9068698f376f7884d5bd974d717206086376 SHA512 78d7bcce1466bc7e188c579c00df0f308ea73b3f574b6fdecd399dc5f361ced971a6cecb09877b689a15aac8d02271b13d1f61e0d3197d79b6a348e6bf04f3ea
-DIST mutt-2.3.3.tar.gz 5570769 BLAKE2B bae4cd9173741036d941985822c733f93d25dbacf273188c05503277fc22f7f2a829fe0e121127f1e682cf81be4b0920561666bb899616f95cb928da5e823647 SHA512 80c2e7e9c76d1434df35bad11ccbf4a12b6c00b2fa59c27974bb74605ec23c7a09b25b0b0cc421870e01cef3d1c7b086d45f8c7f8eac93204c2002643a86e3e2
 DIST mutt-2.4.1.tar.gz 5626446 BLAKE2B cc7e32cfe62ceac3c9f4e5ec2200ad6b346cdef7dab814fb039066850cf23337640a4c32ddf9687a3c2edc2dbc1f41bbf2589422fd9861b4ced53e81cfc2b318 SHA512 370e871e1f417038f117883b82381967b82c4fffdc64498aacc115b18d91cdf91731d065c4d93ff2c929aeba73644d052f9e7cd84906a30fee918f2fff01237d
+DIST mutt-2.4.3.tar.gz 5631939 BLAKE2B ea1ff17d243a7510795365c8de136fba33661e0e7c727311f3170394c472246e5d3151c65b1ccfe2d04cda85149bdeab76f9f03b7fbd8a5398ea372d88136255 SHA512 5513e7d7885c6d1958437a21e2e62288fb9374ae95b7b421de356e64d699467657987b9d9108c554d763420271be0d8c7da06f86e537edb2e870efdd14f66261
 DIST mutt-gentoo-2.3.2-patches-r0.tar.xz 22360 BLAKE2B da82417e3e229abdd916bb7797bedb7e9f541530507a954a1e344e7174d3b570e5ae6232ad79d5f852621e775d6fce6c2364a954a9dfec5129f09ba2d6460109 SHA512 13a97bfbae25d4243e83a6d6e6e032c96d55d82887b8c1d4b35310219cffdd4be6be0a81e38512077baac29295244a32cce2a361652f63b001cf8a28ad03ed9e
-DIST mutt-gentoo-2.3.3-patches-r0.tar.xz 22352 BLAKE2B 2a430232fa0faf00b75dad41ca76c52e27dbe9fdf906176fc6d5ecfb2cbe29d0fb6f8b97e123da7f098363db0e67f23c8b1b289e0d606133eafea1f5c2e12bd2 SHA512 90b90887aa7fbbfef8a69356844d920aa4cf2af8a95599a404b9897ec0b6ad4cb77604e8b409d38bde71db4dc9e1f12c2cc265cc8429e0b0698e303f67b7b33f
 DIST mutt-gentoo-2.4.1-patches-r0.tar.xz 22016 BLAKE2B 8b01d278ea1031613c2ead8d333faa1eb2bbc6b56173ccc3d0e79a018f36b43eadb39b0486954947ceefaeac785a7297ddb3c0e632647241763e6e7b47815756 SHA512 13c03c951df98c262bc0923569a47ed70fffeb160544b7618d10bbd21cdffd68f2ba607b3b01bd091df6d33086a274e206a1bc678acf2e8bb378879003c43fe7
+DIST mutt-gentoo-2.4.3-patches-r0.tar.xz 21912 BLAKE2B d2cb403a0eea2ee67878ccb7bf106cec4208be0a97bbd1900ce3d15f305731eb180ef4d6be6f45ae0f3d90ad94a5e29180e43225a172b02732bd72ad29e95453 SHA512 2b76096d9dd670fedfb7356c27778f7b2d1c898e6e3d838424294b29442f00aa8caf97f2ba51b41086fc73410174d2068fcea3b29fa9247eff4b48b5241283fb
diff --git a/mail-client/mutt/mutt-2.3.3.ebuild b/mail-client/mutt/mutt-2.4.3.ebuild
index 9851c13967d7..55b2196add03 100644
--- a/mail-client/mutt/mutt-2.3.3.ebuild
+++ b/mail-client/mutt/mutt-2.4.3.ebuild
@@ -12,7 +12,6 @@ DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
 SRC_URI="http://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
 LICENSE="GPL-2"
 SLOT="0"
@@ -203,6 +202,13 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_test() {
+	# the only tests run by Mutt are source-code checks: security
+	# pattens, tabs and shellchecks -- none test the actual product
+	# bug 978743
+	:
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	insinto /etc/${PN}
diff --git a/media-gfx/entangle/entangle-3.0-r5.ebuild b/media-gfx/entangle/entangle-3.0-r5.ebuild
new file mode 100644
index 000000000000..76ed21679a74
--- /dev/null
+++ b/media-gfx/entangle/entangle-3.0-r5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit gnome2-utils meson python-single-r1 xdg-utils
+
+DESCRIPTION="Tethered Camera Control & Capture"
+HOMEPAGE="
+	https://entangle-photo.org/
+	https://gitlab.com/entangle/entangle/
+"
+SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.82.0-r2
+	dev-libs/libgudev:=
+	>=dev-libs/libpeas-1.2.0:0=[gtk,${PYTHON_SINGLE_USEDEP}]
+	>=media-libs/gexiv2-0.10:0.16=[introspection]
+	>=media-libs/libgphoto2-2.5.0:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/lcms:2
+	>=media-libs/libraw-0.9.0:=
+	>=x11-libs/gdk-pixbuf-2.12.0:2
+	>=x11-libs/gtk+-3.22:3[X,introspection]
+	>=x11-libs/libXext-1.3.0
+	>=x11-libs/pango-1.40.11
+	x11-themes/adwaita-icon-theme
+"
+RDEPEND="
+	${DEPEND}
+"
+
+# perl for pod2man
+BDEPEND="
+	app-text/yelp-tools
+	dev-lang/perl
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+	"${FILESDIR}"/${P}-gexiv2-APIs.patch
+	"${FILESDIR}"/${P}-libgirepository-detection.patch
+	"${FILESDIR}"/${P}-compile-check-girepository.patch
+	"${FILESDIR}"/${P}-fix-GExiv2-GIR-name.patch
+)
+
+src_compile() {
+	# prevent gst from loading system plugins which causes
+	# sandbox violations on device access
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	# pre-generate enums to resolve race conditions
+	# https://bugs.gentoo.org/709740
+	meson_src_compile \
+		src/backend/entangle-{camera,colour-profile}-enums.h \
+		src/frontend/entangle-image-display-enums.h
+	meson_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild b/media-gfx/gnome-photos/gnome-photos-44.0.ebuild
deleted file mode 100644
index 532766d80264..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild
+++ /dev/null
@@ -1,99 +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 gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-photos"
-
-LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="test upnp-av"
-#RESTRICT="!test? ( test )"
-# https://gitlab.gnome.org/GNOME/gegl/-/issues/335
-# https://gitlab.gnome.org/Archive/gnome-photos/-/issues/214
-RESTRICT="test"
-
-DEPEND="
-	media-libs/babl
-	>=x11-libs/cairo-1.14.0
-	>=x11-libs/gdk-pixbuf-2.36.8:2
-	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
-	sci-geosciences/geocode-glib:2
-	>=media-libs/gexiv2-0.14.0
-	>=dev-libs/glib-2.62.0:2
-	dev-libs/libportal:=[gtk]
-	>=net-libs/gnome-online-accounts-3.8.0:=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.22.16:3
-	>=dev-libs/libdazzle-3.26.0
-	>=gui-libs/libhandy-1.1.90:1
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libpng-1.6:0=
-	app-misc/tinysparql:3
-	sys-apps/dbus
-"
-# Upstream left this commented in meson.build. Probably comes back with the next version
-# >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts]
-
-# localsearch gschema used at runtime.
-RDEPEND="${DEPEND}
-	upnp-av? ( net-libs/dleyna:1.0= )
-	app-misc/localsearch:3
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/desktop-file-utils
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-DOCS=() # meson installs docs itself
-
-python_check_deps() {
-	use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test dogtail)
-		-Dflatpak=false
-		-Dinstalled_tests=false
-		-Dmanuals=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 5fe68e296f72..7005145776d5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,2 @@
 DIST krita-6.0.1.tar.xz 203100664 BLAKE2B 6d8865973cab26cf1fb7c0e53b24fdfddd98f295a73c00f0b9f7f8f6ae1bbb344487d930ab7588e30718e20aeed05fd14ce54e5b7bf3a9d7c7a75d97a0b6da5f SHA512 2c00cb04675f8e936f300adbc121fe231edd64a2b1d5f9a16b4aa0fc60a54f4a7089ca332fb144426f9dea1d429b835f0cf1fa6e26c2f04fc6c73558a0eabad3
-DIST krita-6.0.4.tar.xz 206806924 BLAKE2B 68dc552effb93eb90b762bc45d1d8bf6ea6795bb0a53e8494273a384fbdc2cc0278ae8df5b95ec463942c414565a4b20105ca32e02fa2023fbfe9824ed61defe SHA512 5c6a03c4447d4130a28c3c10d5ff596fc6dcf95894d9eddbb91f1960a89def00968bc551a75a8ec8d55d97b16a310a4c0ceef6e9432e89fbc4413f7361faede4
+DIST krita-6.0.4.1.tar.xz 206798592 BLAKE2B 902dc204b1895378d833b576cf2e0993004195e3e49d18606e6d978644ed443a8735ce3985e62eda0cdf1ed4de83b6afdbd1ae5d46e532c2a82c5b068c8f479a SHA512 5e41bf962dd70e09daf974015aef3d5f9e7569ba0a120661e202634aed9db96a96835cd690c5c0e1610b49518ba5d34b3461f9370bd9ecd05b13964217c08bd6
diff --git a/media-gfx/krita/files/krita-6.0.4.1-qt-6.12.patch b/media-gfx/krita/files/krita-6.0.4.1-qt-6.12.patch
new file mode 100644
index 000000000000..9d5548cd3c40
--- /dev/null
+++ b/media-gfx/krita/files/krita-6.0.4.1-qt-6.12.patch
@@ -0,0 +1,34 @@
+https://invent.kde.org/graphics/krita/-/merge_requests/2966
+
+From 3f5b2882017f4e12c9b021de0ea24e6dd2eb26dd Mon Sep 17 00:00:00 2001
+From: Jonas Rakebrandt <xarblu@protonmail.com>
+Date: Fri, 2 Oct 2026 14:40:22 +0200
+Subject: [PATCH] Fix invalid widget class name
+
+Caused a build failure during the Qt 6.11 -> 6.12 rebuild:
+
+  [1707/3599] Generating ui_AssistantsToolOptions.h
+  /var/tmp/portage/media-gfx/krita-6.0.4/work/krita-6.0.4/plugins/assistants/Assistants/AssistantsToolOptions.ui: Warning: The name 'verticalLayout' (QVBoxLayout) is already in use, defaulting to 'verticalLayout1'.
+  /var/tmp/portage/media-gfx/krita-6.0.4/work/krita-6.0.4/plugins/assistants/Assistants/AssistantsToolOptions.ui: Invalid class name: " QWidget"
+  File '/var/tmp/portage/media-gfx/krita-6.0.4/work/krita-6.0.4/plugins/assistants/Assistants/AssistantsToolOptions.ui' is not valid
+
+Signed-off-by: Jonas Rakebrandt <xarblu@protonmail.com>
+---
+ plugins/assistants/Assistants/AssistantsToolOptions.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/assistants/Assistants/AssistantsToolOptions.ui b/plugins/assistants/Assistants/AssistantsToolOptions.ui
+index 5d048fef40e..848f4a11c41 100644
+--- a/plugins/assistants/Assistants/AssistantsToolOptions.ui
++++ b/plugins/assistants/Assistants/AssistantsToolOptions.ui
+@@ -284,7 +284,7 @@
+       </layout>
+      </item>
+    <item>
+-    <widget class=" QWidget" name="showDockerOptionsPanel">
++    <widget class="QWidget" name="showDockerOptionsPanel">
+       <property name="visible">
+           <bool>false</bool>
+         </property>
+-- 
+GitLab
diff --git a/media-gfx/krita/krita-6.0.4.ebuild b/media-gfx/krita/krita-6.0.4.1.ebuild
index f7e9c842c057..a53daeffac18 100644
--- a/media-gfx/krita/krita-6.0.4.ebuild
+++ b/media-gfx/krita/krita-6.0.4.1.ebuild
@@ -110,7 +110,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.3.0-tests-optional.patch
 	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
 	"${FILESDIR}"/${PN}-6.0.1-pyqt6.11-sip13.8.patch # bug 974789, unfortunately, also downstream
-	"${FILESDIR}"/${P}-fix-colorspace-browser-crash.patch # in 6.0 branch
+	"${FILESDIR}"/${PN}-6.0.4-fix-colorspace-browser-crash.patch # in 6.0 branch
+	"${FILESDIR}"/${PN}-6.0.4.1-qt-6.12.patch
 )
 if [[ -n ${PATCHSET} ]]; then
 	PATCHES+=( "${WORKDIR}/${PATCHSET}" )
diff --git a/media-libs/libsfml/libsfml-3.1.0.ebuild b/media-libs/libsfml/libsfml-3.1.0-r1.ebuild
index b9802f3c6b85..410ef2188fbe 100644
--- a/media-libs/libsfml/libsfml-3.1.0.ebuild
+++ b/media-libs/libsfml/libsfml-3.1.0-r1.ebuild
@@ -30,6 +30,7 @@ KEYWORDS="~amd64"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
+# mbedtls-3 support can be patched in, but issues with reverse dependencies such as dolphin would need to be addressed.
 RDEPEND="
 	media-libs/flac:=
 	media-libs/freetype:2
@@ -38,7 +39,7 @@ RDEPEND="
 	media-libs/libogg
 	media-libs/libvorbis
 	net-libs/libssh2
-	net-libs/mbedtls:=[threads]
+	net-libs/mbedtls:0=[threads]
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXcursor
@@ -95,6 +96,7 @@ src_test() {
 		# Flaky
 		"sf::Shader"
 		"sf::Clipboard"
+		"sf::Texture" # bug #960268
 	)
 	virtx cmake_src_test
 }
diff --git a/media-libs/raqm/raqm-0.10.5.ebuild b/media-libs/raqm/raqm-0.10.5.ebuild
index a3418664ae75..5a5a04c23191 100644
--- a/media-libs/raqm/raqm-0.10.5.ebuild
+++ b/media-libs/raqm/raqm-0.10.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/HOST-Oman/libraqm/releases/download/v${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/sdl2-net/sdl2-net-2.2.0.ebuild b/media-libs/sdl2-net/sdl2-net-2.2.0.ebuild
index 751c71d2ba1b..8f3d9a4c97ec 100644
--- a/media-libs/sdl2-net/sdl2-net-2.2.0.ebuild
+++ b/media-libs/sdl2-net/sdl2-net-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsdl2-2.0.4[${MULTILIB_USEDEP}]"
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index b014db046f95..2efb0e3786c1 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,2 +1,3 @@
 DIST shaderc-2026.2.tar.gz 228959 BLAKE2B 7110c9153fd109e4c9e30fb2ae2a34afda7af7e439bf4c209063d59248fce0eb78b2a71d8335e97bbe30365bc199b1bb0d1d24c317fee2e225911cc05b94a3df SHA512 733f85a83db4b71814c7f251c44e6010b485ed03d7e2389db5c14f8426942bebf6c95a35e5eaef80e51c29f8efa28cc0577226344630a427553200c6a87349ec
 DIST shaderc-2026.3.tar.gz 230772 BLAKE2B b78a37d538b1dc6adbd957e378aad4d72b5f461225a63025d8dfa9e21e3fae7c5080639876754f2419627345513e02d9bc62accca5cc1cef7e40bbac836bc7d9 SHA512 795a2c59c31b11c23e7110fd01fc7ee7c07cadae621c9a11c2df56bc85fcb43c25a1c5504fab36e3df21bad1eb1a2af28872ee9bcf745cd2dec815acd189bcfd
+DIST shaderc-2026.4.tar.gz 237528 BLAKE2B b4f36d811365adf6446fa1651996af4fea19b60b307469c99ffe7a61c432d849432498a66665e93bfe6d696f6b7ec91afc963a231d59890d9840df64f5802b44 SHA512 a8dbf46cd10b2fabd0f533fcc79975202a235d04019295f14d3b51bf9699978ebf332c63f14b60fb518fc4deb07c37f84f19f2450958ae2035cbfacc68d78dae
diff --git a/media-libs/shaderc/shaderc-2026.4.ebuild b/media-libs/shaderc/shaderc-2026.4.ebuild
new file mode 100644
index 000000000000..4537efe38df7
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2026.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib dot-a python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-util/glslang-1.4.363.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.4.363.0[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.4.363.0"
+
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	lto-guarantee-fat
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="true"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+	strip-lto-bytecode
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 4ac741a895b9..bb2c0b815c00 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-layers-1.4.350.0.tar.gz 7789546 BLAKE2B c59150af0dc6213d77d5ee604cb63c96ff81ce5df424c1d210e30ac330d010973002a907416375f1c27f4b268279ec3d5386dfe64357c90e30de8d20c66af057 SHA512 7005b696069d5580ffd1942f115b32a7b3fd2aa24bf9666222174e2d6f4d8471e5df7433b49c08360f9126dbd02cd4009dfcee4a6642948b8e36d658aad4d72b
 DIST vulkan-layers-1.4.357.0.tar.gz 8376244 BLAKE2B ca0a40093fff06d0543fdb4a4adbc7262b8e6b2d1cc28d83c3ca7b18e54f3333803da1260fbd231d3c31cfed9fd646724f2f877a96db33a177a98ffc63da8ba3 SHA512 5bdec84ad1072e9728ab6c599c2f67af8d5b8b5f58f565a5f74f7a98a5e8b414e7b89b2c0c1b6de45c6ba6c58f9f1cd9953e242919bbb98c0c79888ecd328800
+DIST vulkan-layers-1.4.363.0.tar.gz 8516350 BLAKE2B 3be1e7239c8f12386b73a811d24a6d0b33f182446878ed4693192b71c82aad3c9f9b56b9803e24c9551525e0e17e39c0e07bc92acb562fd1ad6fd5c334d9cc78 SHA512 00e8429e5f9d4c6a20f99591c1f7964eec3ce48fa56b258961df3704394ae202e755078eb0f6766e134462493d7de62db8140bbe6ff8eadf3af9f9b8122ac1c8
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.4.363.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.4.363.0.ebuild
new file mode 100644
index 000000000000..b40cf66a041f
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.4.363.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{13..14} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland test X"
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.335.0-tests-no-static.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=$(usex test)
+		-DUPDATE_DEPS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	addwrite "/dev/dri/renderD128"
+	cmake_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index a5193514b37a..668ec18ffb7b 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,2 +1,3 @@
 DIST vulkan-loader-1.4.350.0.tar.gz 1800025 BLAKE2B 14d370c4a53def72bfc017966d91594bd9fbbc636d50185c873f571287eb731ec0770687edf3feb0da9c2b3e1a79d06bd84612287b90e2cb5f7589a80276d65a SHA512 5d9829bed6e166b598e6769b6263c0d0408ba578c3e99b460e1ca2a5b13bd0ea38f315953f6ad74567fbd7025143050704b87e2ea11e6689c41675220e115ce1
 DIST vulkan-loader-1.4.357.0.tar.gz 1820868 BLAKE2B e70b04e567b71b61927116ca771822605ccfa8b6c7f1d6ec0b5aadd45045ba1a8e5fe6ad7181f5964c98fec96f24a3e04d12dace925d66e59d1b2dd5eafa29a0 SHA512 3376ce1be08ec4f453d6674118cc5e59d07ba7c7ec135f3cdd4d6820fa26bf4ef5e176ac9ade4413d25d90b4828060a1d0e0c1c2a7b4bec3118d70cdd61e6bfa
+DIST vulkan-loader-1.4.363.0.tar.gz 1866201 BLAKE2B 1f8018340611c47fdcc21d6699d6b1cdadacaf5945ef35c8b73086215374d138cc82a17918968c1a017381ece689d5e036441e6e7c7b82ee625b4d2446af4e68 SHA512 dc1884b0af24b94c974aa4526e3534625a187effe21088adfebeda94179ebe5ee789e7839765f20a1b1a460aa05a64bf1247310dc5649e61ba90dcb8647915b9
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.4.363.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.4.363.0.ebuild
new file mode 100644
index 000000000000..1ecd9b798e50
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.4.363.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Loader
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+		-DGIT_EXECUTABLE="${BROOT}/usr/bin/git"
+	)
+
+	if tc-is-cross-compiler; then
+		# Python only needed when cross-compiling so don't bother with eclass.
+		mycmakeargs+=( -DPython3_EXECUTABLE="${BROOT}/usr/bin/python3" )
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index b0fc69cdeb5e..15b415abb7b2 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,2 @@
-DIST x265-3.6.tar.gz 1655889 BLAKE2B 2598421e2e21974998b0b20895dc7e12dbf6ebe1b6c23bb5a7710b575d3db773335cd1f0b3ef110b79cf4d6dd01e543e9807a0509963497edc25f617f80c29f3 SHA512 570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be
 DIST x265-4.1.tar.gz 1725279 BLAKE2B 0957c121aea761f9dc6549b624d03f31114dfe37a947780194459c37532e2ba05d94de9484ad2233819e0431030eb0c794894030df0a3aeab73df43a3d62ad6e SHA512 5af5b958ff507f96a52813a6b72847c9fbc555bf95af287ae7f011055338266fb647dfea3b7789730c7f5c746f7e6cb7d9395ba10cbe43eb5034d3ed99730c3f
+DIST x265_4.3.tar.gz 2052112 BLAKE2B 252dcdea82e1b8859c0cea7de2eefdc6022b582aa0db7965eb201260a19dd9810a229816839f8bcd7e2ba74e60ad580fb8e083ef4e0ff7bc264b53abfe953bb7 SHA512 8de48fe3071e1c6272d84aee29de82e037310ed3a625fcee29990fc08534c5316bee514553526e4677c6ff15f433e41eafa354b1a4b3e65d0ec42af5ad791920
diff --git a/media-libs/x265/files/x265-3.6-code-cleanup.patch b/media-libs/x265/files/x265-3.6-code-cleanup.patch
deleted file mode 100644
index 54f63f0b6614..000000000000
--- a/media-libs/x265/files/x265-3.6-code-cleanup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bca0b4b72977683794d441e57adc8c279ff4bfca Mon Sep 17 00:00:00 2001
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Mon, 26 Aug 2024 14:25:35 +0200
-Subject: [PATCH 1/4] use boolean compare instead of bitwise
-
-Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
-
-diff --git a/common/cudata.cpp b/common/cudata.cpp
-index 19281de..d5b295f 100644
---- a/common/cudata.cpp
-+++ b/common/cudata.cpp
-@@ -73,7 +73,7 @@ inline bool isEqualRow(int addrA, int addrB)
- /* Check whether 2 addresses point to the same row or column */
- inline bool isEqualRowOrCol(int addrA, int addrB)
- {
--    return isEqualCol(addrA, addrB) | isEqualRow(addrA, addrB);
-+    return isEqualCol(addrA, addrB) || isEqualRow(addrA, addrB);
- }
- 
- /* Check whether one address points to the first column */
-
-From da3eb3ea55be74e440b272e24d7d8e67cb7a76db Mon Sep 17 00:00:00 2001
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Mon, 26 Aug 2024 14:44:55 +0200
-Subject: [PATCH 2/4] fix variable shadowing
-
-Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
-
-diff --git a/common/cudata.h b/common/cudata.h
-index 8397f05..7f132e6 100644
---- a/common/cudata.h
-+++ b/common/cudata.h
-@@ -48,7 +48,7 @@ enum PartSize
-     SIZE_2NxnD, // asymmetric motion partition, 2Nx(3N/2) + 2Nx( N/2)
-     SIZE_nLx2N, // asymmetric motion partition, ( N/2)x2N + (3N/2)x2N
-     SIZE_nRx2N, // asymmetric motion partition, (3N/2)x2N + ( N/2)x2N
--    NUM_SIZES
-+    PART_NUM_SIZES
- };
- 
- enum PredMode
diff --git a/media-libs/x265/files/x265-3.6-test-ns.patch b/media-libs/x265/files/x265-3.6-test-ns.patch
deleted file mode 100644
index 86cadade6a09..000000000000
--- a/media-libs/x265/files/x265-3.6-test-ns.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-Namespace functions for multi-bitdepth builds so that libraries are self-contained.
-
---- source.orig/common/param.h
-+++ source/common/param.h
-@@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param
- int x265_param_apply_profile(x265_param *, const char *profile);
- int x265_param_parse(x265_param *p, const char *name, const char *value);
- int x265_zone_param_parse(x265_param* p, const char* name, const char* value);
-+void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis);
-+void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis);
-+void x265_picture_free(x265_picture *);
-+x265_zone *x265_zone_alloc(int zoneCount, int isZoneFile);
-+void x265_zone_free(x265_param *param);
-+FILE* x265_csvlog_open(const x265_param *);
-+void x265_csvlog_frame(const x265_param *, const x265_picture *);
-+void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int pady, int argc, char** argv);
-+void x265_dither_image(x265_picture *, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth);
-+int x265_encoder_reconfig(x265_encoder *, x265_param *);
-+x265_picture *x265_picture_alloc(void);
-+void x265_picture_init(x265_param *param, x265_picture *pic);
- #define PARAM_NS X265_NS
- #endif
- }
---- source.orig/encoder/api.cpp
-+++ source/encoder/api.cpp
-@@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_par
-     if (p->rc.zoneCount || p->rc.zonefileCount)
-     {
-         int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : p->rc.zoneCount;
--        param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
--        latestParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
--        zoneParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
-+        param->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
-+        latestParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
-+        zoneParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
-     }
- 
-     x265_copy_params(param, p);
-@@ -216,7 +216,7 @@ x265_encoder *x265_encoder_open(x265_par
-     /* Try to open CSV file handle */
-     if (encoder->m_param->csvfn)
-     {
--        encoder->m_param->csvfpt = x265_csvlog_open(encoder->m_param);
-+        encoder->m_param->csvfpt = PARAM_NS::x265_csvlog_open(encoder->m_param);
-         if (!encoder->m_param->csvfpt)
-         {
-             x265_log(encoder->m_param, X265_LOG_ERROR, "Unable to open CSV log file <%s>, aborting\n", encoder->m_param->csvfn);
-@@ -321,7 +321,7 @@ int x265_encoder_reconfig(x265_encoder*
-     if (encoder->m_latestParam->rc.zoneCount || encoder->m_latestParam->rc.zonefileCount)
-     {
-         int zoneCount = encoder->m_latestParam->rc.zonefileCount ? encoder->m_latestParam->rc.zonefileCount : encoder->m_latestParam->rc.zoneCount;
--        save.rc.zones = x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount);
-+        save.rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount);
-     }
-     x265_copy_params(&save, encoder->m_latestParam);
-     int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in);
-@@ -637,7 +637,7 @@ void x265_vmaf_encoder_log(x265_encoder*
-         encoder->fetchStats(&stats, sizeof(stats));
-         int padx = encoder->m_sps.conformanceWindow.rightOffset;
-         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
--        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-+        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-     }
- }
- #endif
-@@ -872,7 +872,7 @@ void x265_alloc_analysis_data(x265_param
-     return;
- 
- fail:
--    x265_free_analysis_data(param, analysis);
-+    PARAM_NS::x265_free_analysis_data(param, analysis);
- }
- 
- void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis)
---- source.orig/encoder/encoder.cpp
-+++ source/encoder/encoder.cpp
-@@ -186,8 +186,8 @@ void Encoder::create()
-         {
-             m_dupBuffer[i] = (AdaptiveFrameDuplication*)x265_malloc(sizeof(AdaptiveFrameDuplication));
-             m_dupBuffer[i]->dupPic = NULL;
--            m_dupBuffer[i]->dupPic = x265_picture_alloc();
--            x265_picture_init(p, m_dupBuffer[i]->dupPic);
-+            m_dupBuffer[i]->dupPic = PARAM_NS::x265_picture_alloc();
-+            PARAM_NS::x265_picture_init(p, m_dupBuffer[i]->dupPic);
-             m_dupBuffer[i]->dupPlane = NULL;
-             m_dupBuffer[i]->dupPlane = X265_MALLOC(char, framesize);
-             m_dupBuffer[i]->dupPic->planes[0] = m_dupBuffer[i]->dupPlane;
-@@ -756,7 +756,7 @@ int Encoder::setAnalysisData(x265_analys
-         curFrame->m_analysisData = (*analysis_data);
-         curFrame->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
-         curFrame->m_analysisData.numPartitions = m_param->num4x4Partitions;
--        x265_alloc_analysis_data(m_param, &curFrame->m_analysisData);
-+        PARAM_NS::x265_alloc_analysis_data(m_param, &curFrame->m_analysisData);
-         if (m_param->maxCUSize == 16)
-         {
-             if (analysis_data->sliceType == X265_TYPE_IDR || analysis_data->sliceType == X265_TYPE_I)
-@@ -860,7 +860,7 @@ void Encoder::destroy()
-         for (uint32_t i = 0; i < DUP_BUFFER; i++)
-         {
-             X265_FREE(m_dupBuffer[i]->dupPlane);
--            x265_picture_free(m_dupBuffer[i]->dupPic);
-+            PARAM_NS::x265_picture_free(m_dupBuffer[i]->dupPic);
-             X265_FREE(m_dupBuffer[i]);
-         }
- 
-@@ -1968,7 +1968,7 @@ int Encoder::encode(const x265_picture*
- 
-             /* Free up inputPic->analysisData since it has already been used */
-             if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE))
--                x265_free_analysis_data(m_param, &outFrame->m_analysisData);
-+                PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
- 
-             if (pic_out)
-             {
-@@ -2046,7 +2046,7 @@ int Encoder::encode(const x265_picture*
-                     writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData);
-                     pic_out->analysisData.saveParam = pic_out->analysisData.saveParam;
-                     if (m_param->bUseAnalysisFile)
--                        x265_free_analysis_data(m_param, &pic_out->analysisData);
-+                        PARAM_NS::x265_free_analysis_data(m_param, &pic_out->analysisData);
-                 }
-             }
-             if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion))
-@@ -2061,7 +2061,7 @@ int Encoder::encode(const x265_picture*
-                 writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData);
-             }
-             if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)
--                x265_free_analysis_data(m_param, &outFrame->m_analysisData);
-+                PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData);
-             if (m_param->internalCsp == X265_CSP_I400)
-             {
-                 if (slice->m_sliceType == P_SLICE)
-@@ -2199,7 +2199,7 @@ int Encoder::encode(const x265_picture*
-                 uint32_t heightInCU = (m_param->sourceHeight + m_param->maxCUSize - 1) >> m_param->maxLog2CUSize;
-                 frameEnc->m_analysisData.numCUsInFrame = widthInCU * heightInCU;
-                 frameEnc->m_analysisData.numPartitions = m_param->num4x4Partitions;
--                x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
-+                PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData);
-                 frameEnc->m_analysisData.poc = frameEnc->m_poc;
-                 if (m_param->rc.bStatRead)
-                     readAnalysisFile(&frameEnc->m_analysisData, frameEnc->m_poc, frameEnc->m_lowres.sliceType);
-@@ -2210,7 +2210,7 @@ int Encoder::encode(const x265_picture*
-                 for (int i = 0; i < m_param->rc.zonefileCount; i++)
-                 {
-                     if (m_param->rc.zones[i].startFrame == frameEnc->m_poc)
--                        x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
-+                        PARAM_NS::x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam);
-                 }
-             }
- 
-@@ -2353,7 +2353,7 @@ int Encoder::encode(const x265_picture*
-                 analysis->numCUsInFrame  = numCUsInFrame;
-                 analysis->numCuInHeight = heightInCU;
-                 analysis->numPartitions  = m_param->num4x4Partitions;
--                x265_alloc_analysis_data(m_param, analysis);
-+                PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
-             }
-             /* determine references, setup RPS, etc */
-             m_dpb->prepareEncode(frameEnc);
-@@ -4264,7 +4264,7 @@ void Encoder::readAnalysisFile(x265_anal
-         else if (fread(val, size, readSize, fileOffset) != readSize)\
-     {\
-         x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
--        x265_free_analysis_data(m_param, analysis);\
-+        PARAM_NS::x265_free_analysis_data(m_param, analysis);\
-         m_aborted = true;\
-         return;\
-     }\
-@@ -4300,7 +4300,7 @@ void Encoder::readAnalysisFile(x265_anal
-         if (poc != curPoc || feof(m_analysisFileIn))
-         {
-             x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
--            x265_free_analysis_data(m_param, analysis);
-+            PARAM_NS::x265_free_analysis_data(m_param, analysis);
-             return;
-         }
-     }
-@@ -4334,7 +4334,7 @@ void Encoder::readAnalysisFile(x265_anal
-     if (m_param->scaleFactor)
-         analysis->numPartitions *= factor;
-     /* Memory is allocated for inter and intra analysis data based on the slicetype */
--    x265_alloc_analysis_data(m_param, analysis);
-+    PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
- 
-     if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
-     {
-@@ -4587,7 +4587,7 @@ void Encoder::readAnalysisFile(x265_anal
-     else if (fread(val, size, readSize, fileOffset) != readSize)\
-     {\
-         x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\
--        x265_free_analysis_data(m_param, analysis);\
-+        PARAM_NS::x265_free_analysis_data(m_param, analysis);\
-         m_aborted = true;\
-         return;\
-     }\
-@@ -4624,7 +4624,7 @@ void Encoder::readAnalysisFile(x265_anal
-         if (poc != curPoc || feof(m_analysisFileIn))
-         {
-             x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc);
--            x265_free_analysis_data(m_param, analysis);
-+            PARAM_NS::x265_free_analysis_data(m_param, analysis);
-             return;
-         }
-     }
-@@ -4655,7 +4655,7 @@ void Encoder::readAnalysisFile(x265_anal
-     analysis->numCuInHeight = cuLoc.heightInCU;
- 
-     /* Memory is allocated for inter and intra analysis data based on the slicetype */
--    x265_alloc_analysis_data(m_param, analysis);
-+    PARAM_NS::x265_alloc_analysis_data(m_param, analysis);
- 
-     if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL)
-     {
-@@ -5257,7 +5257,7 @@ void Encoder::readAnalysisFile(x265_anal
-     if (fread(val, size, readSize, fileOffset) != readSize)\
-     {\
-     x265_log(NULL, X265_LOG_ERROR, "Error reading analysis 2 pass data\n"); \
--    x265_alloc_analysis_data(m_param, analysis); \
-+    PARAM_NS::x265_alloc_analysis_data(m_param, analysis); \
-     m_aborted = true; \
-     return; \
- }\
-@@ -5271,7 +5271,7 @@ void Encoder::readAnalysisFile(x265_anal
-     if (poc != curPoc || feof(m_analysisFileIn))
-     {
-         x265_log(NULL, X265_LOG_WARNING, "Error reading analysis 2 pass data: Cannot find POC %d\n", curPoc);
--        x265_free_analysis_data(m_param, analysis);
-+        PARAM_NS::x265_free_analysis_data(m_param, analysis);
-         return;
-     }
-     /* Now arrived at the right frame, read the record */
-@@ -5378,7 +5378,7 @@ void Encoder::writeAnalysisFile(x265_ana
-     if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
-     {\
-         x265_log(NULL, X265_LOG_ERROR, "Error writing analysis data\n");\
--        x265_free_analysis_data(m_param, analysis);\
-+        PARAM_NS::x265_free_analysis_data(m_param, analysis);\
-         m_aborted = true;\
-         return;\
-     }\
-@@ -5600,7 +5600,7 @@ void Encoder::writeAnalysisFileRefine(x2
-     if (fwrite(val, size, writeSize, fileOffset) < writeSize)\
-     {\
-     x265_log(NULL, X265_LOG_ERROR, "Error writing analysis 2 pass data\n"); \
--    x265_free_analysis_data(m_param, analysis); \
-+    PARAM_NS::x265_free_analysis_data(m_param, analysis); \
-     m_aborted = true; \
-     return; \
- }\
---- source.orig/common/param.cpp
-+++ source/common/param.cpp
-@@ -102,7 +102,7 @@ x265_param *x265_param_alloc()
- 
- void x265_param_free(x265_param* p)
- {
--    x265_zone_free(p);
-+    PARAM_NS::x265_zone_free(p);
- #ifdef SVT_HEVC
-      x265_free(p->svtHevcParam);
- #endif
---- source.orig/encoder/api.cpp
-+++ source/encoder/api.cpp
-@@ -604,7 +604,7 @@ fail:
-         *pi_nal = 0;
- 
-     if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart)
--        x265_csvlog_frame(encoder->m_param, pic_out);
-+        PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out);
- 
-     if (numEncoded < 0)
-         encoder->m_aborted = true;
-@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc,
-         encoder->fetchStats(&stats, sizeof(stats));
-         int padx = encoder->m_sps.conformanceWindow.rightOffset;
-         int pady = encoder->m_sps.conformanceWindow.bottomOffset;
--        x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-+        PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv);
-     }
- }
- 
diff --git a/media-libs/x265/files/x265-3.6-test-ns_2.patch b/media-libs/x265/files/x265-3.6-test-ns_2.patch
deleted file mode 100644
index 63308e5bb48d..000000000000
--- a/media-libs/x265/files/x265-3.6-test-ns_2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- source.orig/encoder/encoder.cpp
-+++ source/encoder/encoder.cpp
-@@ -1478,7 +1478,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out)
-     if (m_exportedPic)
-     {
-         if (!m_param->bUseAnalysisFile && m_param->analysisSave)
--            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-+            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
- 
-         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
- 
---- a/common/threadpool.cpp
-+++ b/common/threadpool.cpp
-@@ -25,6 +25,7 @@
- #include "common.h"
- #include "threadpool.h"
- #include "threading.h"
-+#include "param.h"
- 
- #include <new>
- 
-@@ -314,7 +315,7 @@ ThreadPool* ThreadPool::allocThreadPools(x265_param* p, int& numPools, bool isTh
-                    sprintf(nextCount, "%d", cpusPerNode[i]);
-              strcat(poolString, nextCount);
-          }
--         x265_param_parse(p, "pools", poolString);
-+         PARAM_NS::x265_param_parse(p, "pools", poolString);
-      }
- #endif
-     if (p->numaPools && *p->numaPools)
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 1e911d56a156..9a9ecb2a8da7 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -5,6 +5,7 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
     <flag name="10bit">Add support for producing 10bits HEVC.</flag>
     <flag name="12bit">Add support for producing 12bits HEVC.</flag>
     <flag name="numa">Build with support for NUMA nodes.</flag>
diff --git a/media-libs/x265/x265-3.6-r1.ebuild b/media-libs/x265/x265-4.3.ebuild
index 85019f90db39..22243d1eadfd 100644
--- a/media-libs/x265/x265-3.6-r1.ebuild
+++ b/media-libs/x265/x265-4.3.ebuild
@@ -1,38 +1,56 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake flag-o-matic multilib-minimal multibuild
+inherit cmake-multilib edo flag-o-matic multibuild
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
 HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	MY_P="${PN}-${PV}"
+	EGIT_REPO_URI="https://github.com/Multicorewareinc/x265.git"
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
-	MY_P="${PN}_${PV}"
+	SRC_URI="https://github.com/Multicorewareinc/x265/releases/download/${PV}/x265_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}_${PV}"
 fi
 
-S="${WORKDIR}/${MY_P}/source"
-unset MY_P
+S="${S}/source"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/209"
-IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
+# See X265_BUILD in CMakeLists.txt
+SLOT="0/217"
+
+IUSE="+10bit +12bit numa test vmaf"
+# amd64
+IUSE+=" cet"
+# arm64
+IUSE+=" cpu_flags_arm_asimd cpu_flags_arm_asimddp cpu_flags_arm_i8mm cpu_flags_arm_sve cpu_flags_arm_sve2"
+REQUIRED_USE+="
+	cpu_flags_arm_asimddp? ( cpu_flags_arm_asimd )
+	cpu_flags_arm_i8mm? ( cpu_flags_arm_asimddp )
+	cpu_flags_arm_sve? ( cpu_flags_arm_i8mm )
+	cpu_flags_arm_sve2? ( cpu_flags_arm_sve )
+"
+# ppc*
+IUSE+=" cpu_flags_ppc_vsx2"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+	vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}"
 ASM_DEPEND=">=dev-lang/nasm-2.13"
 BDEPEND="
 	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
+	abi_x86_64? ( ${ASM_DEPEND} )
+	arm64? ( ${ASM_DEPEND} )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9999-arm.patch"
@@ -41,17 +59,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
 	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
 
-	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
-
-	"${FILESDIR}/${PN}-3.6-test-ns.patch"
-	"${FILESDIR}/${PN}-3.6-test-ns_2.patch"
+	"${FILESDIR}/${PN}-4.1-test-ns.patch"
 
-	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
 	"${FILESDIR}/${PN}-3.6-code-cleanup_2.patch"
 	"${FILESDIR}/${PN}-3.6-code-cleanup_3.patch"
-	"${FILESDIR}/${PN}-3.6-code-cleanup_4.patch"
 
-	"${FILESDIR}/${PN}-cmake-min-version-3.28.patch"
+	"${FILESDIR}/${PN}-4.1-vmaf.patch"
 )
 
 pkg_setup() {
@@ -61,6 +74,25 @@ pkg_setup() {
 	)
 }
 
+src_prepare() {
+	cmake_src_prepare
+
+	sed -r -e 's/(set\(ARM_ARGS -O3)/# \1/g' -i CMakeLists.txt || die
+
+	# fix hardcoded path
+	# libvmaf ERROR could not read model from path: "/usr/local/share/model/vmaf_v0.6.1.json"
+	sed -e "s#/usr/local/share/model/#${EPREFIX}/usr/share/vmaf/model/#g" -i x265.h || die
+
+	if [[ ${PV} != 9999 ]]; then
+		# sanity check subslot to kick would be drive by bumpers
+		local detected_soversion
+		detected_soversion="$(sed -n -e 's/set(X265_BUILD \(.*\))/\1/p' CMakeLists.txt)"
+		if [[ "${SLOT#0/}" != "${detected_soversion}" ]]; then
+			die "Sub slot ${SLOT#0/} doesn't match upstream specified ABI ${detected_soversion}."
+		fi
+	fi
+}
+
 # By default, the library and the encoder is configured for only one output bit
 # depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
 # files with a different bit depth, which is annoying. However, upstream
@@ -111,8 +143,12 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA="$(usex numa)"
-		-DENABLE_SVT_HEVC="no" # missing
-		-DENABLE_VTUNE="no" # missing
+		-DENABLE_ALPHA="yes"
+		-DENABLE_MULTIVIEW="yes"
+		-DENABLE_SVT_HEVC="no" # broken
+		-DENABLE_SCC_EXT="yes"
+		-DENABLE_LIBVMAF="$(usex vmaf)"
+		-DENABLE_VTUNE="no" # missing Vtune
 		-DGIT_ARCHETYPE=1 #814116
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
@@ -138,6 +174,26 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ ${ABI} == amd64 ]]; then
+		mycmakeargs+=(
+			-DENABLE_CET=$(usex cet)
+		)
+	fi
+
+	if [[ ${ABI} == arm64 ]]; then
+		mycmakeargs+=(
+			-DENABLE_NEON=$(usex cpu_flags_arm_asimd)
+			-DENABLE_NEON_DOTPROD=$(usex cpu_flags_arm_asimddp)
+			-DENABLE_NEON_I8MM=$(usex cpu_flags_arm_i8mm)
+			-DENABLE_SVE=$(usex cpu_flags_arm_sve)
+			-DENABLE_SVE2=$(usex cpu_flags_arm_sve2)
+			-DENABLE_SVE2_BITPERM=OFF # TODO: cpu_flags_arm_sve_bitperm?
+
+			# Requires simd extensions (neon being a proxy for the bare minimum)
+			-DENABLE_TESTS=$(usex test $(usex !cpu_flags_arm_asimd) OFF)
+		)
+	fi
+
 	if [[ ${ABI} = ppc* ]] ; then
 		# upstream uses mix of altivec + power8 vectors
 		# it's impossible to enable altivec without CPU_POWER8
@@ -149,6 +205,13 @@ multilib_src_configure() {
 		)
 	fi
 
+	# Explicitly only supports 64-bit RISC-V
+	if [[ ${ARCH} == riscv ]] && [[ ${ABI} =~ 64 ]]; then
+		# RISC-V Vector Extension
+		-DENABLE_RVV=OFF # TODO: cpu_flags_risvc_v?
+		-DENABLE_TESTS=OFF # Requires the above extension
+	fi
+
 	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
 	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
 		multibuild_foreach_variant x265_variant_src_configure
@@ -162,7 +225,7 @@ multilib_src_configure() {
 		mycmakeargs+=(
 			-DEXTRA_LIB="${liblist}"
 			-DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-			-DLINKED_10BIT"=$(usex 10bit)"
+			-DLINKED_10BIT="$(usex 10bit)"
 			-DLINKED_12BIT="$(usex 12bit)"
 		)
 	fi
@@ -180,7 +243,7 @@ multilib_src_compile() {
 
 x265_variant_src_test() {
 	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
-		"${BUILD_DIR}/test/TestBench" || die
+		edo "${BUILD_DIR}/test/TestBench" --nobench
 	else
 		einfo "Unit tests check only assembly."
 		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 961e78ee122b..22243d1eadfd 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,21 +10,34 @@ HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	MY_P="${PN}-${PV}"
+	EGIT_REPO_URI="https://github.com/Multicorewareinc/x265.git"
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+	SRC_URI="https://github.com/Multicorewareinc/x265/releases/download/${PV}/x265_${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
-	MY_P="${PN}_${PV}"
+	S="${WORKDIR}/${PN}_${PV}"
 fi
 
-S="${WORKDIR}/${MY_P}/source"
-unset MY_P
+S="${S}/source"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/215"
-IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test vmaf"
+# See X265_BUILD in CMakeLists.txt
+SLOT="0/217"
+
+IUSE="+10bit +12bit numa test vmaf"
+# amd64
+IUSE+=" cet"
+# arm64
+IUSE+=" cpu_flags_arm_asimd cpu_flags_arm_asimddp cpu_flags_arm_i8mm cpu_flags_arm_sve cpu_flags_arm_sve2"
+REQUIRED_USE+="
+	cpu_flags_arm_asimddp? ( cpu_flags_arm_asimd )
+	cpu_flags_arm_i8mm? ( cpu_flags_arm_asimddp )
+	cpu_flags_arm_sve? ( cpu_flags_arm_i8mm )
+	cpu_flags_arm_sve2? ( cpu_flags_arm_sve )
+"
+# ppc*
+IUSE+=" cpu_flags_ppc_vsx2"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -52,8 +65,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6-code-cleanup_3.patch"
 
 	"${FILESDIR}/${PN}-4.1-vmaf.patch"
-
-	"${FILESDIR}/${PN}-cmake-min-version-3.28.patch"
 )
 
 pkg_setup() {
@@ -72,8 +83,14 @@ src_prepare() {
 	# libvmaf ERROR could not read model from path: "/usr/local/share/model/vmaf_v0.6.1.json"
 	sed -e "s#/usr/local/share/model/#${EPREFIX}/usr/share/vmaf/model/#g" -i x265.h || die
 
-	# TODO check so_name via
-	# X265_BUILD 215
+	if [[ ${PV} != 9999 ]]; then
+		# sanity check subslot to kick would be drive by bumpers
+		local detected_soversion
+		detected_soversion="$(sed -n -e 's/set(X265_BUILD \(.*\))/\1/p' CMakeLists.txt)"
+		if [[ "${SLOT#0/}" != "${detected_soversion}" ]]; then
+			die "Sub slot ${SLOT#0/} doesn't match upstream specified ABI ${detected_soversion}."
+		fi
+	fi
 }
 
 # By default, the library and the encoder is configured for only one output bit
@@ -157,6 +174,26 @@ multilib_src_configure() {
 		)
 	fi
 
+	if [[ ${ABI} == amd64 ]]; then
+		mycmakeargs+=(
+			-DENABLE_CET=$(usex cet)
+		)
+	fi
+
+	if [[ ${ABI} == arm64 ]]; then
+		mycmakeargs+=(
+			-DENABLE_NEON=$(usex cpu_flags_arm_asimd)
+			-DENABLE_NEON_DOTPROD=$(usex cpu_flags_arm_asimddp)
+			-DENABLE_NEON_I8MM=$(usex cpu_flags_arm_i8mm)
+			-DENABLE_SVE=$(usex cpu_flags_arm_sve)
+			-DENABLE_SVE2=$(usex cpu_flags_arm_sve2)
+			-DENABLE_SVE2_BITPERM=OFF # TODO: cpu_flags_arm_sve_bitperm?
+
+			# Requires simd extensions (neon being a proxy for the bare minimum)
+			-DENABLE_TESTS=$(usex test $(usex !cpu_flags_arm_asimd) OFF)
+		)
+	fi
+
 	if [[ ${ABI} = ppc* ]] ; then
 		# upstream uses mix of altivec + power8 vectors
 		# it's impossible to enable altivec without CPU_POWER8
@@ -168,6 +205,13 @@ multilib_src_configure() {
 		)
 	fi
 
+	# Explicitly only supports 64-bit RISC-V
+	if [[ ${ARCH} == riscv ]] && [[ ${ABI} =~ 64 ]]; then
+		# RISC-V Vector Extension
+		-DENABLE_RVV=OFF # TODO: cpu_flags_risvc_v?
+		-DENABLE_TESTS=OFF # Requires the above extension
+	fi
+
 	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
 	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
 		multibuild_foreach_variant x265_variant_src_configure
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.24.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.24.ebuild
index eaa50e112d5d..c5f582378c00 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.24.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.24.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 8bbdb01e5eb5..b66c432c08e8 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,13 +1,3 @@
-DIST discord-1.0.159-discord_desktop_core.distro 506735 BLAKE2B f0793b02f19f5797b674af4edf0d7d80022bac9a7f8dc634658f9eef1b6962d88d256bc2c7ad5632f4b28d9653d18439db7821f62ee7cec227104e254c83dd71 SHA512 2317991821271cccd5ffd3650431f9cc59e7bd640fc682b87c9cee7f4dad944ab4e033075aaff421a15d4dc6994fe059155832a0fe56ef42731eb456694b5b07
-DIST discord-1.0.159-discord_erlpack.distro 1820785 BLAKE2B 189abcc61b6b84607e87eec1d7cf34b562042e36aa3e31d67ee16f41d316a2c2848e23f5bef056c5bbf78524bf8e4f9ce353b657d473f855a501c7d61a6bfd04 SHA512 c5c77f907b86de877b3e03e8fe35031528e7b2f03554c84e2bff97d8e8d26b6a86611a0e393407bb1242aedbe4898f1d2c8233861bd07fa0ae2f0606c0c8feb7
-DIST discord-1.0.159-discord_game_utils.distro 2815490 BLAKE2B 52fb3de1c4c9e4166dde3b361193e39f7a40ed3c2a1e5aae716baf162cb398310e958ca74e939ab4745fcdc694140dcfbaa77d10e4c633f58735f3ae5b6f8092 SHA512 417e5fdbf7341588abf135578e7f30bd4f08d97bc96bb3e64a8fee43ff908eaac11de5d78b85ad03366334833fe022db1fde914c655e4af816f24d41fd0de54c
-DIST discord-1.0.159-discord_krisp.distro 35626135 BLAKE2B d0d3327e5eceafdef2cedd9818ab88d7cf018eadaca21a2806b5d58ea004be6ace300dd213511c82f30ac3b8abf75af6f3432a849dcb70ec1b843737408f45a8 SHA512 510761d9b25997c1e71d0f823066790924e845e5f294c650b5d038a3b761c29fb9910dae6bcf562c73cb3fef2dc1ec4c73f512f426bb146164dc6c8b9a8f702c
-DIST discord-1.0.159-discord_rpc.distro 27468 BLAKE2B b833274842348158e53e19d1661b3c996675b35732d91048518f6a7c78d47d661ed51a32be3a28c1fd4e2e62df48f831e3a31a7021b85d450262ae3f7d51050d SHA512 5826f81904b7b8d5be06f98254d353f2e21fc3bf51b08673a92619153a62f02f90ebca633229670785b18e6e20ca680e384ecd856bff055619a6a433d3ac85c8
-DIST discord-1.0.159-discord_spellcheck.distro 8941627 BLAKE2B 127d97250f036f5339c031025a9690865eea621d4ff3bad090f507fbb787c5c69ad906ca617cef8fea0922ba3966e1a2815e20b590e6a0dbaf928af09482ca84 SHA512 0233a43bab269947d4f5a1c9d616348641a65ccccf7ffac3f389ed8f9fe39eea44673589b7ab3d4ccfc20df77169fa8108fda5ab612dc085e1f71577ad3ad5e6
-DIST discord-1.0.159-discord_utils.distro 4109369 BLAKE2B 6372fcd5aa1a8ca6cd237236d6e0761dc4616cdbedebfbb59c32991fabf951583afc16ca64ca051cb9b04ba0fe7c73760e42d1ae391235cdfc2b6e32011c9d72 SHA512 26e1c4c5dc82423cb5b5ab3b4597c8d8d24a9bdc6543771524a178a0deab1f34d0602525c6f30eb29c4ebfbd9f2a9a369ad3427e609388bcf187b868b559f235
-DIST discord-1.0.159-discord_voice.distro 36856071 BLAKE2B fbce5da97eff42e42ce225e5edefad86192c32b8d1e020d96a053d04033e1e6f17dfad9d8d2ab0088b2c539b1f05c258848eee540045b02e8630aa83c47ea859 SHA512 0f17e48fcef921c2a743dba4ab60e4a8ebf6c7616fc9b029920094ba10ee48e4c04ed36dbab9f988ea7d43430432ec748597e24e96d8ec362675556f0cd12398
-DIST discord-1.0.159-discord_zstd.distro 298305 BLAKE2B 3449f293b143f134bbfec07bef14f9d09cd6da97bcfbc8d8d2028cbcade14176c9479c149f550a1278f16a61bf72eb32f9423baa2c19f054b87f49ae62840f09 SHA512 04d706a2fc3d8dd0a1354bbd8e5e41fc41104f11e7244bc5755577234819856fa81bdb1a74e3a621c61ccc7490c217b4a373c8b997525dce200b05f205ff46a3
-DIST discord-1.0.159.distro 89995747 BLAKE2B fa602f3f5ac2e96db5e55e1604c4ae3c55787105b7f72e630a2292ec336bd9cff7de09d750ee68096d7ff6dbdddf7afaf14f3826ed182b9dacdd2507fdf3bd86 SHA512 4c83350f4db5e5b4b6f44aac2c449152be65a1481bf3973765aeb15cffc0b18e0718d610174c68eec9ab789ca59663ca8ba23c056296d8d9895ebd69e1fbc4a8
 DIST discord-1.0.160-discord_desktop_core.distro 507536 BLAKE2B a98a0ede6865548eb4de9d3e6e8a052a09f48bf60258cc13bad186f38bf00da622d7fc90f60f32876b18e9df8f9943a442538391798839ecf9ce12dfc34460fc SHA512 9ce231bad5becf60aba3c6cb19b2b1c9eb32057d71c6e3215acc97be5d3dd05429035fc9f0e19ebfc04ff9ebfcba6dbaf07bcad4e23a82ce10d4ed3101236469
 DIST discord-1.0.160-discord_erlpack.distro 1819192 BLAKE2B 03806ae617ad57c1e3413b53bdf93ab470cc004db5dbad80dd531481d1e115d2ea463c51dcfcd3cfda044eae139835f9d4111b0c2f01a5da4bf63b8714264cf7 SHA512 5e5786debabeb8420afb8fbfc4c269110c94fa1d5ad6192ef6cc4c9ac5ca842b1e3e6706a19f06848093d03a45a5584b2369127b655f5765c02dbbc570094927
 DIST discord-1.0.160-discord_game_utils.distro 2814479 BLAKE2B d0abaf0d332ec369e3cd888713825ba70eb53ab658fca3d6f546c4b8b7e666a1b86b6b8ca4c9fcfd55dcaeb7dc463e9ffea26ff597d3ac0f33dafcb502a24872 SHA512 0f2331d04260d09cc7b7f9dd2dd86aff3827a5e08f69a2405b51e22a210706748e563a653fb062d391cb841e9d9de97794a1e1c3b3cfce2a8b2bd959d0780c43
@@ -18,4 +8,14 @@ DIST discord-1.0.160-discord_utils.distro 4121709 BLAKE2B 2fc8d4571e63b2e998f4cc
 DIST discord-1.0.160-discord_voice.distro 36731921 BLAKE2B a34c8707ebff7cd900e2eae31349815d4c7e9d994b1126a822cc3a99f789b771928ac9d1e7ea797546fcf669ff65f024c2edfa283d87f33bbb4abcf8a9460152 SHA512 97fa6e00228cb9acec1492a3a7830201befac96df23ecdfa0e9c8b2528348b4abe893fc918f21db970212872a12703913bd84b2f8a763d27850da73fc65d1532
 DIST discord-1.0.160-discord_zstd.distro 293107 BLAKE2B 53bbdeccce553b405f7983d690544fbfb062100fd1e78760b0dc829669354df05c57de9b6f2d89d17856cc3013f3f03ee20da47e637dd6a5621e50cf2110ae42 SHA512 6ca005c0a9c4b4bfcd77fb5d147544f252bf479ee164a2d554a6805c4744136c7227fb086821f84672288159d67fbb3a9bdfc69a592c488ad2336c52f54885ca
 DIST discord-1.0.160.distro 89933906 BLAKE2B fb1f3916739679ea32de7ca9442231aeae13f32d93afd66deb39f966a4e1d1efd3302f71f6c11626739f765b7dd4f6768b145a24dfda4cab4677bef1960fb15c SHA512 bc20f2cf21fbc721eb4fe5928f08046ade622b1826b5228c7d116a409093af8646a538a86698e2b4f4d54732e8fe7c4ad605edc61abf1d028ecbbd58686077ed
+DIST discord-1.0.161-discord_desktop_core.distro 509354 BLAKE2B 3599fe091d523455dbdba679ea88994ab60abaa24d3b89094a3646c0096e29462496bdfd8e92b7c312be6e23a999aaa8468921eeb0d9d18d71efd5643d6f0e56 SHA512 fae9d655aadd50a24a4f2095a2b1e6028c18621aef87122c4623f3e035af9a5235ca4e105dbd6c3f46d0d1d218117e03347229080e0c2fc12506b7c41e0fc8a4
+DIST discord-1.0.161-discord_erlpack.distro 1823017 BLAKE2B 3fb1f4a70dcbb3dd7290bc1dca81d82377d4123bc8cd6534f5479980459881973d9eaf513a912590aa8fef6acd1a48a4f43f3b9c5e0383f8b940924d514e5c2b SHA512 a020628b85785dbbb622ffa4ec0f35291501f39f39ec265d9d80b727626366196141b9571eddbc1c4360655f2ddcb3d539b9c0cd693b8e0781489db653cd31a9
+DIST discord-1.0.161-discord_game_utils.distro 2817627 BLAKE2B 463cd2c20092a9a0e77e0aa1e8738468aed7f52a31cdc15421265f3e74b08933da7e3dbd0ab010090fb9f39774a6e0923d2e64cab9181d614ee7123de1881519 SHA512 d31f057f406853b0ea0bf49121356cf20f4333c3375a31e74c3bb5d355e998487b0b6c81c9f8b1937447dbae5e94e66fb1bb95053077a29e78489e8447ce9418
+DIST discord-1.0.161-discord_krisp.distro 34950565 BLAKE2B d1070a3b4ebcec734c34d68cdb2884f636ccf678c5478a70b0bb627652e85779b0f5211a50fb52bbc81929340b652a7b02eb88bbac8e16b78cd0de9039c73624 SHA512 3f69e85c6070f9e09f1eecf36bab4675071328e670f0f8eb75d1896e43691b2bd37688e30e399684ea1db0d26c24e5b6b0e17bb904116414b2434a97531fbbb9
+DIST discord-1.0.161-discord_rpc.distro 27471 BLAKE2B ed3ef2f604e94ba79b584da64548d8e5c3a084051457cfc9dd827aa9cad71714235850952849926a74354faa7ac055d991c2a1be47afd0dd585254f6cff3dad9 SHA512 22518af7de9e084cca58734323c42a390597eca8edcdfad3579d8d7b66e8f069e479d3af15e518659280d5e8f89d3f56c3489f1427aa45574b766ea3ec36cf77
+DIST discord-1.0.161-discord_spellcheck.distro 8970920 BLAKE2B 28a4d40e3e72f1af63c4f233ddc6d580e9f94e158f48ffc4b3263575da24d6b644696d8d2e8131cb36920b43942db49fb9d9d5b6f2a7b347bca1fe1ea36eb4cc SHA512 29fad269ac890f4353739427c36d88290041db01be941b6c22771c4b1c2bda700ec71b8153983a796edc1faac1ae135d2c94ac03bf08c7a361263e8642bf02ff
+DIST discord-1.0.161-discord_utils.distro 4110454 BLAKE2B b343fcd601287ceaea3f5137f34166e58abe922acc26b5722214dc91b4555bf0e0ed2a5142c624cd6d415f47053f9fef87b593b508901a727d1b4df49d5718b9 SHA512 f1209ce9e2110b0a53b60ca73dd5751fdea94a3da710f468d21cd486bd4dd41d29a4efaeaa3832b58f19849cdde0a7d4d28cb1eb45ee2026c52767a30ef08ce4
+DIST discord-1.0.161-discord_voice.distro 36885037 BLAKE2B ef9e7f769f5884b0ecc929ed7f03f739a585aabcb37e6153cdd55221d418565d932cb57d42da656674001b51f547fc74d8c62292a902bacc520efbeca1e1e38d SHA512 da791538455ade47f3e90c29916f245a1cb900f5c3b3d76f30df25cfea999ce03f7e5bd5014625a89869b731414d1e81b378fb1a40255c47da742c01768323df
+DIST discord-1.0.161-discord_zstd.distro 292820 BLAKE2B b5da4c5dc37627e0fe21320d9476986aa622768183816c462c9225eb676a70fe7936556a3546c4551403c82112d4ea3713cebd77cc743cc120e9a342510c2463 SHA512 50de69108efdd6188578c285f92b84aa5d6280bafaff348bfdc8b874434a236e6819a0432c45aa7fd27093e8afb38de1e00f4e357d1a4a1c53ed53c8e7d88d53
+DIST discord-1.0.161.distro 89945699 BLAKE2B d12655781b0790d55630ccc11e55f5c5a9f986f4cc9bbb0657bd6b776a902eb14906148e3df4c234a3e7239a63d30e7fc2bb0403e50eae9f27086af138d4f671 SHA512 242535d9cac8dc7164bfa75afcb487e3ef12bc6f09a04e11218b78b8dfc292907a587ca3b636083dc76b352aef55b1bd623b4883cddc7bbae44bd828ec711d1d
 DIST discord-disable-breaking-updates-2f26748a667045d26bc19841f1a731b4be7a7514.py 1299 BLAKE2B b6c923c450a28405e2a439e0d1b8a83e01e0536c62095fafbae74612aa4e891df733aa13999ce6a8be3618fd14e154aec802aa4ee21aad1303b05626ffd23314 SHA512 a7ef493a216c71a5b02685cff6866bfc3940aaf9cdc73b58859c962d0d33b613349289ef7027359f184f42dddaed486b84f6d85b9023ab8530ab7ba66431c3c7
diff --git a/net-im/discord/discord-1.0.159.ebuild b/net-im/discord/discord-1.0.161.ebuild
index 008eb84bc750..008eb84bc750 100644
--- a/net-im/discord/discord-1.0.159.ebuild
+++ b/net-im/discord/discord-1.0.161.ebuild
diff --git a/net-libs/libnice/libnice-0.1.24.ebuild b/net-libs/libnice/libnice-0.1.24.ebuild
index 3fc8e0e2c4b7..a8166b47dfbf 100644
--- a/net-libs/libnice/libnice-0.1.24.ebuild
+++ b/net-libs/libnice/libnice-0.1.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://libnice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+gnutls gtk-doc +introspection test +upnp"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/nghttp2/nghttp2-1.70.0.ebuild b/net-libs/nghttp2/nghttp2-1.70.0.ebuild
index ef768578fa1c..7165d5007a94 100644
--- a/net-libs/nghttp2/nghttp2-1.70.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.70.0.ebuild
@@ -21,7 +21,7 @@ else
 		verify-sig? ( https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
 
-	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"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-nghttp2 )"
 fi
 
diff --git a/net-libs/nghttp3/nghttp3-1.18.0.ebuild b/net-libs/nghttp3/nghttp3-1.18.0.ebuild
index 4dd74b458cd3..3e49119f00e0 100644
--- a/net-libs/nghttp3/nghttp3-1.18.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.18.0.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-nghttp3 )"
 fi
 
diff --git a/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild
index ce9290bbc318..78ba22867e10 100644
--- a/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz.asc )
 	"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ngtcp2 )"
 fi
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 5d0380ebad55..4a4870af83a6 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -8,5 +8,3 @@ DIST node-v24.21.0.tar.xz 57357488 BLAKE2B a907f5f23668d4a2839aebb9520417c0c4ee1
 DIST node-v26.10.0.tar.xz 62055788 BLAKE2B 8018d789113d5d9594532a607f6e3daa292799a9dfb8b0c659bbb6163d0b9198ddb9e40197b30f7e1b62c073aca80ee3411d1701670384155b3330c7e6077fd0 SHA512 03b8d85bc2ec964db3e738be4682782935221b9c0fdd9a48f39a0241acc7b92bc3c6ef4f89707e451406e9f0a350b821d905b777bcbd5ed9a2d46ecb0d7328e2
 DIST node-v26.11.1.tar.xz 63107044 BLAKE2B 3c15e4cbc08c1223a2617154a429c1e478d52f40e41a2429ac4e1f05de2ce0f8236cd50c6a10207e2e556f5fce686f534d5cc525bed806d230af29fedefba485 SHA512 a98c245732fef21dc6c0bafaa032ab1331a5efaed8d7758310dd65bf9d2bd16d5305ab06e1149b7fffe0ad0f0d945b874e30e1b9a72069a0ab064f357a225294
 DIST node-v26.3.0.tar.xz 59811728 BLAKE2B a69f067e63883239a38397484b3f92ff4ca8a1ae651cb4f3328e6f994f16260751f3f64ff6c914aeef837d1f6deade8649979f091a044c86c8467058bb0065d2 SHA512 464a24d2536f3ead35325cfb268355fcc66a95260519174cba847efa4037ae2529c24781595b11aae45810570f41c0d2f2d7db2ed365baccda1017a7131a7efe
-DIST node-v26.8.2.tar.xz 61307988 BLAKE2B ba0c72f1085592dae974334a5ddf5da4f664b9c7ebee8361b8a4a5ba2bb588f21b9940272962e71bcfc5f64e9aa91b850b464a975d6ed57092c305480428f2c8 SHA512 b4331a00b3c1aa508d374b6d09042dedf4fd78c21c5aec46b3017c5fa1aa67f670bc5ef20449e625cd40b775b9582c44f018e321637883cbfc567e46c174c64e
-DIST node-v26.9.0.tar.xz 62715128 BLAKE2B c9ebac8330181bd2343a94b775559a605b4e41614d27657f124a41c881f2aabd4f8428870fd9cfeb0d0363782eba9da321c313049c3712fcfddc3d4f374b0e60 SHA512 765ba01c504d8c07288d0acea8d95ea52395984528a81de9e2cc280467034af23781cdbd9e94089d3744e7bba45ef84ce68e7c836308636322bc5b21111d2984
diff --git a/net-libs/nodejs/nodejs-26.8.2-r2.ebuild b/net-libs/nodejs/nodejs-26.8.2-r2.ebuild
deleted file mode 100644
index 8c52cc3a9939..000000000000
--- a/net-libs/nodejs/nodejs-26.8.2-r2.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit check-reqs flag-o-matic linux-info ninja-utils pax-utils
-inherit python-any-r1 shell-completion toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BlueOak-1.0.0 BSD BSD-2 MIT npm? ( Artistic-2 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu +inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=app-arch/brotli-1.1.0:=
-	dev-db/sqlite:3
-	>=dev-cpp/ada-4.0.0:=
-	>=dev-cpp/simdutf-7.3.4:=
-	>=dev-libs/libuv-1.52.1:=
-	>=dev-libs/simdjson-4.6.9:=
-	>=net-dns/c-ares-1.34.8:=
-	>=net-libs/nghttp2-1.70.0:=
-	>=net-libs/nghttp3-1.18.0:=
-	virtual/zlib:=
-	system-icu? ( >=dev-libs/icu-78:= )
-	system-ssl? (
-		>=net-libs/ngtcp2-1.25.0:=
-		>=dev-libs/openssl-3.5.8:0=
-	)
-	!system-ssl? ( >=net-libs/ngtcp2-1.25.0:=[-gnutls] )
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/libatomic-stub
-	)"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-26.6.0-gcc17.patch
-	"${FILESDIR}"/${PN}-26.6.0-format-cstdlib.patch
-	"${FILESDIR}"/${PN}-26.6.0-v8-climits.patch
-	"${FILESDIR}"/${PN}-26.8.2-add-missing-vector-include.patch
-	"${FILESDIR}"/${PN}-26.8.2-add-missing-funcational-inc.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-	# https://github.com/nodejs/node/issues/62676 - Can't build Temporal with system ICU.
-	if use system-icu; then
-		ewarn "The ES2026 'Temporal' datetime feature/object is not available when using system-icu."
-		ewarn "Please consider whether this is desirable for your use case."
-		ewarn "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Temporal"
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e '/append("-arch")/{N;d;}' tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel &&
-		PATCHES+=( "${FILESDIR}"/${PN}-24.1.0-paxmarking.patch )
-
-	use ppc64 &&
-		PATCHES+=(	"${FILESDIR}/${PN}-24.11.1-restore-ppc64be.patch" )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# The warnings are *so* noisy and make build.logs massive
-	append-cxxflags $(test-flags-CXX -Wno-template-id-cdtor)
-	# https://bugs.gentoo.org/931514
-	use arm64 && append-flags $(test-flags-CXX -mbranch-protection=none)
-
-	local myconf=(
-		--ninja
-		--shared-ada
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-nghttp3
-		--shared-ngtcp2
-		--shared-simdjson
-		--shared-simdutf
-		--shared-sqlite
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		# No Temporal support: https://github.com/nodejs/node/issues/62676
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		# Full embedded ICU (Temporal works)
-		myconf+=( --with-intl=full-icu )
-	else
-		# Default embedded subset (Temporal works, saves space over full-icu)
-		myconf+=( --with-intl=small-icu )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	eninja -C out/Release
-	# There's just a plain make target for the FFI tests, and it doesn't support ninja.
-	use test && emake build-ffi-tests
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		# Strict match for LICENSE files to avoid purging actual logic (e.g. license.js)
-		# which breaks npm.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				\( -iname "LICEN?E*" -not -name "*.js" -not -name "*.json" \) \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-dotenv.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-http2-client-set-priority.js
-		test/parallel/test-http2-priority-event.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		# Unreliable when using system libraries and ASLR.
-		# The variations between snapshot generation passes appear limited to memory
-		# allocation pointers leaking into the serialised V8 blob array; the actual
-		# bytecode and engine structures remain consistently... consistent.
-		test/parallel/test-snapshot-reproducible.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-tls-session-timeout.js
-		test/sequential/test-util-debug.js
-	)
-	use inspector ||
-		drop_tests+=(
-			test/parallel/test-inspector-emit-protocol-event.js
-			test/parallel/test-inspector-network-arbitrary-data.js
-			test/parallel/test-inspector-network-domain.js
-			test/parallel/test-inspector-network-fetch.js
-			test/parallel/test-inspector-network-http.js
-			test/sequential/test-watch-mode.mjs
-		)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn " in your current shell"
-	fi
-
-	if use system-icu; then
-		ewarn ""
-		ewarn "Node.js was built with USE='system-icu'."
-		ewarn "The JavaScript 'Temporal' API has been disabled."
-		ewarn "If you need full ES2026+ compliance, rebuild with USE='-system-icu'."
-		ewarn ""
-	fi
-}
diff --git a/net-libs/nodejs/nodejs-26.9.0.ebuild b/net-libs/nodejs/nodejs-26.9.0.ebuild
deleted file mode 100644
index e7753b9168f5..000000000000
--- a/net-libs/nodejs/nodejs-26.9.0.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{13..14} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit check-reqs flag-o-matic linux-info ninja-utils pax-utils
-inherit python-any-r1 shell-completion toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BlueOak-1.0.0 BSD BSD-2 MIT npm? ( Artistic-2 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu +inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )
-	x86? ( cpu_flags_x86_sse2 )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=app-arch/brotli-1.1.0:=
-	dev-db/sqlite:3
-	>=dev-cpp/ada-4.0.0:=
-	>=dev-cpp/simdutf-7.3.4:=
-	>=dev-libs/libuv-1.52.1:=
-	>=dev-libs/simdjson-4.6.11:=
-	>=net-dns/c-ares-1.34.8:=
-	>=net-libs/nghttp2-1.70.0:=
-	>=net-libs/nghttp3-1.18.0:=
-	virtual/zlib:=
-	system-icu? ( >=dev-libs/icu-78:= )
-	system-ssl? (
-		>=net-libs/ngtcp2-1.25.0:=
-		>=dev-libs/openssl-3.5.8:0=
-	)
-	!system-ssl? ( >=net-libs/ngtcp2-1.25.0:=[-gnutls] )
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/libatomic-stub
-	)"
-BDEPEND="${PYTHON_DEPS}
-	app-alternatives/ninja
-	sys-apps/coreutils
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-26.6.0-gcc17.patch
-	"${FILESDIR}"/${PN}-26.6.0-format-cstdlib.patch
-	"${FILESDIR}"/${PN}-26.6.0-v8-climits.patch
-	"${FILESDIR}"/${PN}-26.8.2-add-missing-funcational-inc.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-	# https://github.com/nodejs/node/issues/62676 - Can't build Temporal with system ICU.
-	if use system-icu; then
-		ewarn "The ES2026 'Temporal' datetime feature/object is not available when using system-icu."
-		ewarn "Please consider whether this is desirable for your use case."
-		ewarn "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Temporal"
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e '/append("-arch")/{N;d;}' tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel &&
-		PATCHES+=( "${FILESDIR}"/${PN}-24.1.0-paxmarking.patch )
-
-	use ppc64 &&
-		PATCHES+=(	"${FILESDIR}/${PN}-24.11.1-restore-ppc64be.patch" )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-lto
-	# The warnings are *so* noisy and make build.logs massive
-	append-cxxflags $(test-flags-CXX -Wno-template-id-cdtor)
-	# https://bugs.gentoo.org/931514
-	use arm64 && append-flags $(test-flags-CXX -mbranch-protection=none)
-
-	local myconf=(
-		--ninja
-		--shared-ada
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-nghttp3
-		--shared-ngtcp2
-		--shared-simdjson
-		--shared-simdutf
-		--shared-sqlite
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		# No Temporal support: https://github.com/nodejs/node/issues/62676
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		# Full embedded ICU (Temporal works)
-		myconf+=( --with-intl=full-icu )
-	else
-		# Default embedded subset (Temporal works, saves space over full-icu)
-		myconf+=( --with-intl=small-icu )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	eninja -C out/Release
-	# There's just a plain make target for the FFI tests, and it doesn't support ninja.
-	use test && emake build-ffi-tests
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
-		doenvd "${T}"/50npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		# Strict match for LICENSE files to avoid purging actual logic (e.g. license.js)
-		# which breaks npm.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				\( -iname "LICEN?E*" -not -name "*.js" -not -name "*.json" \) \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	local drop_tests=(
-		test/parallel/test-dns.js
-		test/parallel/test-dns-resolveany-bad-ancount.js
-		test/parallel/test-dns-setserver-when-querying.js
-		test/parallel/test-dotenv.js
-		test/parallel/test-fs-mkdir.js
-		test/parallel/test-fs-read-stream.js
-		test/parallel/test-fs-utimes-y2K38.js
-		test/parallel/test-fs-watch-recursive-add-file.js
-		test/parallel/test-http2-client-set-priority.js
-		test/parallel/test-http2-priority-event.js
-		test/parallel/test-process-euid-egid.js
-		test/parallel/test-process-get-builtin.mjs
-		test/parallel/test-process-initgroups.js
-		test/parallel/test-process-setgroups.js
-		test/parallel/test-process-uid-gid.js
-		test/parallel/test-release-npm.js
-		# Unreliable when using system libraries and ASLR.
-		# The variations between snapshot generation passes appear limited to memory
-		# allocation pointers leaking into the serialised V8 blob array; the actual
-		# bytecode and engine structures remain consistently... consistent.
-		test/parallel/test-snapshot-reproducible.js
-		test/parallel/test-socket-write-after-fin-error.js
-		test/parallel/test-strace-openat-openssl.js
-		test/sequential/test-tls-session-timeout.js
-		test/sequential/test-util-debug.js
-	)
-	use inspector ||
-		drop_tests+=(
-			test/parallel/test-inspector-emit-protocol-event.js
-			test/parallel/test-inspector-network-arbitrary-data.js
-			test/parallel/test-inspector-network-domain.js
-			test/parallel/test-inspector-network-fetch.js
-			test/parallel/test-inspector-network-http.js
-			test/sequential/test-watch-mode.mjs
-		)
-	rm -f "${drop_tests[@]}" || die "disabling tests failed"
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	if use npm; then
-		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
-		ewarn " in your current shell"
-	fi
-
-	if use system-icu; then
-		ewarn ""
-		ewarn "Node.js was built with USE='system-icu'."
-		ewarn "The JavaScript 'Temporal' API has been disabled."
-		ewarn "If you need full ES2026+ compliance, rebuild with USE='-system-icu'."
-		ewarn ""
-	fi
-}
diff --git a/net-misc/chrony/chrony-4.9.ebuild b/net-misc/chrony/chrony-4.9.ebuild
index bfaa748c3ae6..514b858d2856 100644
--- a/net-misc/chrony/chrony-4.9.ebuild
+++ b/net-misc/chrony/chrony-4.9.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; 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
 fi
 
diff --git a/net-misc/freerdp/freerdp-3.32.1.ebuild b/net-misc/freerdp/freerdp-3.32.1.ebuild
index db2ec3d43f08..00793ccacb25 100644
--- a/net-misc/freerdp/freerdp-3.32.1.ebuild
+++ b/net-misc/freerdp/freerdp-3.32.1.ebuild
@@ -17,7 +17,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
 		verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
 fi
diff --git a/net-misc/tuba/tuba-0.11.1-r1.ebuild b/net-misc/tuba/tuba-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..889a529c075b
--- /dev/null
+++ b/net-misc/tuba/tuba-0.11.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson optfeature vala
+
+MY_P=${P^}
+DESCRIPTION="Browse the Fediverse (GTK client)"
+HOMEPAGE="
+	https://tuba.geopjr.dev/
+	https://github.com/GeopJr/Tuba/
+"
+SRC_URI="
+	https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="exif gstreamer spell webkit"
+
+DEPEND="
+	app-crypt/libsecret[introspection,vala]
+	>=dev-libs/glib-2.80.0:2
+	dev-libs/icu:=
+	>=dev-libs/json-glib-1.4.4[introspection]
+	>=dev-libs/libgee-0.8.5:0.8[introspection]
+	dev-libs/libxml2:=
+	>=gui-libs/gtk-4.19:4[introspection]
+	>=gui-libs/libadwaita-1.8:1[introspection,vala]
+	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
+	net-libs/libsoup:3.0[introspection,vala]
+	exif? (
+		>=media-libs/gexiv2-0.14:0.16=[introspection,vala]
+	)
+	gstreamer? (
+		>=gui-libs/gtk-4.13.4:4[gstreamer,introspection]
+		media-libs/gstreamer[introspection]
+	)
+	spell? (
+		app-text/libspelling[vala]
+	)
+	webkit? (
+		net-libs/webkit-gtk:6
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	$(vala_depend)
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		# disable calling updaters (see pkg_post*)
+		-Ddistro=true
+		$(meson_feature spell spelling)
+		# not packaged
+		-Dclapper=disabled
+		$(meson_feature gstreamer)
+		$(meson_feature webkit in-app-browser)
+		$(meson_feature exif gexiv2)
+		-Dunifiedpush=disabled
+	)
+
+	vala_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dosym dev.geopjr.Tuba /usr/bin/tuba
+}
+
+pkg_postinst() {
+	optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
+
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-proxy/haproxy/haproxy-3.0.14.ebuild b/net-proxy/haproxy/haproxy-3.0.14.ebuild
index 94af87a49fed..f3ca6940acd2 100644
--- a/net-proxy/haproxy/haproxy-3.0.14.ebuild
+++ b/net-proxy/haproxy/haproxy-3.0.14.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="amd64 ~arm64 ~ppc x86"
+	KEYWORDS="amd64 arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5d19ac2d83cc..c96d6ab86fb8 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -363,6 +363,7 @@ llvm-core/clang-common cet
 sys-devel/gcc cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
+media-libs/x265 cet
 
 # Matthew Turnbull <sparky@bluefang-logic.com> (2024-01-24)
 # Cinnamon wayland support is experimental and incomplete.
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index bd7ff7d70d2d..be3ec54bdc0e 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -239,14 +239,6 @@ dev-libs/libjwt
 # No revdeps left.  Removal on 2026-10-16.  Bug #982608.
 dev-python/overrides
 
-# Lukas Schmelting <lschmelting@posteo.com> (2026-09-06)
-# Most revdeps still need gexiv2-0.16 compatibility fixes
-# See: https://bugs.gentoo.org/982084
-=media-libs/gexiv2-0.16*
->=gnome-base/nautilus-50
->=media-gfx/shotwell-33
->=app-misc/localsearch-3.12
-
 # Arthur Zamarin <arthurzam@gentoo.org> (2026-09-11)
 # EAPI=7, old PYTHON_COMPAT, doesn't work with spotify for a long time,
 # upstream inactive for a decade.
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 222fe61900a1..4c031ab20576 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1 +1,2 @@
 DIST MUMPS_5.3.5.tar.gz 3940501 BLAKE2B f1767483bb23744a2c5ed11b0823c5b023377d5212abbe29a177cce5b5e51e6f2f391d7caa17022646e36c9e4b4fb4af80b03ac6cf8e89f37502ed960138bbbe SHA512 6e3bb081f38af8540ada7b4fb54c6e766739c854e2a3dd253e3e012eee05dae30064b1b4a8d7493f10691725aba4cc9e80544b0fe5b71670cb0b2726ccfc4439
+DIST MUMPS_5.4.1.tar.gz 4027725 BLAKE2B e3ad2b759f3888dbe75b7dd4e8f325da07930a39b2dad62e25b7d95022f517942baa4d4db0899d9f2ef21a228cdd0a2ab10380c7aa334b98ed0ab41987910de8 SHA512 fbac0c449246e9db97080993ffc5187e948ed1d2fe2e51dcbffa044f3dd6dfb4ad13fe672baa6f1e2b7a0f29f58611ee375d43a6c4316702a67f8e6d0694412d
diff --git a/sci-libs/mumps/mumps-5.4.1.ebuild b/sci-libs/mumps/mumps-5.4.1.ebuild
new file mode 100644
index 000000000000..945a646f798a
--- /dev/null
+++ b/sci-libs/mumps/mumps-5.4.1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2 flag-o-matic multilib toolchain-funcs
+
+MYP=MUMPS_${PV}
+
+DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
+HOMEPAGE="https://mumps-solver.org/"
+SRC_URI="https://mumps-solver.org/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
+IUSE="doc examples metis mpi +scotch static-libs"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	virtual/blas
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
+	mpi? (
+		sci-libs/scalapack
+		virtual/mpi[fortran]
+	)
+	!mpi? ( virtual/lapack )
+	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
+"
+DEPEND="${RDEPEND}"
+
+_get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]} || die
+}
+
+static_to_shared() {
+	local libstatic=${1}
+	shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(ver_cut 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+
+		if [[ $(_get_version_component_count) -ge 1 ]] ; then
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(ver_cut 1)) || die
+		fi
+
+		ln -s ${soname} ${libdir}/${libname}$(get_libname) || die
+	fi
+}
+
+src_prepare() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862903
+	#
+	# There is an upstream mailing list but it seems to be broken. I *think*,
+	# because it's all in French. I tried and failed to report the bug.
+	#
+	# Do not trust with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# workaround for gcc10 (bug #743442)
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	sed -e "s;^\(CC\s*=\).*;\1$(tc-getCC);" \
+		-e "s;^\(FC\s*=\).*;\1$(tc-getFC);" \
+		-e "s;^\(FL\s*=\).*;\1$(tc-getFC);" \
+		-e "s;^\(AR\s*=\).*;\1$(tc-getAR) cr ;" \
+		-e "s;^\(RANLIB\s*=\).*;\1$(tc-getRANLIB);" \
+		-e "s;^\(LIBBLAS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs blas);" \
+		-e "s;^\(INCPAR\s*=\).*;\1;" \
+		-e 's;^\(LIBPAR\s*=\).*;\1$(SCALAP);' \
+		-e "s;^\(OPTF\s*=\).*;\1${FFLAGS} -DALLOW_NON_INIT \$(PIC);" \
+		-e "s;^\(OPTC\s*=\).*;\1${CFLAGS} \$(PIC);" \
+		-e "s;^\(OPTL\s*=\).*;\1${LDFLAGS};" \
+		Make.inc/Makefile.inc.generic > Makefile.inc || die
+	# fixed a missing copy of libseq to libdir
+
+	default
+}
+
+src_configure() {
+	# We abuse LIBADD here to work around the fact that MUMPS is criminally
+	# underlinked.
+	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
+	local ord="-Dpord"
+
+	if use metis && use mpi; then
+		sed -i \
+			-e "s;#\s*\(LMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs parmetis);" \
+			-e "s;#\s*\(IMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --cflags parmetis);" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
+		ord="${ord} -Dparmetis"
+	elif use metis; then
+		sed -i \
+			-e "s;#\s*\(LMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs metis);" \
+			-e "s;#\s*\(IMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --cflags metis);" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
+		ord="${ord} -Dmetis"
+	fi
+	if use scotch && use mpi; then
+		sed -i \
+			-e "s;#\s*\(LSCOTCH\s*=\).*;\1-lptesmumps -lptscotch -lptscotcherr -lscotch;" \
+			-e "s;#\s*\(ISCOTCH\s*=\).*;\1-I${ESYSROOT}/usr/include/scotch;" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
+		ord="${ord} -Dptscotch"
+	elif use scotch; then
+		sed -i \
+			-e "s;#\s*\(LSCOTCH\s*=\).*;\1-lesmumps -lscotch -lscotcherr;" \
+			-e "s;#\s*\(ISCOTCH\s*=\).*;\1-I${ESYSROOT}/usr/include/scotch;" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
+		ord="${ord} -Dscotch"
+	fi
+	if use mpi; then
+		sed -i \
+			-e "s;^\(CC\s*=\).*;\1mpicc;" \
+			-e "s;^\(FC\s*=\).*;\1mpif90;" \
+			-e "s;^\(FL\s*=\).*;\1mpif90;" \
+			-e "s;^\(SCALAP\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs scalapack);" \
+			Makefile.inc || die
+		export LINK=mpif90
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
+	else
+		sed -i \
+			-e 's;PAR);SEQ);g' \
+			-e "s;^\(SCALAP\s*=\).*;\1;" \
+			-e 's;^LIBSEQNEEDED =;LIBSEQNEEDED = libseqneeded;g' \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs lapack)"
+		export LINK="$(tc-getFC)"
+	fi
+	sed -i -e "s;^\s*\(ORDERINGSF\s*=\).*;\1 ${ord};" Makefile.inc || die
+}
+
+src_compile() {
+	# Workaround #462602
+	export FAKEROOTKEY=1
+
+	# Use "-j1" to avoid a spurious race condition
+	emake -j1 c z s d PIC="-fPIC"
+	if ! use mpi; then
+		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+		LIBADD+=" -Llibseq -lmpiseq"
+		static_to_shared libseq/libmpiseq.a
+	fi
+
+	static_to_shared lib/libpord.a ${LIBADD}
+	static_to_shared lib/libmumps_common.a ${LIBADD}
+
+	local i
+	for i in c d s z; do
+		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
+	done
+
+	if use static-libs; then
+		emake clean
+		emake alllib
+	fi
+}
+
+src_test() {
+	emake all
+
+	local dotest
+	if use mpi; then
+		dotest="mpirun -np 2"
+	else
+		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
+	fi
+
+	cd examples
+	${dotest} ./ssimpletest < input_simpletest_real || die
+	${dotest} ./dsimpletest < input_simpletest_real || die
+	${dotest} ./csimpletest < input_simpletest_cmplx || die
+	${dotest} ./zsimpletest < input_simpletest_cmplx || die
+	einfo "The solutions should be close to (1,2,3,4,5)"
+	${dotest} ./c_example || die
+	einfo "The solution should be close to (1,2)"
+	emake clean
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/lib*.a
+	insinto /usr
+
+	doins -r include
+	if ! use mpi; then
+		dolib.so libseq/lib*$(get_libname)*
+		insinto /usr/include/mpiseq
+		doins libseq/*.h
+		use static-libs && dolib.a libseq/libmpiseq.a
+	fi
+
+	dodoc README ChangeLog VERSION
+	use doc && dodoc doc/*.pdf
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/sci-libs/scalapack/scalapack-2.2.2.ebuild b/sci-libs/scalapack/scalapack-2.2.2-r1.ebuild
index cda3dccb8dd0..77350eb9c886 100644
--- a/sci-libs/scalapack/scalapack-2.2.2.ebuild
+++ b/sci-libs/scalapack/scalapack-2.2.2-r1.ebuild
@@ -33,7 +33,12 @@ src_prepare() {
 		mkdir "${WORKDIR}/${PN}_static" || die
 	fi
 	# mpi does not have a pc file
-	sed -i -e 's/mpi//' scalapack.pc.in || die
+	# fix missing -L path
+	sed -i \
+		-e 's/mpi//' \
+		-e "/^libdir/s|@libdir@|${EPREFIX}/usr/$(get_libdir)|" \
+		scalapack.pc.in \
+		|| die
 }
 
 src_configure() {
diff --git a/sci-libs/scalapack/scalapack-2.2.3.ebuild b/sci-libs/scalapack/scalapack-2.2.3-r1.ebuild
index fc961262cfa0..2a6869906e71 100644
--- a/sci-libs/scalapack/scalapack-2.2.3.ebuild
+++ b/sci-libs/scalapack/scalapack-2.2.3-r1.ebuild
@@ -29,7 +29,12 @@ src_prepare() {
 		mkdir "${WORKDIR}/${PN}_static" || die
 	fi
 	# mpi does not have a pc file
-	sed -i -e 's/mpi//' scalapack.pc.in || die
+	# fix missing -L path
+	sed -i \
+		-e 's/mpi//' \
+		-e "/^libdir/s|@libdir@|${EPREFIX}/usr/$(get_libdir)|" \
+		scalapack.pc.in \
+		|| die
 }
 
 src_configure() {
diff --git a/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20260908.ebuild b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20260908.ebuild
index 3d590581a5f9..a34b8f94f35f 100644
--- a/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20260908.ebuild
+++ b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20260908.ebuild
@@ -13,4 +13,4 @@ DESCRIPTION="OpenPGP keys used by Brad King"
 HOMEPAGE="https://cmake.org/download/"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/sys-apps/groff/files/groff-1.24.2-libcxx-23-build-fix.patch b/sys-apps/groff/files/groff-1.24.2-libcxx-23-build-fix.patch
new file mode 100644
index 000000000000..7d4be013c256
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.24.2-libcxx-23-build-fix.patch
@@ -0,0 +1,22 @@
+Bug: https://savannah.gnu.org/bugs/index.php?68762
+Bug: https://bugs.gentoo.org/983511
+From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
+Date: Fri, 10 Apr 2026 02:49:08 -0500
+Subject: [PATCH] src/roff/troff/env.cpp: Rationalize `#include`s.
+
+* src/roff/troff/env.cpp: Rationalize header file inclusions, adding
+  "<stdlib.h>" and "<string.h>".
+--- a/src/roff/troff/env.cpp
++++ b/src/roff/troff/env.cpp
+@@ -24,6 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+ 
+ #include <errno.h> // errno
+ #include <math.h> // ceil(), fabs()
++#include <stdlib.h> // strtol()
++#include <string.h> // strchr(), strcpy(), strerror(), strncmp(),
++		    // strstr()
+ 
+ #include <vector>
+ #include <algorithm> // find()
+-- 
+2.56.0
diff --git a/sys-apps/groff/groff-1.24.2.ebuild b/sys-apps/groff/groff-1.24.2.ebuild
index 655a32617be8..4fbdf155145e 100644
--- a/sys-apps/groff/groff-1.24.2.ebuild
+++ b/sys-apps/groff/groff-1.24.2.ebuild
@@ -67,6 +67,7 @@ DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
 PATCHES=(
 	# bug #16108, bug #17580, bug #121502
 	"${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch
+	"${FILESDIR}"/${PN}-1.24.2-libcxx-23-build-fix.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/iproute2/iproute2-7.2.0.ebuild b/sys-apps/iproute2/iproute2-7.2.0.ebuild
index 7a33a3206a29..63101cbcd97a 100644
--- a/sys-apps/iproute2/iproute2-7.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-7.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${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
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5cd32ae5964e..a129c76638a6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,2 @@
-DIST portage-3.0.81.3.tar.bz2 1240401 BLAKE2B c4c1c1b4a629e35e2445ffda8720c3e7cd72f96d3970de0f43c0f1c52abcc12473ff5ed974ab99006e5ac723430f1c5fc83f4565454f1779b94a4501268d6b42 SHA512 cbf2488a91046aec23cbf6b6fa3cbef708dc052d14383a4c2ab0aa5e17d322ce773dd7e9422677dcfd4b3ad2ffa27023c1b16b21842319131944c16899550313
-DIST portage-3.0.82.1.tar.bz2 1307604 BLAKE2B 9732e200e7ff0803b45a9ffcd2863b4f656f3de3ff1f5177b0107f0ec83f48ccf3f2f0dcfc8c360972de6044384b70d5060ebc00651ed932ac2991fb76f4d2a9 SHA512 06f51d316dcac67a8d8a7bc16d480aff8dfdaf5886c7666ec86f7792ab644d744ea7fecff205eca902db5e3a13015db19de7b6afc6696082bfd5ccb34131a79e
 DIST portage-3.0.82.2.tar.bz2 1309279 BLAKE2B 1d73701cde8de87eaee5b1b16e936791578c61f072901b80efcb1fc86834b923c0967de036f48fe761444345dd81a726135b299564c9c4129508e79ce58b2902 SHA512 6c7384bfe5bbadf6672d2f24cb8b54d1d19d956620125fc6c60692c9fb60fb3402e4c1bf6a1b2c407c7a3a085690bebad893eca8d0687ed8efb3284d4fcd86ca
-DIST portage-3.0.82.tar.bz2 1304291 BLAKE2B 81a9ff4d99ebae6f30c24955def1b2b43ae7ae5bb7df3b5182e148b506a9f1e57bb460733eaf7d048f7d11d335a9381284dfdc5b935eb046891d8a4c8e5a9a71 SHA512 fb90f274eb7cf547bba6c936f2f8061c8f402b8cce515b522be590f11b256b8e0cb2a5ccd3371687ab83bacf03d6bc8df3d40a3c5383928b94cc96f5f72c3968
+DIST portage-3.0.83.tar.bz2 1358595 BLAKE2B 7de1b92075dea379bbd8f0c1dae82ac61012614dc6cd80ee969aca5ef08e029cee15c636fdf5c374bf38b00de7368c300c42ce433e0374bd812e2482dac855f2 SHA512 76188e335e25585b78e8945f48bfd17346cfc569ddf14ed8fa80b6fb55f8fcd5563abd357cb8fe20cd39ad2e33b562527fa89ccb65de071886f11e29fe7d6f17
diff --git a/sys-apps/portage/portage-3.0.81.3.ebuild b/sys-apps/portage/portage-3.0.81.3.ebuild
deleted file mode 100644
index 8eae43e1ea31..000000000000
--- a/sys-apps/portage/portage-3.0.81.3.ebuild
+++ /dev/null
@@ -1,235 +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} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/portage.git
-		https://github.com/gentoo/portage.git
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.27
-	>=dev-build/meson-1.3.0-r1
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)
-	doc? (
-		~app-text/docbook-xml-dtd-4.4
-		app-text/xmlto
-	)
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/scout
-	>=acct-user/portage-0-r4
-	>=app-arch/tar-1.27
-	app-arch/zstd
-	>=app-misc/pax-utils-0.1.17
-	dev-lang/python-exec:2
-	>=sys-apps/baselayout-2.9
-	>=sys-apps/findutils-4.9
-	!build? (
-		>=app-admin/eselect-1.2
-		app-portage/getuto
-		>=app-shells/bash-5.3:0
-		dev-util/debugedit
-		>=sec-keys/openpgp-keys-gentoo-release-20240703
-		>=sys-apps/sed-4.0.5
-		rsync-verify? (
-			app-alternatives/gpg[ssl(-)]
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-		)
-	)
-	kernel_linux? (
-		sys-apps/util-linux
-		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-		elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	)
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/coreutils-6.4
-		>=sys-apps/file-5.44-r3
-	)
-"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	if use prefix-guest; then
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-}
-
-src_configure() {
-	local code_only=false
-	python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
-	local emesonargs=(
-		-Dcode-only=${code_only}
-		-Deprefix="${EPREFIX}"
-		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc)
-		$(meson_use apidoc)
-		$(meson_use gentoo-dev)
-		$(meson_use ipc)
-		$(meson_use xattr)
-	)
-
-	if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then
-		emesonargs+=( -Dnative-extensions=true )
-	else
-		emesonargs+=( -Dnative-extensions=false )
-	fi
-
-	if use build; then
-		emesonargs+=( -Drsync-verify=false )
-	else
-		emesonargs+=( $(meson_use rsync-verify) )
-	fi
-
-	meson_src_configure
-	code_only=true
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local EPYTEST_XDIST=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl my_src_install
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
-	local scripts
-	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
-	python_replicate_script "${scripts[@]}"
-}
-
-my_src_install() {
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-		"${ED}/usr/lib/portage/${EPYTHON}"
-	)
-
-	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
-	python_optimize "${pydirs[@]}"
-}
-
-pkg_preinst() {
-	if ! use build && [[ -z ${ROOT} ]]; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-
-		env -u BINPKG_FORMAT \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.82.ebuild b/sys-apps/portage/portage-3.0.82.ebuild
deleted file mode 100644
index f0b14628b711..000000000000
--- a/sys-apps/portage/portage-3.0.82.ebuild
+++ /dev/null
@@ -1,235 +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} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit meson linux-info python-r1 tmpfiles
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="
-		https://anongit.gentoo.org/git/proj/portage.git
-		https://github.com/gentoo/portage.git
-	"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.27
-	>=dev-build/meson-1.3.0-r1
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch
-	!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)
-	doc? (
-		~app-text/docbook-xml-dtd-4.4
-		app-text/xmlto
-	)
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/scout
-	>=acct-user/portage-0-r4
-	>=app-arch/tar-1.27
-	app-arch/zstd
-	>=app-misc/pax-utils-0.1.17
-	dev-lang/python-exec:2
-	>=sys-apps/baselayout-2.9
-	>=sys-apps/findutils-4.9
-	!build? (
-		>=app-admin/eselect-1.2
-		app-portage/getuto
-		>=app-shells/bash-5.3:0
-		dev-util/debugedit
-		>=sec-keys/openpgp-keys-gentoo-release-20240703
-		>=sys-apps/sed-4.0.5
-		rsync-verify? (
-			app-alternatives/gpg[ssl(-)]
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-		)
-	)
-	kernel_linux? (
-		sys-apps/util-linux
-		elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-		elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	)
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/coreutils-6.4
-		>=sys-apps/file-5.44-r3
-	)
-"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	if use prefix-guest; then
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-}
-
-src_configure() {
-	local code_only=false
-	python_foreach_impl my_src_configure
-}
-
-my_src_configure() {
-	local emesonargs=(
-		-Dcode-only=${code_only}
-		-Deprefix="${EPREFIX}"
-		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc)
-		$(meson_use apidoc)
-		$(meson_use gentoo-dev)
-		$(meson_use ipc)
-		$(meson_use xattr)
-	)
-
-	if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then
-		emesonargs+=( -Dnative-extensions=true )
-	else
-		emesonargs+=( -Dnative-extensions=false )
-	fi
-
-	if use build; then
-		emesonargs+=( -Drsync-verify=false )
-	else
-		emesonargs+=( $(meson_use rsync-verify) )
-	fi
-
-	meson_src_configure
-	code_only=true
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local EPYTEST_XDIST=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl my_src_install
-	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
-
-	local scripts
-	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
-	python_replicate_script "${scripts[@]}"
-}
-
-my_src_install() {
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-		"${ED}/usr/lib/portage/${EPYTHON}"
-	)
-
-	meson_src_install
-	python_fix_shebang "${pydirs[@]}"
-	python_optimize "${pydirs[@]}"
-}
-
-pkg_preinst() {
-	if ! use build && [[ -z ${ROOT} ]]; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-
-		env -u BINPKG_FORMAT \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			ED="${ED}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
-
-pkg_postinst() {
-	# Warn about obsolete "enotice" script, bug #867010
-	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
-	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
-		eerror "Obsolete 'enotice' script detected!"
-		eerror "Please remove this from ${bashrc} to avoid problems."
-		eerror "See bug 867010 for more details."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.82.1.ebuild b/sys-apps/portage/portage-3.0.83.ebuild
index f0b14628b711..f0b14628b711 100644
--- a/sys-apps/portage/portage-3.0.82.1.ebuild
+++ b/sys-apps/portage/portage-3.0.83.ebuild
diff --git a/sys-block/nbd/nbd-3.27.1.ebuild b/sys-block/nbd/nbd-3.27.1.ebuild
index 5adf3443f644..20dbe6cfe047 100644
--- a/sys-block/nbd/nbd-3.27.1.ebuild
+++ b/sys-block/nbd/nbd-3.27.1.ebuild
@@ -21,22 +21,21 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug gnutls +netlink"
+IUSE="debug gnutls"
 
 RDEPEND="
 	>=dev-libs/glib-2.32.0
+	>=dev-libs/libnl-3.1
 	gnutls? ( >=net-libs/gnutls-2.12.0 )
-	netlink? ( >=dev-libs/libnl-3.1 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
 	app-text/docbook-sgml-dtd:4.5
 	app-text/docbook-sgml-utils
-"
-BDEPEND+="
 	dev-build/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -48,15 +47,15 @@ src_prepare() {
 }
 
 src_configure() {
-	# Needs Bison
-	unset YACC
+	# Needs Bison and flex
+	unset YACC LEX
 
 	local myeconfargs=(
 		--enable-lfs
+		--with-libnl
 		$(use_enable !debug syslog)
 		$(use_enable debug)
 		$(use_with gnutls)
-		$(use_with netlink libnl)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
index f4c092f88851..d18c8d1b476b 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -15,28 +15,28 @@ else
 	# Use auto-generated tarballs for now as there's no dist tarball available
 	# See https://github.com/NetworkBlockDevice/nbd/issues/198
 	SRC_URI="https://github.com/NetworkBlockDevice/nbd/archive/refs/tags/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-${P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug gnutls +netlink"
+IUSE="debug gnutls"
 
 RDEPEND="
 	>=dev-libs/glib-2.32.0
+	>=dev-libs/libnl-3.1
 	gnutls? ( >=net-libs/gnutls-2.12.0 )
-	netlink? ( >=dev-libs/libnl-3.1 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
 	app-text/docbook-sgml-dtd:4.5
 	app-text/docbook-sgml-utils
-"
-BDEPEND+="
 	dev-build/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -48,15 +48,15 @@ src_prepare() {
 }
 
 src_configure() {
-	# Needs Bison
-	unset YACC
+	# Needs Bison and flex
+	unset YACC LEX
 
 	local myeconfargs=(
 		--enable-lfs
+		--with-libnl
 		$(use_enable !debug syslog)
 		$(use_enable debug)
 		$(use_with gnutls)
-		$(use_with netlink libnl)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/sys-devel/bpf-toolchain/bpf-toolchain-16.1.0_p2.ebuild b/sys-devel/bpf-toolchain/bpf-toolchain-16.1.0_p2.ebuild
index 11312b4985f4..1a70b15a3e4e 100644
--- a/sys-devel/bpf-toolchain/bpf-toolchain-16.1.0_p2.ebuild
+++ b/sys-devel/bpf-toolchain/bpf-toolchain-16.1.0_p2.ebuild
@@ -40,7 +40,7 @@ LICENSE="
 	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+bin-symlinks custom-cflags +strip"
 
 RDEPEND="
diff --git a/sys-devel/crossdev/crossdev-20260623.ebuild b/sys-devel/crossdev/crossdev-20260623.ebuild
index ac045cbcd994..0b8860855656 100644
--- a/sys-devel/crossdev/crossdev-20260623.ebuild
+++ b/sys-devel/crossdev/crossdev-20260623.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 else
 	SRC_URI="https://distfiles.gentoo.org/pub/proj/toolchain/crossdev/${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
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/dwz/dwz-0.17.ebuild b/sys-devel/dwz/dwz-0.17.ebuild
index 2d1a4408ffe4..97d424c72e23 100644
--- a/sys-devel/dwz/dwz-0.17.ebuild
+++ b/sys-devel/dwz/dwz-0.17.ebuild
@@ -20,7 +20,7 @@ else
 	"
 	S="${WORKDIR}/${PN}"
 
-	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"
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-dwz )"
 fi
 
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index 7525642e5850..4649dc268217 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,2 +1,3 @@
 DIST sof-firmware-2025.12.2.tar.gz 13486442 BLAKE2B 284584e043404a65bbc2f04fcd78e9db4b1e844343a5fe1fd463e1021e92e7dcddbf8e5a8b620ca1e25d77a2469dec1804a0bafea02d3bcbfe175f64a92816a1 SHA512 5eb64665c2cb87967ff2aa81f7d39397dc6e813abea531e89c12bb5c0a15821e7cbfd8c485af196e37984c1cdf9ac72c93f9feea1205d9d71736d163f5af0084
 DIST sof-firmware-2026.09.1.tar.gz 17555075 BLAKE2B f2ef774241fb744fd562f433ffcc3c070c2413a66eb2e75eef2cb9d907483709485738d87ad221fa70d41a0d7195b99a58ec67b2d5d1402a885b18c2c45e3fa1 SHA512 9cc82037440b22820468fd1ce98ba8d833fd10e79b0470dfab634ec032b2e013e4a9d123ffba91977eb65ef4968ddffd776a6078630b73056627175ab855f04c
+DIST sof-firmware-2026.09.2.tar.gz 17550180 BLAKE2B 141801c34c3c8fba9dcc556cbe629310f3fb501c86eda3eb77d43b4de050d10b3d117045b46af7ccfec8e0d75284212587652f7ad3a8b84523ed84e047b1bd21 SHA512 016c3ba08fb73553fa581e8ce7b9c19ceb5b0575d79d50da46b158a4a3e71ac4a30eba6914fe45f9264f56bd9541453e319dbfe01a5fc57f3e7650f624be8f9f
diff --git a/sys-firmware/sof-firmware/sof-firmware-2026.09.2.ebuild b/sys-firmware/sof-firmware/sof-firmware-2026.09.2.ebuild
new file mode 100644
index 000000000000..11ee0ca3e520
--- /dev/null
+++ b/sys-firmware/sof-firmware/sof-firmware-2026.09.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sound Open Firmware (SOF) binary files"
+HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
+SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/sof-bin-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tools"
+
+RDEPEND="
+	tools? (
+		media-libs/alsa-lib
+		sys-libs/glibc
+	)
+"
+
+QA_PREBUILT="usr/bin/sof-ctl
+	usr/bin/sof-logger
+	usr/bin/sof-probes"
+
+src_install() {
+	dodir /lib/firmware/intel
+	dodir /usr/bin
+	FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" || die
+
+	# Drop tools if requested (i.e. useful for musl systems, where glibc
+	# is not available)
+	if ! use tools ; then
+		rm -rv "${D}"/usr/bin || die
+	fi
+}
+
+pkg_preinst() {
+	# Fix sof-ace-tplg directory symlink collisions
+	local sofpath="${EROOT}/lib/firmware/intel/sof-ace-tplg"
+	if [[ ! -L "${sofpath}" && -d "${sofpath}" ]] ; then
+		rm -r "${sofpath}" || die
+	fi
+}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index a8395f284d2d..c2dcba3abda2 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,3 +1 @@
-DIST udisks-2.10.2.tar.bz2 1791811 BLAKE2B 59c4f76860a33c2a453e2750a24d66cbc5e7b15ac6504a3332fc75792c4f41d49cd34957dcad9ee5fe8bd72959b46b9c61b38a2558e55ef19e32fbea8ec2fcd3 SHA512 8b2fb6d5a9b5c040f315073d0890cde2cad67f06684e607a31636012a515ec798c2129c3dbc8fcd6655d72b7b4a9485172e5e85795a0aeb4ff20a5ea76e690a8
-DIST udisks-2.11.1.tar.bz2 1972549 BLAKE2B 82d8745f34e626260c6bd62e54573af8033d2874570445bda2a7834afafefb4493c573bc9b5bf87adf83bf831c3e445d2ba0a9594ce043e0db94caf4937447fe SHA512 c2ef8c1068f109bcc858a897cb45af970442170fc8dd991d5692b463c7f4693fe4731e4e5010bc923588a7ee9f1c794630ad5fffef454a9d959bcf17e8bf704f
 DIST udisks-2.11.2.tar.bz2 1977535 BLAKE2B 664966674fbfb0c4ddd521d4736f852fa1f4fb83cdb6dfd4cc33d041675948bde25ab30206f5fe462aac741e173eb5edcc15cfd7faf1e834774392d91bab8640 SHA512 3996ac935cb330eb7f286f25a716da52ca374b14cc7b4f2e60a7e4b0b0745559607fa8c6d1e96e777b44eb8e07eb16e1ad6bc00b3051adea14e865df3efa2662
diff --git a/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch b/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch
deleted file mode 100644
index a9b48942ab72..000000000000
--- a/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Upstream: https://github.com/storaged-project/udisks/pull/1333
-
-From d5f0bc5aa005d116b513992a6ae8ee1fd2dd65a1 Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Sat, 7 Dec 2024 16:45:40 -0500
-Subject: [PATCH] build: use -export-dynamic instead of -export_dynamic
-
-GNU libtool accepts either, but slibtool's option parsing is more strict
-and just ends up passing -export_dynamic to the compiler, which
-obviously causes an error. Use -export-dynamic to fix building with
-slibtool.
---- a/modules/btrfs/Makefile.am
-+++ b/modules/btrfs/Makefile.am
-@@ -64,7 +64,7 @@ libudisks2_btrfs_la_CFLAGS =                                                   \
- 	$(NULL)
- 
- libudisks2_btrfs_la_LDFLAGS =                                                  \
--	-export_dynamic                                                        \
-+	-export-dynamic                                                        \
- 	-avoid-version                                                         \
- 	-module                                                                \
- 	-no-undefined                                                          \
---- a/modules/iscsi/Makefile.am
-+++ b/modules/iscsi/Makefile.am
-@@ -68,7 +68,7 @@ libudisks2_iscsi_la_CFLAGS =                                                   \
- 	$(NULL)
- 
- libudisks2_iscsi_la_LDFLAGS =                                                  \
--	-export_dynamic                                                        \
-+	-export-dynamic                                                        \
- 	-avoid-version                                                         \
- 	-module                                                                \
- 	-no-undefined                                                          \
---- a/modules/lsm/Makefile.am
-+++ b/modules/lsm/Makefile.am
-@@ -62,7 +62,7 @@ libudisks2_lsm_la_CFLAGS =                                                     \
- 	$(NULL)
- 
- libudisks2_lsm_la_LDFLAGS =                                                    \
--	-export_dynamic                                                        \
-+	-export-dynamic                                                        \
- 	-avoid-version                                                         \
- 	-module                                                                \
- 	-no-undefined                                                          \
---- a/modules/lvm2/Makefile.am
-+++ b/modules/lvm2/Makefile.am
-@@ -67,7 +67,7 @@ libudisks2_lvm2_la_CFLAGS =                                                    \
- 	$(NULL)
- 
- libudisks2_lvm2_la_LDFLAGS =                                                   \
--	-export_dynamic                                                        \
-+	-export-dynamic                                                        \
- 	-avoid-version                                                         \
- 	-module                                                                \
- 	-no-undefined                                                          \
--- 
-2.47.1
-
diff --git a/sys-fs/udisks/udisks-2.10.2-r1.ebuild b/sys-fs/udisks/udisks-2.10.2-r1.ebuild
deleted file mode 100644
index 279f33b3a05d..000000000000
--- a/sys-fs/udisks/udisks-2.10.2-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks/ https://github.com/storaged-project/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.114[daemon(+)]
-	>=sys-libs/libblockdev-3.3.0:=[cryptsetup,lvm?,nvme]
-	virtual/udev
-	acl? ( virtual/acl )
-	daemon? (
-		>=dev-libs/glib-2.68:2
-		>=dev-libs/libatasmart-0.19
-		>=dev-libs/libgudev-165:=
-	)
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-	lvm? ( sys-fs/lvm2 )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-block/parted-3
-	>=sys-apps/util-linux-2.30
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.1
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	>=dev-build/gtk-doc-am-1.3
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-	dev-libs/gobject-introspection-common
-	dev-build/autoconf-archive
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# dev-libs/gobject-introspection-common
-# dev-build/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.1-slibtool-export-dynamic.patch
-)
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	default
-
-	if ! use systemd ; then
-		sed -i -e 's:libsystemd-login:&disable:' configure || die
-	fi
-
-	# Added for bug # 782061
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-btrfs
-		--disable-gtk-doc
-		--disable-static
-		--localstatedir="${EPREFIX}"/var
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-udevdir="${EPREFIX}$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable daemon)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	# bug #865663
-	dotmpfiles data/tmpfiles.d/udisks2.conf
-}
-
-pkg_preinst() {
-	# Remove gtk-doc symlink, #597628
-	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
-		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-	tmpfiles_process udisks2.conf
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/udisks/udisks-2.11.1.ebuild b/sys-fs/udisks/udisks-2.11.1.ebuild
deleted file mode 100644
index a19bcef7f10f..000000000000
--- a/sys-fs/udisks/udisks-2.11.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks/ https://github.com/storaged-project/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux smart systemd"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.114[daemon(+)]
-	>=sys-libs/libblockdev-3.4.0:=[cryptsetup,lvm?,nvme,smart?]
-	virtual/udev
-	acl? ( virtual/acl )
-	daemon? (
-		>=dev-libs/glib-2.68:2
-		>=dev-libs/libgudev-165:=
-	)
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
-	lvm? ( sys-fs/lvm2 )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-block/parted-3
-	>=sys-apps/util-linux-2.30
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.1
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	>=dev-build/gtk-doc-am-1.3
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-	dev-libs/gobject-introspection-common
-	dev-build/autoconf-archive
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# dev-libs/gobject-introspection-common
-# dev-build/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	default
-
-	if ! use systemd ; then
-		sed -i -e 's:libsystemd-login:&disable:' configure || die
-	fi
-
-	# bug #782061
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-btrfs
-		--disable-gtk-doc
-		--disable-static
-		--localstatedir="${EPREFIX}"/var
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-udevdir="${EPREFIX}$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable daemon)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable nls)
-		$(use_enable smart)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	# bug #865663
-	dotmpfiles data/tmpfiles.d/udisks2.conf
-}
-
-pkg_preinst() {
-	# Remove gtk-doc symlink, #597628
-	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
-		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-	tmpfiles_process udisks2.conf
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild
index 35ef225f2cea..df574e5bad2d 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 BDEPEND="doc? (
diff --git a/sys-libs/libxcrypt/libxcrypt-4.5.2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.5.2.ebuild
index e0cd94f3543f..b7053c20618a 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.5.2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.5.2.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+compat static-libs +system test headers-only"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/readline/readline-8.3_p6.ebuild b/sys-libs/readline/readline-8.3_p6.ebuild
index 24a840f7f08a..0976a544fc48 100644
--- a/sys-libs/readline/readline-8.3_p6.ebuild
+++ b/sys-libs/readline/readline-8.3_p6.ebuild
@@ -78,7 +78,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if (( PLEVEL >= 0 )); 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="static-libs +unicode utils"
 
diff --git a/sys-libs/timezone-data/timezone-data-2026c.ebuild b/sys-libs/timezone-data/timezone-data-2026c.ebuild
index 782a7c56448d..5b89efc16001 100644
--- a/sys-libs/timezone-data/timezone-data-2026c.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2026c.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/tzdb-${PV}
 
 LICENSE="BSD public-domain"
 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="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-process/audit/audit-4.2.1.ebuild b/sys-process/audit/audit-4.2.1.ebuild
index 4c740a250624..ed9cae60ab70 100644
--- a/sys-process/audit/audit-4.2.1.ebuild
+++ b/sys-process/audit/audit-4.2.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/audit-userspace-${PV}"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="build gssapi io-uring ldap python ssl static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/procps/files/procps-4.0.5-hurd.patch b/sys-process/procps/files/procps-4.0.5-hurd.patch
new file mode 100644
index 000000000000..44c8a0643209
--- /dev/null
+++ b/sys-process/procps/files/procps-4.0.5-hurd.patch
@@ -0,0 +1,123 @@
+https://bugs.gentoo.org/984061
+https://gitlab.com/procps-ng/procps/-/merge_requests/286
+
+From c116ebd4b759ff79b391d18802a227738be9d94c Mon Sep 17 00:00:00 2001
+From: Svante Signell <svante.signell@gmail.com>
+Date: Wed, 11 Feb 2026 16:10:37 +0100
+Subject: [PATCH] Add support for GNU/Hurd
+
+---
+ library/pids.c                   | 12 ++++++++++++
+ library/readproc.c               |  4 ++++
+ library/uptime.c                 |  4 ++++
+ src/top/top.c                    |  6 ++++++
+ testsuite/ps.test/test-hugetlb.c |  2 +-
+ 5 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/library/pids.c b/library/pids.c
+index ed06930..721ee75 100644
+--- a/library/pids.c
++++ b/library/pids.c
+@@ -1038,9 +1038,15 @@ static inline int pids_items_check_failed (
+      * if (procps_pids_new(&info, PIDS_noop, 3) < 0)
+      *                            ^~~~~~~~~~~~~~~~
+      */
++/* (void*)items=0x3010<(void*)0x8000 causing FAIL:procps_pids new then unref */
++#ifdef __GNU__
++    if (numitems < 1)
++        return 1;
++#else
+     if (numitems < 1
+     || (void *)items < (void *)0x8000)      // twice as big as our largest enum
+         return 1;
++#endif
+ 
+     for (i = 0; i < numitems; i++) {
+         // a pids_item is currently unsigned, but we'll protect our future
+@@ -1517,8 +1523,10 @@ fresh_start:
+         pids_containers_check();
+ 
+     info->boot_tics = 0;
++#ifdef CLOCK_BOOTTIME
+     if (0 >= clock_gettime(CLOCK_BOOTTIME, &ts))
+         info->boot_tics = (ts.tv_sec + ts.tv_nsec * 1.0e-9) * info->hertz;
++#endif
+ 
+     if (NULL == info->read_something(info->get_PT, &info->get_proc))
+         return NULL;
+@@ -1561,8 +1569,10 @@ PROCPS_EXPORT struct pids_fetch *procps_pids_reap (
+     info->read_something = which ? readeither : readproc;
+ 
+     info->boot_tics = 0;
++#ifdef CLOCK_BOOTTIME
+     if (0 >= clock_gettime(CLOCK_BOOTTIME, &ts))
+         info->boot_tics = (ts.tv_sec + ts.tv_nsec * 1.0e-9) * info->hertz;
++#endif
+ 
+     rc = pids_stacks_fetch(info);
+ 
+@@ -1669,8 +1679,10 @@ PROCPS_EXPORT struct pids_fetch *procps_pids_select (
+     info->read_something = (which & PIDS_FETCH_THREADS_TOO) ? readeither : readproc;
+ 
+     info->boot_tics = 0;
++#ifdef CLOCK_BOOTTIME
+     if (0 >= clock_gettime(CLOCK_BOOTTIME, &ts))
+         info->boot_tics = (ts.tv_sec + ts.tv_nsec * 1.0e-9) * info->hertz;
++#endif
+ 
+     rc = pids_stacks_fetch(info);
+ 
+diff --git a/library/uptime.c b/library/uptime.c
+index 5c3a3d3..096b0a4 100644
+--- a/library/uptime.c
++++ b/library/uptime.c
+@@ -179,8 +179,12 @@ PROCPS_EXPORT int procps_container_uptime(
+     if (!uptime_secs)
+         return 0; //valid, but odd call
+ 
++#ifdef CLOCK_BOOTTIME
+     if ( (rv = clock_gettime(CLOCK_BOOTTIME, &tp) < 0))
+         return rv;
++#else
++        return -1;
++#endif
+ 
+     if ( (rv = procps_pids_new(&info, items, 1) < 0))
+         return rv;
+diff --git a/src/top/top.c b/src/top/top.c
+index a49b2b8..049aaab 100644
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -2839,6 +2839,8 @@ static void *tasks_refresh (void *unused) {
+ #ifdef THREADED_TSK
+       sem_wait(&Semaphore_tasks_beg);
+ #endif
++
++#ifdef CLOCK_BOOTTIME
+       if (0 != clock_gettime(CLOCK_BOOTTIME, &ts))
+          Frame_etscale = 0;
+       else {
+@@ -2849,6 +2851,10 @@ static void *tasks_refresh (void *unused) {
+          // if in Solaris mode, adjust our scaling for all cpus
+          Frame_etscale = 100.0f / ((float)Hertz * (float)et * (Rc.mode_irixps ? 1 : Cpu_cnt));
+       }
++#else
++         Frame_etscale = 0;
++
++#endif
+       what = Thread_mode ? PIDS_FETCH_THREADS_TOO : PIDS_FETCH_TASKS_ONLY;
+       if (Monpidsidx) {
+          what |= PIDS_SELECT_PID;
+diff --git a/testsuite/ps.test/test-hugetlb.c b/testsuite/ps.test/test-hugetlb.c
+index ee505f2..c690c58 100644
+--- a/testsuite/ps.test/test-hugetlb.c
++++ b/testsuite/ps.test/test-hugetlb.c
+@@ -59,7 +59,7 @@ int main(int argc, const char *argv[])
+         usage(argv[0], "Invalid size");
+ 
+     if (MAP_FAILED == (addr = mmap(NULL, (kbytes*1024), (PROT_READ | PROT_WRITE),
+-                    (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0))) {
++                    (MAP_PRIVATE | MAP_ANONYMOUS), 0, 0))) {
+         perror("mmap");
+         exit(EXIT_FAILURE);
+     }
diff --git a/sys-process/procps/procps-4.0.5-r3.ebuild b/sys-process/procps/procps-4.0.5-r5.ebuild
index 10d30779fc61..4bb9c0e847a1 100644
--- a/sys-process/procps/procps-4.0.5-r3.ebuild
+++ b/sys-process/procps/procps-4.0.5-r5.ebuild
@@ -29,8 +29,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	!<app-i18n/man-pages-l10n-4.2.0-r1
-	!<app-i18n/man-pages-de-2.12-r1
-	!<app-i18n/man-pages-pl-0.7-r1
 	!<app-i18n/man-pages-zh_CN-1.6.4.2
 	kill? (
 		!sys-apps/coreutils[kill]
@@ -57,6 +55,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.5-pgrep-old-linux-headers.patch # bug #911375
 	"${FILESDIR}"/${PN}-4.0.5-pidwait-half.patch # bug #959706
 	"${FILESDIR}"/${PN}-4.0.5-pgrep-pidwait.patch
+	"${FILESDIR}"/${PN}-4.0.5-sysctl-ignore_failure.patch # bug #969014
+	"${FILESDIR}"/${PN}-4.0.5-hurd.patch # bug #984061
 )
 
 src_prepare() {
diff --git a/x11-apps/xload/xload-1.2.2.ebuild b/x11-apps/xload/xload-1.2.2.ebuild
index fce4fa7e366a..5b4cb69043ec 100644
--- a/x11-apps/xload/xload-1.2.2.ebuild
+++ b/x11-apps/xload/xload-1.2.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-meson
 
 DESCRIPTION="system load average display for X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xpr/xpr-1.2.1.ebuild b/x11-apps/xpr/xpr-1.2.1.ebuild
index 2e438cdd9c0f..6edab74aecb6 100644
--- a/x11-apps/xpr/xpr-1.2.1.ebuild
+++ b/x11-apps/xpr/xpr-1.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-meson
 
 DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.25-arm-revert-hack.patch b/x11-base/xorg-server/files/xorg-server-21.1.25-arm-revert-hack.patch
new file mode 100644
index 000000000000..0acbada2479d
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.25-arm-revert-hack.patch
@@ -0,0 +1,64 @@
+From 00ae82a00981d57747eed74e619cba03d5edb7d9 Mon Sep 17 00:00:00 2001
+Message-ID: <00ae82a00981d57747eed74e619cba03d5edb7d9.1791657875.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Sat, 10 Oct 2026 19:43:34 +0100
+Subject: [PATCH xserver] Revert "meson: check cpu_family() instead of cpu()"
+
+This reverts commit 5981d49e9a26d5401d80f3ef591033cc5faa7e05.
+
+Hack to restore the old, broken-but-builds way of doing things on arm
+until it is handled upstream.
+
+Bug: https://gitlab.freedesktop.org/xorg/xserver/-/work_items/1929
+Bug: https://bugs.gentoo.org/984048
+---
+ hw/xfree86/int10/meson.build |  2 +-
+ meson.build                  | 10 +++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xfree86/int10/meson.build b/hw/xfree86/int10/meson.build
+index ac47baa65..a309e9b53 100644
+--- a/hw/xfree86/int10/meson.build
++++ b/hw/xfree86/int10/meson.build
+@@ -10,7 +10,7 @@ srcs_xorg_int10 = [
+ int10_c_args = [xorg_c_args]
+ int10_link = []
+ 
+-if host_machine.cpu_family() == 'i386' or host_machine.cpu_family() == 'x86_64'
++if host_machine.cpu() == 'i386' or host_machine.cpu() == 'x86_64'
+     int10_c_args += '-D_PC'
+ endif
+ 
+diff --git a/meson.build b/meson.build
+index 43c5a8d75..591b3a341 100644
+--- a/meson.build
++++ b/meson.build
+@@ -249,10 +249,10 @@ endif
+ int10 = get_option('int10')
+ if int10 == 'auto'
+     int10 = 'x86emu'
+-    if host_machine.cpu_family() == 'ppc' and host_machine.system() == 'freebsd'
++    if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd'
+         int10 = 'stub'
+     endif
+-    if host_machine.cpu_family() == 'arm'
++    if host_machine.cpu() == 'arm'
+         int10 = 'stub'
+     endif
+ endif
+@@ -503,9 +503,9 @@ endif
+ build_acpi = false
+ if (get_option('linux_acpi') == true and
+    host_machine.system() == 'linux')
+-    if (host_machine.cpu_family() == 'x86' or
+-       host_machine.cpu_family() == 'x86_64' or
+-       host_machine.cpu_family() == 'ia64')
++    if (host_machine.cpu() == 'x86' or
++       host_machine.cpu() == 'x86_64' or
++       host_machine.cpu() == 'ia64')
+         build_acpi = true
+     endif
+ endif
+-- 
+2.56.0
+
diff --git a/x11-base/xorg-server/xorg-server-21.1.25.ebuild b/x11-base/xorg-server/xorg-server-21.1.25.ebuild
index 3cc7bf65e4f5..3bf58f4f1787 100644
--- a/x11-base/xorg-server/xorg-server-21.1.25.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.25.ebuild
@@ -102,6 +102,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
 	# pending upstream backport, bug #885763
 	"${FILESDIR}"/${PN}-21.1.10-c99.patch
+	# bug #984048
+	"${FILESDIR}"/${PN}-21.1.25-arm-revert-hack.patch
 )
 
 src_configure() {
diff --git a/x11-libs/xapp/xapp-3.2.3.ebuild b/x11-libs/xapp/xapp-3.2.3.ebuild
index bfe8be42f390..506a83aec0be 100644
--- a/x11-libs/xapp/xapp-3.2.3.ebuild
+++ b/x11-libs/xapp/xapp-3.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3 xfce? ( GPL-3 )"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="gtk-doc introspection mate vala xfce"
 REQUIRED_USE="${PYTHON_REQUIRED_USE} vala? ( introspection )"
 
diff --git a/x11-misc/lndir/lndir-1.0.6.ebuild b/x11-misc/lndir/lndir-1.0.6.ebuild
index 4846afc879ff..05bff3b2daf5 100644
--- a/x11-misc/lndir/lndir-1.0.6.ebuild
+++ b/x11-misc/lndir/lndir-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-meson
 
 DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	elibc_glibc? (
diff --git a/x11-misc/makedepend/makedepend-1.0.10.ebuild b/x11-misc/makedepend/makedepend-1.0.10.ebuild
index 952de4b911ee..c0c5fa00e5d5 100644
--- a/x11-misc/makedepend/makedepend-1.0.10.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.10.ebuild
@@ -6,4 +6,4 @@ EAPI=8
 inherit xorg-meson
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"