18 files changed, 92 insertions, 344 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a4b36c76ea58..3126bf0d0c3f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index 19cad33638cd..d2250664e9e8 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1,6 +1,8 @@
 AUX ansible-molecule-24.2.1-mkdocs_google_fonts.patch 156 BLAKE2B e311c1a4c1d3cc9a087611a70dfa6a5634d0842afdd426a708a390b7391507e330d2d9680a5b5a85949d9985beafb80fb146a53742d645d1b8ccb78f5f7a4f64 SHA512 66113e61b0f97243e15afc7b7fea8657cee0cabfa450a2bbe6a1b751cdd9cd82be6bfad6b36802377fd3261e9e55d3d0e37eb44e9c26838110495cd43773cc9f
 DIST molecule-24.12.0.tar.gz 4412418 BLAKE2B 0dba13534a7d4d9b1095c38e9694cd51b3e750cb9ab611b3078972182d09319a7b858e3dba018c370a9b7c6a8065036f60d8cab58da1e7ee9660be746b9bdf34 SHA512 6d709832091514b55f697ed70d7c7ae4695537a868ed3e8a0b0cb1c868ce5b161baf849412f94fbe723fae491a4ca4e510179ba69c40a3b48711aef36cedc2ba
 DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d
+DIST molecule-25.1.0.tar.gz 4416129 BLAKE2B 429bf0a315cd82b9e4e877f05e62c07e48fb639bbb5f74ce457e49402343858569a19ab1375fc9fe1f2127c60c9002a256dfefde3eac8b4923d290cfd32c2ad6 SHA512 b998a2d04c5a9aa4666120494a41cf8298757228e69070ab08b0c9862f0b1ecfd68803277d53911c18d67d6a1faca2e717366c3fce35d4059b55127e387a0e4f
 EBUILD ansible-molecule-24.12.0.ebuild 2769 BLAKE2B 0e75828171dc2822f975fffd3d7fefff0e50ba757b051e4d2e580fe33524553493b3cead82bd3bc955cbd5b775c5a5c251c17489b405eea4b9f00cd12c63d5d1 SHA512 4b1ae75150f56f422d97d8ad240dae0f19a37bef617eba9b7c01807d580d06b0b13938f3e09f3c606b8b2a964087f71478bf074cdd96fa3a9291ef7d46299f47
 EBUILD ansible-molecule-24.2.1.ebuild 3013 BLAKE2B 09a564d6bfbdb24f4b21a85fdb7fb0d2628d0eca850d1fc432e02fbbbb8fad54e9fd18e4dad62cffddb0b892cc75a134bce7e038661a602946a964e1f609ecb3 SHA512 522f75b7c647be53e1f29aec012b680b4faaf8d3952e4f81e29e1fd5acb80ff33641d2511504cc1d0c772c8c2b85a46feb3818124f685f2b0520b964cb272096
+EBUILD ansible-molecule-25.1.0.ebuild 2769 BLAKE2B 0e75828171dc2822f975fffd3d7fefff0e50ba757b051e4d2e580fe33524553493b3cead82bd3bc955cbd5b775c5a5c251c17489b405eea4b9f00cd12c63d5d1 SHA512 4b1ae75150f56f422d97d8ad240dae0f19a37bef617eba9b7c01807d580d06b0b13938f3e09f3c606b8b2a964087f71478bf074cdd96fa3a9291ef7d46299f47
 MISC metadata.xml 319 BLAKE2B e21046964335743f016597d0b19ef5edba9452c5cadeaf9db45a3443cdf3320b8c766a8e2302cecc203aa333cbd9c988ffe0330a7e07a083c3d157ae4b8e91c1 SHA512 b082b103d0c47df58411d7ad1e67cf274d287f8398d4235fe83d2a6f7e722d72e9441ec919510f98965b2d01ebe1d9fd25fe987a358786d2cc55ea375c7fed3d
diff --git a/app-admin/ansible-molecule/ansible-molecule-25.1.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-25.1.0.ebuild
new file mode 100644
index 000000000000..bb26dfb43631
--- /dev/null
+++ b/app-admin/ansible-molecule/ansible-molecule-25.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{11..13} )
+PYPI_PN="molecule"
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
+HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="selinux"
+
+# Since around the time of the switch to the yy.m.patchlevel versioning scheme
+# the test suite has been completely incompatible with Portage, with several
+# tests which do pass under Tox failing even with disabled sandboxing.
+# Nb. As of 24.2.1 two tests fail even under Tox, for both PyPI and GitHub
+# tarballs.
+RESTRICT="test"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.18.1[${PYTHON_USEDEP}]
+	>=dev-python/ansible-compat-24.10.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	<dev-python/click-9[${PYTHON_USEDEP}]
+	>=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}]
+	>=dev-python/enrich-1.2.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.9.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-8.2.5[${PYTHON_USEDEP}]
+	selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}]
+		>=app-misc/check-jsonschema-0.28.4-r1[${PYTHON_USEDEP}]
+		>=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.9.0[${PYTHON_USEDEP}]
+		<dev-python/pexpect-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch
+)
+
+# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
+#  - quite a few of these tests use the network;
+#  - test_command_dependency[shell] only works if Molecule has previously been installed;
+#  - tests involving creation of a new scenario fail on ansible-lint errors, even though
+#    a config file is deployed which should skip expected issues.
+EPYTEST_DESELECT=(
+	src/molecule/test/functional/test_command.py
+	src/molecule/test/unit/command/init/test_role.py
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature_header "Some optional packages commonly used in Molecule scenarios:"
+	optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 650843383884..ca2977ed878c 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,13 +1,7 @@
-DIST aws-cli-1.37.16.gh.tar.gz 2903703 BLAKE2B 0d3333bef89222e9e84de2c469a98c6fd19177ba6c7e69278e43f459f1909d67e07cdc4150189dd3fd2ce1573ae43a22c944d172738de6102ecf7c7ea00404cf SHA512 d9916ecfedd8bd9086608b6350f95374efad96f3af6adc8b372a254021e4b9f00c43a7c5759cd74f20082f60806fc6eb13d8daf7569fad303995f6d180958cb9
 DIST aws-cli-1.37.21.gh.tar.gz 2907762 BLAKE2B e42e9aed28ef3cee1b83f2e57f90ce81a9894bc23a960fef487096ce8b8bab16d23121658aed0547070919ae78a0476176f9517d583a84be90bb016c7cdd9bf7 SHA512 3c7b347627b799d7a3edc7a8cae3d6110ec3cc5bfcdecc247876135faebc2235546a514afbdaf95fec50cfe787ca30b125cae7a8e7be84134d83493a0f869b1a
 DIST aws-cli-1.37.26.gh.tar.gz 2909650 BLAKE2B 77843b52fa77410c9568dcc402774352b839591264f16ce4b27c58f5b52fe159afe029756b702132c1b6e611f2e40d5a27f26d830928c2716ec285e58201ac16 SHA512 0396541bead54c81c9c9219403aa1d7dcf8f0a60b58d8ef33ff1900ae3d44cd362b4d0f2fdd93fee89a068bba1b5afefac44bcd8f5624368b2a02044acd070d9
-DIST aws-cli-1.38.0.gh.tar.gz 2909973 BLAKE2B fab770764dad523c31752f6dd79093b528d3ebf36c8e2e5df140172d14069192747ffdfe8323e7f68de81ba49498febed302f0f7ae73381ed6b5fbd181fdb8f3 SHA512 06f10c3b0adddebe492c7219aa44f143fc91667989b76bcb2ce75d27a3eeaacb64a5e633ab84b56f6c3cf45877c96c4c98c8e23198eabef994e4b77f9a620cc5
-DIST aws-cli-1.38.1.gh.tar.gz 2910408 BLAKE2B a2c8085b633fec9925145511a0b66142628effe04f08142ed91e9507ecffd97f3a3eb9a0b92a385fd7ef2f1fd8eeeced05502e3536e06b56e57aa86091867d38 SHA512 6783d26fa11d5302d04e678e80b64c15aceaf2b4029dcc687b2444c9ce697850c4eea10e9a20bda5db140c26102ae05b664ff94cbbecb7e3699aa8eb00d3040e
-DIST aws-cli-1.38.2.gh.tar.gz 2905602 BLAKE2B 6605fc4cee053096a23b7ab29e0aae2cf45bb4069d477488b7600fbdce0801efe1910b883f9fdbfc0e1d515590662e4f877847438577239fd66e2999a23c9c49 SHA512 24adc8df456e95bf87e48c6b5b174f7057ecc57035be1177122f3570936211ea75a783174c2a38b1dea3753991ad48fe0f8989bfb30ab3045d68106239f37886
-EBUILD awscli-1.37.16.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f
-EBUILD awscli-1.37.21.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
+DIST aws-cli-1.38.4.gh.tar.gz 2908307 BLAKE2B 1dbae7f032e920b950cedaa5223692c88262b32af1fbd7cd5459110e6d987182bb321a2e689d2ba0b74757faa3d5dc8602480fd735ac227de1cf1975414019a8 SHA512 5c255d7b9cd63c49255b53e66f0800d1c7e03a68c18dd11f23f13d3a60dc06ac868f334cf3b1b29ece0cf0f458862a568283729f320bd0095211fc9fac0e7024
+EBUILD awscli-1.37.21.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f
 EBUILD awscli-1.37.26.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.0.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.1.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.2.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
+EBUILD awscli-1.38.4.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.37.16.ebuild b/app-admin/awscli/awscli-1.37.16.ebuild
deleted file mode 100644
index 2bb0ee1db5bd..000000000000
--- a/app-admin/awscli/awscli-1.37.16.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y-1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins 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-1.37.21.ebuild b/app-admin/awscli/awscli-1.37.21.ebuild
index 4a8e0ae852e0..2bb0ee1db5bd 100644
--- a/app-admin/awscli/awscli-1.37.21.ebuild
+++ b/app-admin/awscli/awscli-1.37.21.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y-1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.38.1.ebuild b/app-admin/awscli/awscli-1.38.1.ebuild
deleted file mode 100644
index 4a8e0ae852e0..000000000000
--- a/app-admin/awscli/awscli-1.38.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y-1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins 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-1.38.2.ebuild b/app-admin/awscli/awscli-1.38.2.ebuild
deleted file mode 100644
index 4a8e0ae852e0..000000000000
--- a/app-admin/awscli/awscli-1.38.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y-1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins 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-1.38.0.ebuild b/app-admin/awscli/awscli-1.38.4.ebuild
index 4a8e0ae852e0..4a8e0ae852e0 100644
--- a/app-admin/awscli/awscli-1.38.0.ebuild
+++ b/app-admin/awscli/awscli-1.38.4.ebuild
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index c233968fd87e..2d6b025ea26b 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,5 +1,3 @@
-DIST emacs-updater-1.18.tar.xz 7360 BLAKE2B ff890584349d87a9cdcfe4576dd3bb1f8fc73b6cb086a5dd09fef3c8bf500a519f1aab810321680a5f5d4f1093455a6c54db42d900ee50fc39fcc03f0d6db69e SHA512 15c3b6e5ea7d1935a7e472d75409c0cb0dc9658142c1270a4a487eba822dbcd3ac32ffe60cb501859a7ccb7441efa1c7dd5d3a6cf481f69a583c5c8d5001051a
 DIST emacs-updater-1.19.tar.xz 7384 BLAKE2B 982c504807007bd559dd4b2198dfaf472c8ef83f3e5868b0057ea68f321899636c0be5b4ed04616ceecf0952e51314556b790d11c96c961d3c77a1fe4e9840c2 SHA512 7d32ea5969d044b72ec1bc6697c9ffa73b19ece0f3c3aca0e34feb7989e96cea18cc41e6e4fb53eef0d81845bc837f212718230a783b00f0319b81404adf4c07
-EBUILD emacs-updater-1.18.ebuild 949 BLAKE2B b57e19e9d50732b5ad6ffab0fd6473bf00edc8d39c9d371462f0e85f14a88e42b311bae92d76ead35574988495d62cd51523e5a5c53d1154e7319c17eabeb0cb SHA512 284b069522c715be44ed96ab1f53e9958f02e69cf126b33ea268de26fcc1f248962765d450ef578d80fc6a3ccf45432a9e4d07461f04d4ee0423cdbfd55065a8
-EBUILD emacs-updater-1.19.ebuild 956 BLAKE2B f9e80fa7708dd53b24e8272eca37cad6c16b0cc32e385d486b8294ec75b3fa90e32c42699d2e72e7a5c5e4a938aa38eee23508e3543202196a9647a7918bd5f1 SHA512 9c30068e960aa565cb7150ccb618822d5c7d84cc0c3c0812dc49da1d2ada38f5fc5e083aaee4f8e4083e434f01692662e93a464397e49444dbe7467df27a65b9
+EBUILD emacs-updater-1.19.ebuild 949 BLAKE2B a09a73cc7dd690c6d958f6c98f44427d52d2af0f1bf01ab495ba2804b408e94cafd9609181c034f58f5c99ab56b27bbe7a0b3059f32ae352fdfc377edd6eeb1e SHA512 a7c8d03392ae65cc5f52c388d923ed72970f63bf719833180ba7d37c87d344f8fe36a0e2effd4f7f57ae4fa3968e4e898daef50d8d693f78acd5d6cc17425110
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-admin/emacs-updater/emacs-updater-1.18.ebuild b/app-admin/emacs-updater/emacs-updater-1.18.ebuild
deleted file mode 100644
index 81430ebab93a..000000000000
--- a/app-admin/emacs-updater/emacs-updater-1.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Rebuild Emacs packages"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
-RDEPEND="${DEPEND}
-	>=app-editors/emacs-23.1:*
-	>=app-portage/portage-utils-0.80"
-
-src_prepare() {
-	default
-
-	if ! has_version sys-apps/util-linux; then
-		# BSD ships a dumb getopt(1), so use getopt-long instead
-		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		sed -i -e "1s:/:${EPREFIX}/:" \
-			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX}/:" \
-			emacs-updater || die
-	fi
-}
-
-src_install() {
-	dosbin emacs-updater
-	doman emacs-updater.8
-}
diff --git a/app-admin/emacs-updater/emacs-updater-1.19.ebuild b/app-admin/emacs-updater/emacs-updater-1.19.ebuild
index 26d8ad449623..32c42c942eff 100644
--- a/app-admin/emacs-updater/emacs-updater-1.19.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 7bddfd5ca827..d694238a94c9 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -3,6 +3,6 @@ DIST eselect-1.4.28.tar.xz 184692 BLAKE2B 86d1bbc0cb618f6edf49753c9f2be0f6767059
 DIST eselect-1.4.29.tar.xz 185948 BLAKE2B bb387a14c81d5ff5bf2e6e703465b24140b047f1464dee3c7fc0a125c9d94544a9afd801b42d2902dd6dee1af705f7dcfad854286d7e243a0f654cec35ab8eea SHA512 0466be2634f9d632d628cb11793d604002d989c222758ed33259c6b1dede80765d80f782242b22704e890bde84b2e1e3b3fb3d31574812cc803aad64ba8e7cf6
 EBUILD eselect-1.4.27-r1.ebuild 1623 BLAKE2B e726694e11f72453b340b7a70729ed7b2c03f0a51d80071936beb9b2f446713825aef826c3236c0133b3de7d1bb9c46fadca3055a0d0b9b21fc78f5a1feac11f SHA512 b913328169b23831ba3175f19b70996282764072f272b25274ae0316a8c07c2b0fe7e1c9bdc5569797f99dbfd6e33bfe3ccf9f5e3237455d3f36c7a75e279787
 EBUILD eselect-1.4.28.ebuild 1631 BLAKE2B 46dbb4adca1614e08dce046af43abe38169181156529956bec5de405ca5d4b46842cbf57f4fa36c803b9f74bec6b641d7370bfa74b766f8a752f738d16ed5fc1 SHA512 438086a2293452b5c9ef3e3c5d6ab4189d0bfd59fc93bcd2c8acdb298cd2fb1ba750d82c721127d74104f7505d1cf78c0ab0b3a9e865edcae8a09d06a3eb00f5
-EBUILD eselect-1.4.29.ebuild 1631 BLAKE2B 33d225009318469c2c6f8cda876c6cea7df12792d3bf1e1e1c1e8d5dbc00ffcebce9265af14c96b31809235ccf377d0f587e9f4594eacabedd709af09757d944 SHA512 ef8723fd8d1bd3b50c195dfa77f9c79cfbf86ea715d5c93b188530803455cdc42d40c73223430b91b2b9d50c5c206f71a6cd7758cac2497cc44cb4729ae41831
+EBUILD eselect-1.4.29.ebuild 1626 BLAKE2B 3bcf8f4e3984b4f7949563a079c97f3f95fbe3b83774ac1e697703001aefccb3816a9619e0d620e823b5ed765ed5ad3ce9ac6f464daded61181aae52b67e5e4a SHA512 e1f64d286ef2ae4dfbea3686db587d1fe03168f667231044b1f484647f7478689b7452f905a2f9969dcc4ba7b6e828cc3a2f8adbc7a1723d8a77e4be85c4c7b8
 EBUILD eselect-9999.ebuild 1389 BLAKE2B 5657bfdec0764b44159ddce806abf88f9b77e41cebcd0ff3f809f6678b0770ea48dc5f8cd267e34737aea4c8dd83e18dbc715d2ea65b0621a0ce5085efb92b81 SHA512 30134502391dd4e911a6a25f5fb1e1ccb7cffe7d70acf1629c2caec467a61dabd93604f247d37a2cf24dcd0d9f693c276b54d6ce0a48325738b64f2c1b0b166f
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.29.ebuild b/app-admin/eselect/eselect-1.4.29.ebuild
index 2755cd4663f7..7da2e0bbebfd 100644
--- a/app-admin/eselect/eselect-1.4.29.ebuild
+++ b/app-admin/eselect/eselect-1.4.29.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 # coreutils for realpath
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 5533fee80cd8..a746695b0615 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -5,5 +5,5 @@ DIST filebeat-7.17.16.tar.gz 101629004 BLAKE2B c67eed28574948022673737dba4d39409
 DIST filebeat-7.17.25-deps.tar.xz 696720440 BLAKE2B 795bf60e9bf55b5bf32587a23aedfdfa5bc0e891ff976fc8be5000a12a6053bd75149b927f7c29c012346eb92446b0bd89e6fbf8b42f60c3979f928becc7f65a SHA512 aae8f2f8288819c1104ca74faa81b78534c1bc2a7ee884f8eb2d4e2e0d47083ad1c3fe4eca9ccd16e50c2838319082ae14ec484ddda7073b40e0b0e523ba240a
 DIST filebeat-7.17.25.tar.gz 101680280 BLAKE2B bec6a6f87d67c44cb050c29c39dcf78dd90a48945669de291c3ba2a1bea07759e596294482c7841df535f97ff7ae9ff4690a70196b4776e0bf9b7657568d6800 SHA512 893fcaa18c72f0d6d6d3ae7c2c65d57242b2ce8284118acd15a2a18f0818fcdb9870dccdc7dd69ba5ec3fa0648471497711fd1ed13f978a84841805a67627e09
 EBUILD filebeat-7.17.16.ebuild 1340 BLAKE2B 46e8c6e3088ac4fb9a70e509c171c5fef1f36d0db6145b398ab1bdad1e9ffe4f6ca4ea3dbf10ea02a6ffb335e20e84f18e8fcf9e7e7d707df72bd135cf30741b SHA512 9eb4a95ee44a5ff31f1e7114b4d2f87f919786f2fb8402977cdbd09d30101aca89f00717fc847ba5eab7a39351a882d93173d9673dfb87b32271c2eb54cf7e03
-EBUILD filebeat-7.17.25.ebuild 1331 BLAKE2B 905d9b7751114307fcc95f2853c41d506a968cea73524a638e239c766b89335803f45502d9cb7b8237e5a372a7d0ab2502cbcd4d43104dafe1b11c2c65743eba SHA512 52a6ed19b426ec9fd22dabcf804dff623e639b8f0c7f1377abd9137413402e5316410bb29c24f8c573ec508819cbc98d224e9d975b1b9aedf79d15519b5521d0
+EBUILD filebeat-7.17.25.ebuild 1330 BLAKE2B 5f09bf962040e58d9cecfb16a922721ce00c3e613da60690686243d88cbff785cb43dbe9a06220cc3a32355289a1e1fc801306ee8dc68ebf49266e432c13c59f SHA512 c73e3fd879dc5c97d493742137f0efe7c7ad4dc1a9097a57e2455546c05ad46f7a582152cfd551ca62fc34167bf29ec40b51266425247d866339f6d24d52e89b
 MISC metadata.xml 492 BLAKE2B 6b16876306316f37d59bf32aac33a2ff918c63dbf2ca0f71448249b20e99e5576f20dbad997a227730cb836c7f244ea8301dae62603e1961127bd755ab87f5b0 SHA512 c42a8bc75fd53383ea094d5049ba5f294cb8a2f0b0fe435eb74427bc82751bfbe4e4bfe076abbd052946ae6b0cf2f7129040a47b439a704629c6846ce6b7fdec
diff --git a/app-admin/filebeat/filebeat-7.17.25.ebuild b/app-admin/filebeat/filebeat-7.17.25.ebuild
index 6f4efaa268bf..548f8d3ed9f4 100644
--- a/app-admin/filebeat/filebeat-7.17.25.ebuild
+++ b/app-admin/filebeat/filebeat-7.17.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 S="${WORKDIR}/beats-${PV}"
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 979aebe3a728..5fdc78c00a09 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -6,5 +6,5 @@ AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c4
 DIST supervisor-4.2.5.tar.gz 466073 BLAKE2B 54b45c824a1ad2960b04ca4ca9e54337f8c4da1a13008b559103f9efb9043588e72b3ee97c41218eb9252606d717575ad2615d12136047734f83d843d0a63bfa SHA512 ea80c8c91356646deccf20735e065fd9b341f3be6d56838d333989297a912b0a59142338925b2eb08690e038f0617814e03447673701a19093aa483432ce6d41
 DIST supervisor-4.2.5_p20250125.gh.tar.gz 446525 BLAKE2B 33372d7424a8d5b500a8dcbcc25f9d2e678155f570936c9be337b443fee65243b2c632c0b429c4fd2b9133243a864cb7297f1640c5d843d6439bf1fb1c06a3c4 SHA512 53e2d798ef9663f471ed05b76dad23b96ed65c7f4b40d7ab837586dd58fda1dcb471f7cfbcdf014c6a830ddb2c7457aa6a5569a1ffe1cfa576e2f9c683149478
 EBUILD supervisor-4.2.5-r1.ebuild 1491 BLAKE2B aa194f21eb23d28b226d687ca0f50a49448db0f54789503523e4a20133700d7a23e8c526c3e98f70823993f8f83281e61836087527d6735aa5c826be553f24a9 SHA512 a11a4523a4d4f7d000e1a334ac45540d3901eec01ddc255dd95680b47f84a7281adfd0cf40b83a2843019c359fcfdb2a449cb0481708def55b9737eca40cc860
-EBUILD supervisor-4.2.5_p20250125.ebuild 1673 BLAKE2B 34f6434ca46048d779683188f7d3b0dbaef25bf8cee9da1c4277995dc5b8538eca4cce7dad93eb8bdc66e51114a998d54ad4f6dd145eac437d460137595bb15e SHA512 24da1e363df5e65d2e4b2de83ab6a5304e6974b207f673d26f3bed1e932389658c0ca501c675ffee4ee69c00570f7712af4043c42f45e5f9336e2743a312cd42
+EBUILD supervisor-4.2.5_p20250125.ebuild 1682 BLAKE2B 2770f18e5d3d37066afe53b45bc3677d74e37f443a73e9b2a9501a35bf16fcb717beba9fd9f82fabe8c17cfd1b8e9462c197a15a0ac90def455bb2c024b74ce4 SHA512 674507c956bcde7d076ff1351b5bbb334d91a0db2032803eabb966d8be7b660bb3893d6f934c06dfbd64970a458989235b317dd9b7639ca1b80fa11c7c90f99c
 MISC metadata.xml 624 BLAKE2B 6cb179a9284e7898dcfc4423e12e04d7bd4e805930f8f4e79e3528153180146aeb606040d087e3c5d127e6d7e3b42cbbd6f4b7c1bb2ad7fa414bf90a40a76502 SHA512 dfe5b6abb493cb69a2a2b2d93fbf9c66b4f21ca5d83d76a2da5066f3625a945c1834e876ce8b8b4368cec3e34a81003f7be47898b5e2bdbe796714ea8291f63a
diff --git a/app-admin/supervisor/supervisor-4.2.5_p20250125.ebuild b/app-admin/supervisor/supervisor-4.2.5_p20250125.ebuild
index a2584961e9b9..6803bad855a0 100644
--- a/app-admin/supervisor/supervisor-4.2.5_p20250125.ebuild
+++ b/app-admin/supervisor/supervisor-4.2.5_p20250125.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml(+)"