gentoo auto-resync : 03:02:2024 - 17:44:31

109 files changed, 452 insertions, 2904 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e32e99bf9e7d..5939b258d9ec 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 1249fc11787d..ad045223d42f 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,3 @@
-DIST abseil-py-2.0.0.gh.tar.gz 232404 BLAKE2B fc3d02b2184f6ad45ff022d80068f6ec64ec4cbdbfb9735da1309a975f634880a2c969cba9ad7bdbeec2183c058c31e8198f9396d5f937858861e42a41c40432 SHA512 1f83ee07ce4bdeed2ebc775bdf809a9998f7afba2e0322bb4ce1fbf4af8c0e638161bbd72c9222c1ae1505577c181026d5baee1c9994d4858166d015a1ffab91
 DIST abseil-py-2.1.0.gh.tar.gz 235261 BLAKE2B 85232156e722cb874e29e1f92513b24836553476d5ff379e8df32d307ca21709b5869edd80a3bb7fe757ae585bb45df21c89ae6f2218147a5812f171d946e094 SHA512 298a876ed850085836cb1ff6fddf98aca6a3283780bece8c0a7d118fd4e16cc258e51f721e4a5fcbe62b23d2da05638475d426bb650b0694ff7c1d0119e3be97
-EBUILD absl-py-2.0.0.ebuild 2657 BLAKE2B 5d13264fcef75f7fd66fc31cfd940e13b3add818fa7521e12f439aceabb7d19a95d91481926eec8040033b47c917ae6a559dc06629878183e6603b0fd958ff8a SHA512 f93ee2a43f8a73d5573817380cf2ffd206e1a52bccf544a397bc6f204cf51363c3f9fe8a8eda9b9eee78919d3d73953f22f896a6f5fbf7537c5f8cdfe5928e04
-EBUILD absl-py-2.1.0.ebuild 2761 BLAKE2B 0168314842cea52980814ff2ac28ec0919808d85ff487610e075b5369096a5269ee6f8b3023e831fd8228fc56904b26ad5467e68353f4b099cc0cb1e94d6a983 SHA512 ec7d896e2c7ae847f2326ecaa25dc68e8c8e3eb48f1d090085efe73e0f7627c6fdce407311faea7013d2de6f7ad21178dc756380e3dcc5d2d60cd26a8cba5131
+EBUILD absl-py-2.1.0.ebuild 2758 BLAKE2B 328917084528efc1b6c1f51ccc901bb6ff18e3d5eacbb33a299e1fd179a56ce078aa4544315c0a711ee85116e2e4cda3c7c0bbbb94a4390064d6825d352bd9a6 SHA512 06f30cb48244d64f3458d4d327697f7ce84c9e7876a36b2fc78d1e473d0075d3f35a0284bc13dbab2dd912cd66f9abe8ce55d853fc38a8e249be96dc3d205d81
 MISC metadata.xml 577 BLAKE2B dd0e02b24bdb42f24bd675cadf13e99f861a6dc9be2879f671b9bc4e9e078ef81759909e81e3063cb54c71ff71d6609624f0cf2645bf6ec055c643fbb0f3ab5c SHA512 7cfa86cac5d38b10aedacdb4bafc7acbd11cf4a98a873a2435ef5761d5186c5128171eb286b2d2568a1a353eb4de815303eae225cf5823a5292ac362633b67c7
diff --git a/dev-python/absl-py/absl-py-2.0.0.ebuild b/dev-python/absl-py/absl-py-2.0.0.ebuild
deleted file mode 100644
index 73e4aafe449f..000000000000
--- a/dev-python/absl-py/absl-py-2.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=abseil-py-${PV}
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="
-	https://github.com/abseil/abseil-py/
-	https://pypi.org/project/absl-py/
-"
-SRC_URI="
-	https://github.com/abseil/abseil-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# what a nightmare... well, we could have called bazel but that would
-	# even worse
-	local helpers=(
-		absl/flags/tests/argparse_flags_test_helper.py:absl/flags/tests/argparse_flags_test_helper
-		absl/logging/tests/logging_functional_test_helper.py:absl/logging/tests/logging_functional_test_helper
-		absl/testing/tests/absltest_fail_fast_test_helper.py:absl/testing/tests/absltest_fail_fast_test_helper
-		absl/testing/tests/absltest_filtering_test_helper.py:absl/testing/tests/absltest_filtering_test_helper
-		absl/testing/tests/absltest_randomization_testcase.py:absl/testing/tests/absltest_randomization_testcase
-		absl/testing/tests/absltest_sharding_test_helper.py:absl/testing/tests/absltest_sharding_test_helper
-		absl/testing/tests/absltest_sharding_test_helper_no_tests.py:absl/testing/tests/absltest_sharding_test_helper_no_tests
-		absl/testing/tests/absltest_test_helper.py:absl/testing/tests/absltest_test_helper
-		absl/testing/tests/xml_reporter_helper_test.py:absl/testing/tests/xml_reporter_helper_test
-		absl/tests/app_test_helper.py:absl/tests/app_test_helper_pure_python
-	)
-
-	local x
-	for x in "${helpers[@]}"; do
-		local script=${x%:*}
-		local sym=${x#*:}
-		sed -i -e "1i#!/usr/bin/env python" "${script}" || die
-		chmod +x "${script}" || die
-		ln -s "${script##*/}" "${sym}" || die
-	done
-
-	# i don't wanna know how these pass for upstream with wrong helper names
-	sed -i -e 's:\(app_test_helper\)\.py:\1_pure_python:' \
-		absl/tests/app_test.py || die
-	sed -i -e 's:\(logging_functional_test_helper\)\.py:\1:' \
-		absl/logging/tests/logging_functional_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=.
-	local fails=0
-	while read -r -d '' x; do
-		ebegin "${x}"
-		"${EPYTHON}" "${x}"
-		eend ${?} || : "$(( fails += 1 ))"
-	done < <(find -name '*_test.py' -print0)
-
-	[[ ${fails} -ne 0 ]] && die "${fails} tests failed on ${EPYTHON}"
-
-	# we actually need to clean this up manually before running the test
-	# suite again...
-	chmod -R u+rwX "${T}"/absl_testing || die
-	rm -rf "${T}"/absl_testing || die
-}
diff --git a/dev-python/absl-py/absl-py-2.1.0.ebuild b/dev-python/absl-py/absl-py-2.1.0.ebuild
index a2f2827cdd64..93edca72b17f 100644
--- a/dev-python/absl-py/absl-py-2.1.0.ebuild
+++ b/dev-python/absl-py/absl-py-2.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a341e60e0f29..dcbb88e296a9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,17 +1,7 @@
-DIST boto3-1.34.18.gh.tar.gz 765458 BLAKE2B 29414e20fa034f63c899b6f2d5460d8973dd617aa97adbe1940daaf3f4a08cf9286bf24709fe9bcd745fdec8415578a87033f99cfd1335baa8ecf29f1723074d SHA512 aa5dc9363d3f04f49a40ea352ab75a30b52e9b1aa1153ab4ed9d6bef6059ea6cb0cb04301158f0e857d9abd19c670db447dda6cd9d8898d6c71c0b69242775fc
 DIST boto3-1.34.23.gh.tar.gz 766609 BLAKE2B d00b010c84c41695f02df58a51d483162af1ba770263218b6465132fdb104424ea8dd7c8d96e278c50700aa3c90d2321a21d31e9ae3b42712aff31a1a5c4b65d SHA512 4f1c0cafb3d511a23c07b97ed2b41369299d0a4819e0bf103288c7b44074c93bc55b729a2979b133a50d390660078a0bb0e251dcd1523244fdbe06cae6ef037a
 DIST boto3-1.34.29.gh.tar.gz 769654 BLAKE2B 3eec92f78f343c1806eb7ad96a31b07592ffb355aed5bca75b9cf9bc32cc240a1c254cd43e618d7cba442dddab31035f43f319aa674b5fd6ee99e93d76514389 SHA512 1dff0825811b346e1300030770f00dfea9694d3f6c4beccddfb2ff00520503271b617321e124a1d922da8e8fb1d2c2beb08a83f23eb5e5754bf1d519ea994cf3
-DIST boto3-1.34.30.gh.tar.gz 770197 BLAKE2B d2eabd13c0c38fddf96caed27e57c7558f5639daa343b5331c6f6d6a82eb2cd95819e77c389e05676c104a51d398515e68562fd3da8e54f7c0febf6a1d0d2419 SHA512 b0d3924ee4413f3cdb4a6efc11b30af944d6e183f5b5d49ae39b3da05f3794739f0d66c19bde0ab32243ea9ae16cbc43c042ad41b8fabff58a3a704978f9f309
-DIST boto3-1.34.31.gh.tar.gz 770337 BLAKE2B d39a6d173fbe5ddcf305260a36d5788dd920d387e28d6f8ad32f304a2e42fce04f5527568e261bfade2a3c6dca29c1519177df1c881d59b4f88e484cd6302b9f SHA512 50828306a5da7cbdfc0a1e3028da15c6db6d54d36c1c8e641f777c6b62d4fcead9a6239c7a72667b219b3cfbc9e1008e47ee16ab60deda24cf0d88136ed52d5e
-DIST boto3-1.34.32.gh.tar.gz 770755 BLAKE2B 4e2c47833d41539fb6c489ecca4d907e2ebed00e7a7ad801c839763e8001478c0be65d7db83f30b981684075549f8a2a2fce56fe6d1574ccc4d4ca2e2f46956b SHA512 33743754aed8e6bbca2fccd932719eb30065cddb57a13ff24538e539be4aaff023271a6daa7d974e3ea5048dd35734ebb04680393a7991671ef88719b94cad35
-DIST boto3-1.34.33.gh.tar.gz 771413 BLAKE2B 44322f09244e39950e481737366430d31f1a12104b426d896382f12c84439412a729b6f919ac9fd66eab51b394a826a3a3f39176b9d21ab5d27d69aa9ae2df9f SHA512 8d34ff6d05bd32f10308ac0063f062376da005d7cec65842c264079fc7cc5d87807dd32140092c6147576c27d4c465f3cd8850abaf06f2c9b9ab53c21052bea5
 DIST boto3-1.34.34.gh.tar.gz 771553 BLAKE2B 52459e1baefd7986256bb6c89074aac365fb14c8fdd1b04a79bc02b6722e1e8e5f0d59b426e519947ab1795d12defbde2768af97dd3a2cdef576fdb535422567 SHA512 d0d9c47550aeb46aa3095d08583931d79fe38da8498a3ece322d7dea07b25c3569f7b44ed2afdb53cae98e4e3c337e8bb91a87c325d88798488e6ba87c73d9cb
-EBUILD boto3-1.34.18.ebuild 1386 BLAKE2B 8d99a5817d661c2385af4f226e75a26ae16399ccf74ebbc7b172ecc2c70745440de7238e42fea98267fea4c82904f9a0abddfcc234c952b588855295061f16b1 SHA512 7114f33fe34e4091695d425d4497c92586d9bde0314358b992458bfcec365ee5c8c2ca856fdb7447c8429fb841faff0d0f2ec171b1a825b5e678f037d79dbdca
 EBUILD boto3-1.34.23.ebuild 1386 BLAKE2B 8d99a5817d661c2385af4f226e75a26ae16399ccf74ebbc7b172ecc2c70745440de7238e42fea98267fea4c82904f9a0abddfcc234c952b588855295061f16b1 SHA512 7114f33fe34e4091695d425d4497c92586d9bde0314358b992458bfcec365ee5c8c2ca856fdb7447c8429fb841faff0d0f2ec171b1a825b5e678f037d79dbdca
 EBUILD boto3-1.34.29.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.30.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.31.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.32.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
-EBUILD boto3-1.34.33.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
 EBUILD boto3-1.34.34.ebuild 1265 BLAKE2B ba7f54112a52fbd951c886d41b7deb5820caefe05c87f7cdf2564e8cdab75359bd0dcde93be72c588c3422ef1b69043daa8d9ffee43da72efcc9e522814396da SHA512 0fb5d2d3bd9f8fd424837df59aaaad023777459818141a3171f747bacdae21f81cac690da36af13123f20acf5a46d6edb90f76afe0773915526d4a816dea510d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.18.ebuild b/dev-python/boto3/boto3-1.34.18.ebuild
deleted file mode 100644
index f0ba0e2c45f5..000000000000
--- a/dev-python/boto3/boto3-1.34.18.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.30.ebuild b/dev-python/boto3/boto3-1.34.30.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.31.ebuild b/dev-python/boto3/boto3-1.34.31.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.31.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.32.ebuild b/dev-python/boto3/boto3-1.34.32.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.32.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.33.ebuild b/dev-python/boto3/boto3-1.34.33.ebuild
deleted file mode 100644
index b64e7191fd19..000000000000
--- a/dev-python/boto3/boto3-1.34.33.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index cbf23c8c1fbc..0380ac41d1d4 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,7 @@
-DIST botocore-1.34.18.gh.tar.gz 12634296 BLAKE2B c3f18b042ea56c65f66b578f5b010613e34d4ca7a203cdbd479ef781fbebf3876b40623468e0fbbf7721f9a3e7ad82e71d1771bb24c721e3bc450acaff1f296a SHA512 bd0ace3da7e45edf98a13b1616b0699b0a2e2c3aec1e59dc7f8c11a3817fb1aefc8aae5634abcbf24f242c155df24ba93348f55fd6cb588abf129010b28f351e
 DIST botocore-1.34.23.gh.tar.gz 12647072 BLAKE2B be20994714a1f31ac5272d5b7be8424e574be1059c5be311e68d1932eb6884a54f71287dc5a9c11996063e4c2ab15a342bf778a0a90620710761e63a5deaa170 SHA512 fcc1879245e8d848c8cd6283af904e0408a5bdaa3b3e14c4ae267735cb29bdde50f1da5f3232ea23053f25fc1f29a1204a08a5c820909cf8667595543b6cfdea
 DIST botocore-1.34.29.gh.tar.gz 12665018 BLAKE2B 928c27ae62a5e2675dc5476af05a4390cbeaf9d5c64cae6a5af0d5348f703417f48431258fc7c4ad316908fd29f6bfeb5a7c76290ea9622172f3d787f40021c7 SHA512 5314900eecf2d31fe08bcb9efbc1a361467fe034129c85f5cb4a678275115292fc5a6a95fbbe3cc06aa0a1387e14dde0f9115a9aa25ba59dba62a02c3b8db43b
-DIST botocore-1.34.30.gh.tar.gz 12666051 BLAKE2B b6a19b4145b17855a65ecfd89150613b460616413f55b112df54dd60fbd946d7bee1f33d615e859e9f56e49328ddb91cb9e1c9b350686a37eccb1892850dbdf0 SHA512 8ce09d2ffa190fb50fd2a9b98ad0bf36de886d5b9f2a0e833e425a0bbfedca7f98b8de50240eaa81d1b01b68bbc96f6fce706b0547a508140e615aa9c3927c26
-DIST botocore-1.34.31.gh.tar.gz 12665042 BLAKE2B 2cf79fb1ea31921fd9c285b71d66fc645e3d22d599533eb30754c0b39337c871ac1d660bfe0786eccd9bc8d8e03c573cef00ab0363403e387df4fcffa9ad5fb3 SHA512 a740897de2c375b668b56af5ff6da3dd01b5420dcf4ae4a5f9805267c6b33f25364e16a1c2c199b18a95d6ed222be71ad9c6ba033cd0b45daf101f8b33c2b0b7
-DIST botocore-1.34.32.gh.tar.gz 12673734 BLAKE2B d9661e779e087c1628267b936f59991a39acae836e57e118b86bc51beeec8eb88898a66f461bbcd26479b12cc7acf22371a52dfde10198ddb2a48a6d5ac29c84 SHA512 1d9a119dfb91dc73e2011becbc06b38a87ac73386a9e05741a220303a5b886d45aeac425b34c68196606591d5e6d6e82f3883494fa9f28bea532d7bdd57a5620
-DIST botocore-1.34.33.gh.tar.gz 12682547 BLAKE2B a14d110e971bdfe1bebb6dd949f27712cd079c4d23b7f4a683389c6601400eb52c5f8ba92a2cd9fb6fcfb0d709b514af16235dd9a0288e89e4ce7bfe99c7cb11 SHA512 75c7b37e97b246bb7eb628340d1fc15b0c01e42ac0d545d7d28807e2bcb2b4bd3eb365d7574ae5cf0c6429c8e3e3d25d5d2317ee471a808d069a665ba6e09090
 DIST botocore-1.34.34.gh.tar.gz 12682925 BLAKE2B 514e6946558d1014371ca7ae4c76614b9714e0444e65f9606abe059cff1e1c467e81d913dad849ed9468a557499daafbdb19bbabef7ef3ed1f45607afa1f545a SHA512 4bc0bc57f4b29c461cade471e18d0f04ecf081a33bf966d80ab09832e0a5af2c08808b9fe72be9ea6a04b37e8207cdf38e43ec588c38ab9546740863e7a206ba
-EBUILD botocore-1.34.18.ebuild 1517 BLAKE2B d03af69902c7785c2b5b4d74b2783c710f9c40b401e82847ecc2255420b64a4fbb91042dd07c1846c5da01d095f51faff6ecc0ec85c370fa9ad1ade4f6e1e283 SHA512 34e0b3a1dcdb3be35548bb1a6d1b5bd892a75ad9ef8727db516c295299dd65e3956483682ac2c2f869e755611ddae30a8efb62513726d259a386af4e733206da
 EBUILD botocore-1.34.23.ebuild 1517 BLAKE2B d03af69902c7785c2b5b4d74b2783c710f9c40b401e82847ecc2255420b64a4fbb91042dd07c1846c5da01d095f51faff6ecc0ec85c370fa9ad1ade4f6e1e283 SHA512 34e0b3a1dcdb3be35548bb1a6d1b5bd892a75ad9ef8727db516c295299dd65e3956483682ac2c2f869e755611ddae30a8efb62513726d259a386af4e733206da
 EBUILD botocore-1.34.29.ebuild 1412 BLAKE2B 95d189190ccd8a55e40de608a893eb696f064b02646e57793e24a0e56b1d05c79864ba1979c73dcad5f873758920fd1ff1dfe35861efb7c0cf0d89414e0f686c SHA512 d19893b851107afbf50a92291e1142595b0e6d9a3005c45b84558cec11ff1cb3473dfd7410f9486e62015cf35e69c5692c5c5d733bff851c527222c579f0d59c
-EBUILD botocore-1.34.30.ebuild 1412 BLAKE2B 95d189190ccd8a55e40de608a893eb696f064b02646e57793e24a0e56b1d05c79864ba1979c73dcad5f873758920fd1ff1dfe35861efb7c0cf0d89414e0f686c SHA512 d19893b851107afbf50a92291e1142595b0e6d9a3005c45b84558cec11ff1cb3473dfd7410f9486e62015cf35e69c5692c5c5d733bff851c527222c579f0d59c
-EBUILD botocore-1.34.31.ebuild 1412 BLAKE2B 95d189190ccd8a55e40de608a893eb696f064b02646e57793e24a0e56b1d05c79864ba1979c73dcad5f873758920fd1ff1dfe35861efb7c0cf0d89414e0f686c SHA512 d19893b851107afbf50a92291e1142595b0e6d9a3005c45b84558cec11ff1cb3473dfd7410f9486e62015cf35e69c5692c5c5d733bff851c527222c579f0d59c
-EBUILD botocore-1.34.32.ebuild 1412 BLAKE2B 95d189190ccd8a55e40de608a893eb696f064b02646e57793e24a0e56b1d05c79864ba1979c73dcad5f873758920fd1ff1dfe35861efb7c0cf0d89414e0f686c SHA512 d19893b851107afbf50a92291e1142595b0e6d9a3005c45b84558cec11ff1cb3473dfd7410f9486e62015cf35e69c5692c5c5d733bff851c527222c579f0d59c
-EBUILD botocore-1.34.33.ebuild 1412 BLAKE2B 95d189190ccd8a55e40de608a893eb696f064b02646e57793e24a0e56b1d05c79864ba1979c73dcad5f873758920fd1ff1dfe35861efb7c0cf0d89414e0f686c SHA512 d19893b851107afbf50a92291e1142595b0e6d9a3005c45b84558cec11ff1cb3473dfd7410f9486e62015cf35e69c5692c5c5d733bff851c527222c579f0d59c
 EBUILD botocore-1.34.34.ebuild 1411 BLAKE2B c322f7e557d9a1768fbb08c343983f5d20c1a08806b8af9b1e85345c7acfc046a13059fcca7cd63610287c437e9c05eabd759bb7cd3e04551f66b481a9b4dcbf SHA512 93c32833e354efb9851b26574fc01a865f1b3b86f8dbf3794bc33fc3e2f561246485d776662fc6f9872ec22fea2c061d32768b2b6e9441f2251947fafa5486be
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.18.ebuild b/dev-python/botocore/botocore-1.34.18.ebuild
deleted file mode 100644
index a3cce61fb748..000000000000
--- a/dev-python/botocore/botocore-1.34.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.30.ebuild b/dev-python/botocore/botocore-1.34.30.ebuild
deleted file mode 100644
index c90392068414..000000000000
--- a/dev-python/botocore/botocore-1.34.30.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.31.ebuild b/dev-python/botocore/botocore-1.34.31.ebuild
deleted file mode 100644
index c90392068414..000000000000
--- a/dev-python/botocore/botocore-1.34.31.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.32.ebuild b/dev-python/botocore/botocore-1.34.32.ebuild
deleted file mode 100644
index c90392068414..000000000000
--- a/dev-python/botocore/botocore-1.34.32.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.33.ebuild b/dev-python/botocore/botocore-1.34.33.ebuild
deleted file mode 100644
index c90392068414..000000000000
--- a/dev-python/botocore/botocore-1.34.33.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 3e0b78462bba..dbed73ba776b 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,3 +1,4 @@
+AUX build-1.0.3-setuptools-69.patch 3954 BLAKE2B 7c62fb1deb7cce42de31bd66a0aeea9f6393c8d52406d94056fc8b820488573134f7246eec906a6666cd6178f06cca68bfbc6e3ad831c568eba3f909aaac108e SHA512 2d07f6796a3673ce301a93967cc1b681ff80b143ea11f4bae3a0c96740d1911d68aa0d400ea4d4af6d32819bf4c4bcc3213c7d3bbe48755fbd9534c84b491657
 DIST build-1.0.3.gh.tar.gz 43412 BLAKE2B cb707b21582a1f7a5f649dcaf0fa7d30d253641a51c6af1284b17df46ad877af5280b5d1a07ce7eb90ef468d0f850e3e85dba1f24f7942c6ba432789760ae670 SHA512 c2c67ccf407bb1780c90e02bbc2692b8b10cfe441f445c05d38a675f3498d1d6f94306dcbe270c181e14471f1dd3712e2cba33a4792f6140e2e9f0aa3c8e7b81
-EBUILD build-1.0.3.ebuild 1664 BLAKE2B ffd31b821df0fc2c0d55e53d019054f053b6b8ea740cc67c6a06d808fb1fc78fa51b76a63b9f1da6ff35d11c02fb54fa99705c942c3b0f8b3f6946472b8a3976 SHA512 1c86382f2fb2c61631f3ac5c204831cf9de040ffdc4226d7f4364bb2d81bcf245f49bbdb9406fbd7367a42dbc0b4156f5a4dcac5535ebe8fe4b5eac42633cd2b
+EBUILD build-1.0.3.ebuild 1759 BLAKE2B 54ff42e04a8eb6f5faf2d234e1ecd68b9b66ba01910a19374a9bab73b0611acd1728ade87f324e036ba5acb614913f50460566260ed2858ff748076ed9755c8d SHA512 7deff279ef23a18875aa195babf3a614f1396b367ef5f4bb39ecfd6486bf9f148d77112231c2aa949d60f1fb21fb317ba59e6d1863c1cd3b7f2602dd7a8ca3c6
 MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/build-1.0.3.ebuild b/dev-python/build/build-1.0.3.ebuild
index e1c120c79606..b5380c983e46 100644
--- a/dev-python/build/build-1.0.3.ebuild
+++ b/dev-python/build/build-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,6 +41,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/pypa/build/pull/722
+	"${FILESDIR}/${P}-setuptools-69.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# broken by the presence of flit_core
diff --git a/dev-python/build/files/build-1.0.3-setuptools-69.patch b/dev-python/build/files/build-1.0.3-setuptools-69.patch
new file mode 100644
index 000000000000..3aa79d080245
--- /dev/null
+++ b/dev-python/build/files/build-1.0.3-setuptools-69.patch
@@ -0,0 +1,102 @@
+From 9f6e34228a0da7e5ce724f400a34bc9f4e69a1ac Mon Sep 17 00:00:00 2001
+From: Henry Schreiner <HenrySchreinerIII@gmail.com>
+Date: Wed, 17 Jan 2024 02:44:57 -0500
+Subject: [PATCH] tests: support setuptools v69.0.3+ (#722)
+
+* tests: support setuptools v69.0.3+
+
+Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
+
+* tests: missed one more normalization fix
+
+Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
+
+* fix: add MANIFEST.in for old setuptools in tests
+
+Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
+
+* tests: used the wrong name
+
+Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
+
+---------
+
+Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
+---
+ tests/packages/test-setuptools/MANIFEST.in | 1 +
+ tests/test_projectbuilder.py               | 6 ++++--
+ tests/test_self_packaging.py               | 1 +
+ tests/test_util.py                         | 6 ++++--
+ 4 files changed, 10 insertions(+), 4 deletions(-)
+ create mode 100644 tests/packages/test-setuptools/MANIFEST.in
+
+diff --git a/tests/packages/test-setuptools/MANIFEST.in b/tests/packages/test-setuptools/MANIFEST.in
+new file mode 100644
+index 0000000..e69e3cf
+--- /dev/null
++++ b/tests/packages/test-setuptools/MANIFEST.in
+@@ -0,0 +1 @@
++include pyproject.toml setup.cfg
+diff --git a/tests/test_projectbuilder.py b/tests/test_projectbuilder.py
+index d46927b..69914ab 100644
+--- a/tests/test_projectbuilder.py
++++ b/tests/test_projectbuilder.py
+@@ -502,7 +502,8 @@ def test_metadata_path_no_prepare(tmp_dir, package_test_no_prepare):
+         pathlib.Path(builder.metadata_path(tmp_dir)),
+     ).metadata
+ 
+-    assert metadata['name'] == 'test-no-prepare'
++    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
++    assert metadata['name'].replace('-', '_') == 'test_no_prepare'
+     assert metadata['Version'] == '1.0.0'
+ 
+ 
+@@ -513,7 +514,8 @@ def test_metadata_path_with_prepare(tmp_dir, package_test_setuptools):
+         pathlib.Path(builder.metadata_path(tmp_dir)),
+     ).metadata
+ 
+-    assert metadata['name'] == 'test-setuptools'
++    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
++    assert metadata['name'].replace('-', '_') == 'test_setuptools'
+     assert metadata['Version'] == '1.0.0'
+ 
+ 
+diff --git a/tests/test_self_packaging.py b/tests/test_self_packaging.py
+index fb1d124..3a436ef 100644
+--- a/tests/test_self_packaging.py
++++ b/tests/test_self_packaging.py
+@@ -27,6 +27,7 @@ sdist_files = {
+     'tests/constraints.txt',
+     'tests/packages/test-cant-build-via-sdist/some-file-that-is-needed-for-build.txt',
+     'tests/packages/test-no-project/empty.txt',
++    'tests/packages/test-setuptools/MANIFEST.in',
+     'tox.ini',
+ }
+ 
+diff --git a/tests/test_util.py b/tests/test_util.py
+index 8045b51..0ab81b8 100644
+--- a/tests/test_util.py
++++ b/tests/test_util.py
+@@ -12,7 +12,8 @@ import build.util
+ def test_wheel_metadata(package_test_setuptools, isolated):
+     metadata = build.util.project_wheel_metadata(package_test_setuptools, isolated)
+ 
+-    assert metadata['name'] == 'test-setuptools'
++    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
++    assert metadata['name'].replace('-', '_') == 'test_setuptools'
+     assert metadata['version'] == '1.0.0'
+     assert isinstance(metadata.json, dict)
+ 
+@@ -41,7 +42,8 @@ def test_wheel_metadata_isolation(package_test_flit):
+ def test_with_get_requires(package_test_metadata):
+     metadata = build.util.project_wheel_metadata(package_test_metadata)
+ 
+-    assert metadata['name'] == 'test-metadata'
++    # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
++    assert metadata['name'].replace('-', '_') == 'test_metadata'
+     assert str(metadata['version']) == '1.0.0'
+     assert metadata['summary'] == 'hello!'
+     assert isinstance(metadata.json, dict)
+-- 
+2.43.0
+
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index e848b03202af..c513545e3d80 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,3 +1,6 @@
+AUX cbor2-5.6.1-cext.patch 1256 BLAKE2B 183cc230018447f40b3bd47183e7079a12f083dec569e6f3e88102b0f1a15aba02ca1034091c685119a2b37cc4cdbd63c31b21382c1527d590b2c5ad19e2ccd4 SHA512 129a8ce4e8e2bddf9180e760002ffdd534f0a6b695027b150c7725aa83f7c40a065e214fa385da9a23faf2256b64e4705deaf49a6fe32e01e83ee9c006b3d394
 DIST cbor2-5.5.1.tar.gz 94221 BLAKE2B 651d229c9a4e5fda2ae61302f8bd72a165f15e008333525a301f2fc94dc81259698f4ae9b8c1f3a0b5fadffadd4d55f2ba4bf1445938a10342997bca64ceba31 SHA512 7878b997ae5bdf44cb04b7cef8445a94f11c1722819ea85073bd56f99976cf2c1c1180e72d9ae9cd7dd7d06a6aa55dc1cb3f919a869098a9feede210f8355fb4
+DIST cbor2-5.6.1.tar.gz 99268 BLAKE2B 95a310c6fea00f90ba512d836691ab8fb75ebb9f6b59ca0698b7f97d2c969d2f8809ed2717c48354812f309856a35873c96571194dd86c48a225696b27ec806f SHA512 9ddf2c3690780816ff50ff4ed371435ca45b597b706254c37c9f01d1f1a699892e2c945a72e69b5506a803c41692f399b58b4e32d9409a0197c677e537e656b2
 EBUILD cbor2-5.5.1.ebuild 1062 BLAKE2B 13d3865fb6e82044d578bc30b6328672b7636756fc9db0b0f854c4cdac1db3cf74962024b6169d2e197e1e350085afd90f429b5ec83bbaff0c6a364dab964287 SHA512 cb6c47496f474d46934aaa14941a49feef5768a932d6b7e3bb4e353cf0e8db000d55a72d604d2bdb0d819df031daf9bb39aa03b511e0f7275f2c4b8c3fcae8c9
+EBUILD cbor2-5.6.1.ebuild 1170 BLAKE2B b6efaf53c508cdceafc3d4314fffe52e5e550f7f1c9199d22512744b345d8f7c4033946d31956dd8a63fa6b9db24b83a2a0f5869c6534b7e8dd9aa94aefbc339 SHA512 76108ca8ffd7f6f1d52508f5109a57e2586497d69da57b555f819494f1fe4ecdbe8acd8ead2a65f663b4931bb95b301197bc08a5aab444a557855a6665603e7c
 MISC metadata.xml 1142 BLAKE2B 689bac6d11c7cd4044b2528c5a6bbb183accdada7865efa65ffa6fb52160bf34d4e3629101eb9ceac88e842caae92f4df1e9ce2a5c3ffaa709ece08786267f96 SHA512 82647cdf6d750d791a46784b92cc8ef2f4ead08227f266f6ad782fbaea2e90fea0cfabe5d79848b3c9253a38af1e105b9a279d9e7ca4e1edd3aec79aa5897a1a
diff --git a/dev-python/cbor2/cbor2-5.6.1.ebuild b/dev-python/cbor2/cbor2-5.6.1.ebuild
new file mode 100644
index 000000000000..34465192386c
--- /dev/null
+++ b/dev-python/cbor2/cbor2-5.6.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
+HOMEPAGE="
+	https://github.com/agronholm/cbor2/
+	https://pypi.org/project/cbor2/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/agronholm/cbor2/issues/213
+		"${FILESDIR}/${P}-cext.patch"
+	)
+
+	# remove pytest-cov dep
+	sed -i -e "s/--cov//" pyproject.toml || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x CBOR2_BUILD_C_EXTENSION=1
+	# pypy3 not supported upstream
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		CBOR2_BUILD_C_EXTENSION=0
+	fi
+	distutils-r1_python_compile
+}
diff --git a/dev-python/cbor2/files/cbor2-5.6.1-cext.patch b/dev-python/cbor2/files/cbor2-5.6.1-cext.patch
new file mode 100644
index 000000000000..1695038e4b42
--- /dev/null
+++ b/dev-python/cbor2/files/cbor2-5.6.1-cext.patch
@@ -0,0 +1,40 @@
+From 4de6991ba29bf2290d7b9d83525eda7d021873df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
+Date: Sat, 3 Feb 2024 13:03:38 +0200
+Subject: [PATCH] Check PyObject_Hash() return value for errors
+
+Fixes #213.
+---
+ docs/versionhistory.rst | 5 +++++
+ source/tags.c           | 2 ++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/docs/versionhistory.rst b/docs/versionhistory.rst
+index 70948c5..c91cdd0 100644
+--- a/docs/versionhistory.rst
++++ b/docs/versionhistory.rst
+@@ -5,6 +5,11 @@ Version history
+ 
+ This library adheres to `Semantic Versioning <http://semver.org/>`_.
+ 
++**UNRELEASED**
++
++- Fixed ``__hash__()`` of the C version of the ``CBORTag`` type crashing when there's a recursive
++  reference cycle
++
+ **5.6.1** (2024-02-01)
+ 
+ - Fixed use-after-free in the decoder's C version when prematurely encountering the end of stream
+diff --git a/source/tags.c b/source/tags.c
+index b718f55..ceb0916 100644
+--- a/source/tags.c
++++ b/source/tags.c
+@@ -182,6 +182,8 @@ CBORTag_hash(CBORTagObject *self)
+         goto exit;
+ 
+     ret = PyObject_Hash(tmp);
++    if (ret == -1)
++        goto exit;
+ 
+     // Remove id(self) from thread_locals.running_hashes
+     if (PySet_Discard(running_hashes, self_id) == -1) {
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 19ecde225338..9a264572a210 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,5 @@
-DIST cfn-lint-0.83.8.tar.gz 3901954 BLAKE2B 33d728ddf7ae5bcb29fdb8211decd85b72519acd60b80831aafa59d042105af45a3f07e2d6ea9838b80af68f6eb19ba84be562e4a7104c64b68737ede3497b0d SHA512 f520f5e211284197ff3b2c5287cb72384544a273e1fa1d3007e7a3ad85ef1b4bae4ed0c0db609989ea51de29630454d97ba13a8d97ccc06992a7fb0da467e0b7
 DIST cfn-lint-0.84.0.tar.gz 3890781 BLAKE2B 160c8f29f2551c0885d784d725e5e7077aaf162b13f8bcbe8f04c2f6dd939bdb22166ebc3fbba6ba71b0ec68356f520ae1968a447a7a24082eb85271c684aa1b SHA512 0e783c6c2fc590ce59526da887a3bdcc2f8c55e6d5d6e11f49df82c72d387a18abbac545b861bf806e829080b7be6da00d948d32769396b6730570ab4bc23f7a
 DIST cfn-lint-0.85.0.tar.gz 3875659 BLAKE2B 64bbd4ba0dc153b78da40588a2d0e9f34feafcf17b7262b84f3c3e0a98ecc6cc7b78152dc829fd2bcb3f3c3fe601fdf217111bd5a11d402a3b70ceda822206f7 SHA512 b7d65fb360e8743f08ec2feb451e6dc6cbda62c0850a954e5beec8d6a2a6bee2be2dddee36f262f571e5e9838deb7237895a3020b951686423315f5914f82d67
-EBUILD cfn-lint-0.83.8.ebuild 2065 BLAKE2B 1c74b61135135c68cda92c13305673d9cf690f3ea6882c63fcfe51c0570ed87ce3843670f7c2f085a7a52b34e2b947f931ffdfb1f2ecad6a79fbb575370027cf SHA512 a83f63069afa0ede0760b3c4df18f2e0a045ba5dcbfed2c8486cf19df39eaa431d298e3cce5be92b588ef01dd25f86e5201e41b9d331ba2877b84c790e81727b
 EBUILD cfn-lint-0.84.0.ebuild 2065 BLAKE2B 305971d37a07127cd5b530ffe937c7ef9096d5aa52b9a2124f7cfb054c8ebe9dda1430937bb8ca7d05ad3070420ce3d6927debc4163fff3ccd6723f55e2a633e SHA512 cd0aaedadcf8e9e4f0a0711bde52d223a5e88d7ac08a293acbe4ff22abb13abb80d099aaf6cf1e48bb5b6b27c05be8a993088e3c98c42eb430643f748d37b5c2
 EBUILD cfn-lint-0.85.0.ebuild 2068 BLAKE2B c25c0933d27f785f1f98ee0a9040a36e25b369a4e67bcb47bec188bb303a2133755ad081b8fb52a0d86ed3ee59e7a68c8e99cca9b1a76f1d26ece4650be8635a SHA512 dd483335192e786b1d994556b7070d5ae7c8f0e06f3749496c07b763e28c41a3ab310f2a8972c0e39e288878fefca7b98d009a5ef478d77e07a0bb71502229b2
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.83.8.ebuild b/dev-python/cfn-lint/cfn-lint-0.83.8.ebuild
deleted file mode 100644
index fefe773cb013..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.83.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.82.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/chainstream/Manifest b/dev-python/chainstream/Manifest
index 1469eb435c6e..8fc59c3579e0 100644
--- a/dev-python/chainstream/Manifest
+++ b/dev-python/chainstream/Manifest
@@ -1,3 +1,3 @@
 DIST chainstream-1.0.1.tar.gz 3160 BLAKE2B 1aa8f9323cbb0f71c4bb7ab1aa709f369cc836b12b946de3d5e4a9beb4acb4d6a7d63642285fc3572eb6d85243bb08d9d387c02e768342cb1a90f91bf7b404bc SHA512 5badc4ef451ea208acf5acfe80a24541e2bbb8edfe43cca0cdac7d229d6a68c2df07d2c83d71d8d4251bc0d4b443952d0cdad638f603a85f4f4657717d0bcbac
-EBUILD chainstream-1.0.1.ebuild 676 BLAKE2B f35b772813ecc90bbf6f14670f10d5bb02cdfabeaed11f83bf68b60562cc8e7518fe1faa472607e11473787a2fffc3a5e3ec665a499120ad9589b62a5786b967 SHA512 8ca2c03a3ab0946b3e901a0d4df813a0184b316ca71cb69bb1677f8cc6ee83013cffed42d85061a82759bf35e97bd60a9738f34267d8cb8ca6cfe1b8e22a3bb5
+EBUILD chainstream-1.0.1.ebuild 686 BLAKE2B 5ac9dbcb0b13de13ee1537a254ea19ad94751dfc38fa2d2dff836b2e479a0664e53d39fc381dacb43d56462dd9028367460a125b73811ba0560f85a35db35c98 SHA512 118da25c0af0625e6beddca04a8aaf1499764eab946fc26a300ac1f61216b9d1c1df9d9c73a5e2c856183452e996d014d2bd598dea28311abe537e4afb020909
 MISC metadata.xml 351 BLAKE2B d45afbe577fc94376974eb14ca268de0aad561e9df65813b17e851f9d11433c6ea037ed5cd15a8d8e4cb919568351690e113085b571435bf93102c620879ca6a SHA512 e5d3d24f3ad50335d3292f0236808943e8d1abad23aa34ca63ef5d5d987523719ee00249e4f922b3bb34fb678811e15172915a3b5ea3d2de246ea590b1343c7e
diff --git a/dev-python/chainstream/chainstream-1.0.1.ebuild b/dev-python/chainstream/chainstream-1.0.1.ebuild
index 6837a415e3a7..a07dc0a5a2fa 100644
--- a/dev-python/chainstream/chainstream-1.0.1.ebuild
+++ b/dev-python/chainstream/chainstream-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rrthomas/chainstream/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc"
 
 src_configure() {
 	# upstream doesn't provide build system in pyproject.toml
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 7bd599fb4847..ca5194c7b9fe 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,10 +7,12 @@ DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149
 DIST llvm-project-18.1.0rc1.src.tar.xz 131969632 BLAKE2B 0cc2f3049a89ee07182189a1ff7aec1751bfe6bbaed4887e139854737fe4eb0ec924b37d8d5b01e298d6a4b271735a615283465262345d0a288180edd6276139 SHA512 85afc331c8a023f4d8177cc42143b968b94d6987a7ed38b8be1170c6b4e1ef1a79d2d4e44d5fae98b713959b5d69bd4e44c6ba84355f59e8fe99588cbca03d7a
 DIST llvm-project-18.1.0rc1.src.tar.xz.sig 566 BLAKE2B c9fd7e92e0c6bb8291314ed388d518d15b75c5d4e7ba5da461c2176c5519d721c5ae95d8ecf99ce17bdc398cf23f13b540aacab306c2923e4c0ac8a5f059746f SHA512 0bb072ef2d3156241bcb74102c977db73720f38918e1a0b2cbe6191b6884ce5750ed9f5af69575599bad840c0151a04f81ebc5194c4ce258cbd6516d6c26d9cb
 DIST llvm-project-1f13203029333ac99cc9844b8b6915aae3fc0902.tar.gz 205629630 BLAKE2B cd6c127bc7b63fffc4707863ab8a34e23371ce28878818723ba74d78a1be1b43c2f401fba7de2084f628f9418b7f0e7b9fe9c224b92dc44233cde2f5e3470333 SHA512 0b35754d6e8836267393d0d63effe04e1af5851b217252953ca3a75e7d71e32b1188991d34ff649f8c1cf2a1b49b844ca7e0704597655ffd37d151f4b9a0cf36
+DIST llvm-project-78b4e7c5e349d8c101b50affbd260eb109748f8f.tar.gz 207433034 BLAKE2B ab7189fe82b5a9309348b499130295b3057dbb263ad9c60b1748e4ea92be3a85f0160baa1408dde5516650994951d9f948223d2d6260492a07b07dde51a51ff9 SHA512 366ecb02720d2b550ebeca989abf74ca1c93b2585a95fa378f44edc6c3329ee4e1548f5fa2cf7a19e59bc817abe6cc8850841415227380114c59b58867959a5a
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.6.ebuild 1203 BLAKE2B 7baa638bb302b5b97aea34e62d28035f6e2e7aab0bd626bae94d9b3ba9e776316a81003b55ae8a71008b13a664569c8587df927c5f925591addc99a2b4381832 SHA512 a2b00fe7edaf1cb1bb48c0e93555fbea3ef929f16d168b27e1ec1e3f38989e3220e6df1ab847ac2020faa7d44d957c6af7ec0723418e248677a40e29c071ddb2
 EBUILD clang-python-17.0.6.ebuild 1203 BLAKE2B 13f87c2782967c4fded88a60220b87e9f9f50d9c37543f30ab2b9ae94cdc5f53d2b1fb422e13450df50ecbb0e36f2a531705fd75f021f265e67f67dd08c85eed SHA512 8abd5bdb175a8c24c542dbcbc73617f075e50a555d9da698ae3139414c2fc11b9ee96d42af0829432c0d2f9d3c820683a2ef5946fdc4332f3d06e40466bbb38f
 EBUILD clang-python-18.1.0_rc1.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 EBUILD clang-python-19.0.0.9999.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 EBUILD clang-python-19.0.0_pre20240127.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
+EBUILD clang-python-19.0.0_pre20240203.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240203.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240203.ebuild
new file mode 100644
index 000000000000..bef9bf6fddbd
--- /dev/null
+++ b/dev-python/clang-python/clang-python-19.0.0_pre20240203.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/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="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+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
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/dict2xml/Manifest b/dev-python/dict2xml/Manifest
index 0a69cf60a5d0..82947facfbcc 100644
--- a/dev-python/dict2xml/Manifest
+++ b/dev-python/dict2xml/Manifest
@@ -1,5 +1,3 @@
-DIST dict2xml-1.7.3.tar.gz 14240 BLAKE2B b28343f2cfeb59a91011bb158ffe7db008f19be1576293e6b07c3b49e07f3871761c8a3a32c214bf0608602487e2e7110c7f2a2f31a7dbf44a441f44ca7f568b SHA512 631415e425688c612c15b72fc339db33977df32eb25f7f8f03a63e5115c8e06f4aa5b247ded3e16cddbb9b16597aeb0ef218f193c5f4c44ebdcd7e39c2052ed2
 DIST dict2xml-1.7.4.tar.gz 14333 BLAKE2B 9d1a5180d6cffed171aa973902d6e88190b8bd90cd9e4d86744b5c074d82e45c7571763aa9cca67d190cf7af1b1fdd155cbff906a44a638dcb3a7033f1be86ba SHA512 13a2b34783e5f6414c173059ba16a2061ecaef41355b7b0099546d704c9c28b1e0f9ea3186d4b0db99083e66a2f22e69e57a4a415b72c00fd1e17bcb435e7462
-EBUILD dict2xml-1.7.3.ebuild 540 BLAKE2B 15b652526fc057c2055fb25d0d6914a7ba4b42a9cec5fb2627627bcd69de973f0b374f64d4a1de06ca05ad03bb547cb524c8a5ac2d1cbe67810862b7a7e27a56 SHA512 c1d896e9b10f7dc8c7265875220ca598d9b59760007840e5c85adfc014a8c811a0b025d89a0816523befbc998f2c2e5cb2c1fe7a245d1083ea36a70ea2634985
-EBUILD dict2xml-1.7.4.ebuild 542 BLAKE2B 4d26e8b860a321621638cfd20967afc5e9fb70d0582043d8bde8de74957dd73f4a3a371a1848ed63f9d2142c257a86ea57300016b586dcc4ef6278aed9b0c169 SHA512 a4474f84f07b5ae17065db483813b66ed7b4806fe1d84b0dbc2ad8ee03276b012ca45787e915559291516818ae5d6aa5f4c87bbf22ee85d9502ec0c920ba2efa
+EBUILD dict2xml-1.7.4.ebuild 541 BLAKE2B 8d46e87c2e9340aa83e204de93ca2a8b5c072e94997a95c533f6dd83333b27f3ee1f19be711b6a4525526c0893d8b26d2081f346eec8b110b5d79045a7e6af4a SHA512 007fa24f511354bb8d30961ef6d61fa28cc39593a906618315659c220dc118e755be821b575b1892830ddeb715095024101a36d26e3a2b04fee17e8c149e3019
 MISC metadata.xml 483 BLAKE2B 590704cfc7c04bef7ac3b4b01677c743887a19c842597a81a12d374c0126ac4feb5ecf3ee6a1b2ee8bb866a2823ecd5e4c556f3ddf512bff00d047d40ee33929 SHA512 175a0080449e7a29aae0398303911acf868bc9a444eb2883d4cca071ac1daafda2ad352274c33516fe06f11ce8bdc029d1e277a8455a3819ff51650388ed11cd
diff --git a/dev-python/dict2xml/dict2xml-1.7.3.ebuild b/dev-python/dict2xml/dict2xml-1.7.3.ebuild
deleted file mode 100644
index 43a833a01b68..000000000000
--- a/dev-python/dict2xml/dict2xml-1.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small utility to convert a python dictionary into an XML string"
-HOMEPAGE="
-	https://github.com/delfick/python-dict2xml/
-	https://pypi.org/project/dict2xml/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-# dict2xml uses noseOfYeti for its test, which is not yet available.
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dict2xml/dict2xml-1.7.4.ebuild b/dev-python/dict2xml/dict2xml-1.7.4.ebuild
index b23f9330ef96..9bc60dec5202 100644
--- a/dev-python/dict2xml/dict2xml-1.7.4.ebuild
+++ b/dev-python/dict2xml/dict2xml-1.7.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 # dict2xml uses noseOfYeti for its test, which is not yet available.
 RESTRICT="test"
 
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index 2ec588f82ce4..2dd24ba4315c 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1,5 +1,3 @@
-DIST elastic-transport-python-8.11.0.gh.tar.gz 71944 BLAKE2B 9f5199b171f57169e2ca9d77f225a7ad1d67cc28550a41648f37305342f2cddb2c570e0b314057e49d4a5948ceacdbfbe3d928a456ef47fd334abebbf8c6c718 SHA512 b2ab09c63e5824d8cb59ed78728e4670115eee56bb07310e4d8a083b86eace4bc2dfc0dbefc4346906338acf195b193c0f2fc99a0dc1190ac30950fbe6fbcc70
 DIST elastic-transport-python-8.12.0.gh.tar.gz 72207 BLAKE2B 7777484c965eb893cd7d2cba1d39c2b33a005e7f6d6b3c12dd1cd0fb4e5c396abf36686421817ba1272e814ffef299453c885a6dcc3efe5cacd753bcd621384e SHA512 45834ccb4793d7aa7c7d1774ef26381b7ff0cf69221cc628efeb63a7ff8b163a68ff7f0ef4fa3a2b5ffd45e9374441d8b61b8a9b900f9055ddd67425cf0d727a
-EBUILD elastic-transport-8.11.0.ebuild 1598 BLAKE2B ce65e15c415baaf9260b6600e57fee9257ffb94ae913377ea3ff38c151fb8fddb7c61516e1ecc4b6b5274e155744819384a7957db427fb413b239d3d6bbc9a5f SHA512 9f667bc6ee65560e1c80e89995efb0222a5fd8453a1994d2d191c6931ce4a1605f24116d7a1a1d79ffd9ea5b4104e2fb726a1f3194282b7e549e5a2b7f4dca3f
 EBUILD elastic-transport-8.12.0.ebuild 1603 BLAKE2B 95871fe70ab33e20550de8a46d4aac28f638b583f3f781653930b49d3ecd1d51ae6430de7a92e1a1bf558ea12be8c66b92447e21701077687832b64f2c4475ff SHA512 2537e2e34fc88ffd49a96e02057b2cb9a118e2e4a1d02a71e78efddcab45ba8e96b08674bb1166af282fb5fe1ca575837bc7981327a2be4fc6f73f69e45e8c01
 MISC metadata.xml 658 BLAKE2B 7ba1da27d590421cdd7a24d01d38771b27ae65f09521e39bc84e691f3e587a3bccabcdd297350166e00324ca482dd0459e8213ed578d81f9e93469fd3efec48d SHA512 c39cf837ff098fb09c25d1933f43c0f20e1b2b5ae4e1bb5aa172aac43f8f36ea80437e3e59909b0c51d0f8301853bdb6b5dbd7f3498502baa8936939bc0210d8
diff --git a/dev-python/elastic-transport/elastic-transport-8.11.0.ebuild b/dev-python/elastic-transport/elastic-transport-8.11.0.ebuild
deleted file mode 100644
index 9f2dbfa5496e..000000000000
--- a/dev-python/elastic-transport/elastic-transport-8.11.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=elastic-transport-python-${PV}
-DESCRIPTION="Transport classes and utilities shared among Python Elastic client libraries"
-HOMEPAGE="
-	https://github.com/elastic/elastic-transport-python/
-	https://pypi.org/project/elastic-transport/
-"
-SRC_URI="
-	https://github.com/elastic/elastic-transport-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/furo \
-	dev-python/sphinx-autodoc-typehints
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:, *<[0-9.]*::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fragile to random warnings
-		tests/node/test_http_aiohttp.py::TestAiohttpHttpNode::test_uses_https_if_verify_certs_is_off
-		tests/node/test_urllib3_chain_certs.py::test_assert_fingerprint_in_cert_chain
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -o addopts=
-}
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 2c51b820a0b2..d2c0b3716000 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,5 +1,3 @@
-DIST elasticsearch-py-8.11.1.gh.tar.gz 902628 BLAKE2B 7a1d780ff9f326567b4023f4a87b2a3be430428c00c528d255502d36623b7d1d6e0811f50a03471254eb79fb1e4146ad24402f202c862cafb44ec16fbcdb454f SHA512 e2efbd3e0658180768a35b601e7bef2748390ce12419f82cdfb1656968666fcc6ae71411d4e88eb155b315d8d8197f65c3e25e6f1e18f04e6459662cf80ab12a
 DIST elasticsearch-py-8.12.0.gh.tar.gz 906227 BLAKE2B 95ebae72e94d57590e0c506a3e1655fec7ea61a192d909c6d2993121b91fbd5d3ce5385c0c687bd09ec2621ef1c416242adf969b12e2d3b26943da3fdbd7918d SHA512 5d8714ba110681ad78e0dc6d48bf67185a8b9dc8fd4fd99f6d5f773a52873c33471a5dc99a4635bd92dd21bb9e7dd957012da3f0610ed0eca0d748eb83ee8868
-EBUILD elasticsearch-8.11.1.ebuild 2075 BLAKE2B 14ed493b4df750127118b0d1632ce3e755e58ff12f4f33395786b6822d163ab3c844f003d55b55635b8f7f57f6d87d0f963179bda8fc444a42ef8db364614ec2 SHA512 da36f77e4556c5e5e900a3e0ac1165e2c11a385f60aed20c1056876a7c8a512bf2efc22fabe9606ce1df7479714d32ff11739fbab680a6474dce0c210a46a5d7
 EBUILD elasticsearch-8.12.0.ebuild 2075 BLAKE2B 65b527a55e30801a4d8629804a18e471a97fd2ff422d6c960dd7f88d12caa0aa5a6183edaaf34221f70ed2d703eeacd979fa3e8129a566050dddb6ef9dd11976 SHA512 f44d386eaa2d5024fb3015e3ab636da1b9debd4cb1ecdb43290fcc9114d511dfc959418ac8830a07eeb7357cc30abe1413594745a044262e4e5147506e9fdb20
 MISC metadata.xml 617 BLAKE2B f87827e173c4284a6ac830c48f92384140ad388a1c35562e5522ffc7fa654a9fc1eca14fd55b4365aec7ecbe1ca54f1a58772e240f09c3a56aaf25114b807cae SHA512 dc52446e828b8506e5144fb77e2bf5f761afeed8dda67c1aa72f0f67a3df838712d3deceba12c434b2d53923130e55ba6a71086ec289d90d5577cb5950b46999
diff --git a/dev-python/elasticsearch/elasticsearch-8.11.1.ebuild b/dev-python/elasticsearch/elasticsearch-8.11.1.ebuild
deleted file mode 100644
index 1888df04981f..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.11.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# REST api tests are a black hole for effort. It downloads the tests
-	# so its an ever moving target. It also requires effort to blacklist
-	# tests for apis which are license restricted.
-	"test_elasticsearch/test_server/test_rest_api_spec.py"
-	# Counting deprecation warnings from python is bound to fail even
-	# if all are fixed in this package. Not worth it.
-	"test_elasticsearch/test_client/test_deprecated_options.py"
-	# Running daemon for tests is finicky and upstream CI fails at it
-	# as well.
-	"test_elasticsearch/test_server/"
-	"test_elasticsearch/test_async/test_server/"
-)
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index c16258cb7c0c..cefe93ed7579 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,8 +1,6 @@
-DIST google-api-python-client-2.113.0.tar.gz 12473297 BLAKE2B 7799021db708008bbc1d91a11c543fd261af467d226b3bc6b9773878826ac8c2820961d30ed6f3c2abbbe0d9618ceb52eb350594d4d02325cc36e4f0ccc56861 SHA512 257d062de19849c4807cec249e1b7d13a60721ad58ff701affaecfd45253d2c83ddd79079478245c2df0c0f94b220070d342769f1dcfab1fb62f658970c0b317
 DIST google-api-python-client-2.114.0.tar.gz 11486137 BLAKE2B 69172e5db315f705d922eda5a093980c56e519cc2b808ed316962235ff20c5401971e1795a53b929bcf8c20c678058c6750d42b4f486214c9cd642e141862b8a SHA512 f39939ea64955488c1445713e649204252c413fbe9e58d2d4668b4f5042ef48853044cfd034b3e78a6cd6579bc09790a17663d92cf3d5274f0bea0cea284cdaa
 DIST google-api-python-client-2.115.0.tar.gz 11512432 BLAKE2B 95a3eac1a745ca094b6011fa1ddf8a24e8996201c515337f641e2a3afc38fc8a4bd4aa42b8f16f8965aefb02f21f173a6fc43c6a967d8aecac2abd689de8b294 SHA512 f24f3accd1ed1dd6fd3140608f53163401527ad926631488f46eb4f6bd02ef8434f2b2a6223240cb65f5a26fe6fab663f460265ffe7fb8b0d9c0d3d1bea879bc
 DIST google-api-python-client-2.116.0.tar.gz 11545357 BLAKE2B 26b3949ee377a064db4e9108feb1fbca429bf71e97e4d7d07ac00422952faa7aa4682a77641470a199b81f69172514b04015ea6f55f4761aa087d9eeab58922b SHA512 757d74b45abc570756965f7cd8bab0c833be151c59f64aa103a69d97d581b6b29c5c6c6ad1536067a99be1ef3d77cfdbdbaf309a5068b01b2d6a76d4733eedb7
-EBUILD google-api-python-client-2.113.0.ebuild 1313 BLAKE2B 43f0904c5596110abadeaa88477c8da2416432834fc43c4e966ed56faa729007b1a55505fcf8117e6cb53f8dc2d7b4f5b680124d5cf83343822aa997aba65061 SHA512 89c7462571b609890c0482176a460a75adc53b72e1e35d411484b2fdc648088d83dccdbc1666c8e88b8ec7d2b6a24a25c68dac773ccf035a292e90c11332a329
 EBUILD google-api-python-client-2.114.0.ebuild 1313 BLAKE2B 43f0904c5596110abadeaa88477c8da2416432834fc43c4e966ed56faa729007b1a55505fcf8117e6cb53f8dc2d7b4f5b680124d5cf83343822aa997aba65061 SHA512 89c7462571b609890c0482176a460a75adc53b72e1e35d411484b2fdc648088d83dccdbc1666c8e88b8ec7d2b6a24a25c68dac773ccf035a292e90c11332a329
 EBUILD google-api-python-client-2.115.0.ebuild 1316 BLAKE2B 74751b9b88bc82209655d3e8932c291cd4cbfe0a20d18ac13e71761f659c3bcd30a9e7e0c51ebf4b4df67fe6fd6dd9db37cf5cbbe2b31a45c628fe6428a48483 SHA512 3d1048fb99429c7b3acc39ee9d65048dc4efc79cdcac2f7a1ecaa69e3cfabddff6b8099c527b8436f6eb5457b795365fb7c2c3951d202aa78288d565001cbf23
 EBUILD google-api-python-client-2.116.0.ebuild 1316 BLAKE2B 74751b9b88bc82209655d3e8932c291cd4cbfe0a20d18ac13e71761f659c3bcd30a9e7e0c51ebf4b4df67fe6fd6dd9db37cf5cbbe2b31a45c628fe6428a48483 SHA512 3d1048fb99429c7b3acc39ee9d65048dc4efc79cdcac2f7a1ecaa69e3cfabddff6b8099c527b8436f6eb5457b795365fb7c2c3951d202aa78288d565001cbf23
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.113.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.113.0.ebuild
deleted file mode 100644
index 8d71cdabbd14..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.113.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 7db3ffc2808c..655b1d2bb70d 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,7 +1,5 @@
-DIST jupyterlab-4.0.10.tar.gz 18347775 BLAKE2B c217b18a5260da8a9ff7df833b7d2a4233255e5a0bbef37eb638bf0fcd99646f5233b70b17b0eb8a27c4fdc042c9dd55c94ffc4d593f890780c6e3f48cdaafd2 SHA512 e5203a17dcf682927cd480363d5952765e8c02c243f2a8fcbef785ffe4b58ea669a196c9040f516a3b4cecd323d54d005a91ce6ce5dfffb32d4e610c14a6f1e5
 DIST jupyterlab-4.0.11.tar.gz 18348142 BLAKE2B 6a2676504a6475d02965ef7b6e393a52c19b3c6af8e58938a189f6bf22693ec754be6c165029f7b9f68b1b80a9f8c20fb67600cb4e9c526da5ae386b3bf728d3 SHA512 b02d18d0e0ecffc9a5d847efe4ce7c7258c741fd6ae0842f25c2c446b16af7cb11ac422dff7807a1a19f4536b514914e098c4fd04a58ceadb8296ce9aca3e2f3
 DIST jupyterlab-4.0.12.tar.gz 18352336 BLAKE2B afa406372cabd740dc09b354e626d4b87c3143e258294d48f82a816002f43e3d22e43bb0cae9eb34f1754d6ed947923c7fb60fbdaec9c82db162422c6057ec7c SHA512 2a84d2d2e6c64e8fa469b7c5b144b364743d2def1c278aff13e5a9380aca0075b49b31370fed368df951208014a0737380966ab6171a13ff07246ad2b4eca996
-EBUILD jupyterlab-4.0.10.ebuild 2610 BLAKE2B 43cf71f66c0706f0ff3e34465946de03118fc540a9b8c415a3cfcc9bfcafa786031600365354ad9c7cbf1c6d075ea0493409bb280ae9bfdf7e2e93c3d8d2c3d3 SHA512 6c0aac16395c80b7393d3101e3864249b4523a5db3a432ccd51f4a909fccff93db42959a27eb13025eaa08f1db58e1bfa3758ddba6d32b8ec5032662b18b81c8
 EBUILD jupyterlab-4.0.11.ebuild 2610 BLAKE2B 43cf71f66c0706f0ff3e34465946de03118fc540a9b8c415a3cfcc9bfcafa786031600365354ad9c7cbf1c6d075ea0493409bb280ae9bfdf7e2e93c3d8d2c3d3 SHA512 6c0aac16395c80b7393d3101e3864249b4523a5db3a432ccd51f4a909fccff93db42959a27eb13025eaa08f1db58e1bfa3758ddba6d32b8ec5032662b18b81c8
 EBUILD jupyterlab-4.0.12.ebuild 2615 BLAKE2B c0643bbfbcd6c5ca30e090cf8e1cae2d400dd2c11e283d4737dfcc7b2e75fe58962cd4d5ab930403418a2f0e18fda792f2874c9b501f5bfb2fd9245d9f47a0a2 SHA512 5998157191632668110865248ac80843b2a274b3d2e2041841d566e0731156cc4146891816e057c0595ec45b2590fece3ee1d127b1ce8e698179c01ca56ebbb0
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.10.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.10.ebuild
deleted file mode 100644
index ad25dc63d9a7..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 49bc46c54b92..8ef19c58fe69 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,10 +7,12 @@ DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149
 DIST llvm-project-18.1.0rc1.src.tar.xz 131969632 BLAKE2B 0cc2f3049a89ee07182189a1ff7aec1751bfe6bbaed4887e139854737fe4eb0ec924b37d8d5b01e298d6a4b271735a615283465262345d0a288180edd6276139 SHA512 85afc331c8a023f4d8177cc42143b968b94d6987a7ed38b8be1170c6b4e1ef1a79d2d4e44d5fae98b713959b5d69bd4e44c6ba84355f59e8fe99588cbca03d7a
 DIST llvm-project-18.1.0rc1.src.tar.xz.sig 566 BLAKE2B c9fd7e92e0c6bb8291314ed388d518d15b75c5d4e7ba5da461c2176c5519d721c5ae95d8ecf99ce17bdc398cf23f13b540aacab306c2923e4c0ac8a5f059746f SHA512 0bb072ef2d3156241bcb74102c977db73720f38918e1a0b2cbe6191b6884ce5750ed9f5af69575599bad840c0151a04f81ebc5194c4ce258cbd6516d6c26d9cb
 DIST llvm-project-1f13203029333ac99cc9844b8b6915aae3fc0902.tar.gz 205629630 BLAKE2B cd6c127bc7b63fffc4707863ab8a34e23371ce28878818723ba74d78a1be1b43c2f401fba7de2084f628f9418b7f0e7b9fe9c224b92dc44233cde2f5e3470333 SHA512 0b35754d6e8836267393d0d63effe04e1af5851b217252953ca3a75e7d71e32b1188991d34ff649f8c1cf2a1b49b844ca7e0704597655ffd37d151f4b9a0cf36
+DIST llvm-project-78b4e7c5e349d8c101b50affbd260eb109748f8f.tar.gz 207433034 BLAKE2B ab7189fe82b5a9309348b499130295b3057dbb263ad9c60b1748e4ea92be3a85f0160baa1408dde5516650994951d9f948223d2d6260492a07b07dde51a51ff9 SHA512 366ecb02720d2b550ebeca989abf74ca1c93b2585a95fa378f44edc6c3329ee4e1548f5fa2cf7a19e59bc817abe6cc8850841415227380114c59b58867959a5a
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.6.ebuild 921 BLAKE2B dcfe57279dff5c6d80fdf5fc115c76c8ae5af3c8c7fa5da0f1c5592a3428b5a3ecd5c5feef4635c139d4d2d7a7edba53d07a53ba6525b778767c906daf6fd252 SHA512 d5c0943678b3e65cdb148bac517e1ce9700ff8a65c63796e0d4640a28d1086c7bb95f9b6c2d6507c379521cc320108b12f7c4165b4c8c4ff10d56ade2a90a438
 EBUILD lit-17.0.6.ebuild 1026 BLAKE2B 53cf66c043c39b6d50c2696206341991c231d956b1c27c91335c2648e6c687cb4074ba85958402542712d7ee8a9c4cc6ff95707e9046d52cdc61d2f4da6b8f6a SHA512 0b7048ff2ffb46a1a6407240b9ec4f7543618032a0bee7941cab9b304e252b22efd764b0d89aba821488135e5a7cf1939dfb6658b6d8ae1740091aae88143156
 EBUILD lit-18.1.0_rc1.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 EBUILD lit-19.0.0.9999.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 EBUILD lit-19.0.0_pre20240127.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
+EBUILD lit-19.0.0_pre20240203.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-19.0.0_pre20240203.ebuild b/dev-python/lit/lit-19.0.0_pre20240203.ebuild
new file mode 100644
index 000000000000..3d0315962098
--- /dev/null
+++ b/dev-python/lit/lit-19.0.0_pre20240203.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+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}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	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/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 6a2871cf66cc..d2ee1c810ad9 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -2,6 +2,6 @@ DIST MarkupSafe-2.1.3.tar.gz 19132 BLAKE2B 1edca84c47c93fddfd22ee2fef2ba3907921e
 DIST MarkupSafe-2.1.4.tar.gz 19288 BLAKE2B 3c358e913b0fb9fc4ea1fb4ed983a8b20a5b6fc6a7212e12cbd4bbd6753e45339dbc88068105cdcab3a86ed812ecd2cb04a6d94222c50bce3752e3125edb783b SHA512 f9abe713349ee81eb0d89c584b665440f7e9c26df3f4f87e277894aa59090cfa769e099a12b16c9029d98257dbb311e49a1d7deeeb4ca9e1863fd38e574b2d94
 DIST MarkupSafe-2.1.5.tar.gz 19384 BLAKE2B d6ae0e1864983f4ab92f2fd9b58a012a8c76e6f47957681d4acc362b2129d63fe4f4625600a89081afe0e99f868eb604d6c75fec88de9a18ebb32c15f091681b SHA512 3ba5af43d23c266377f5d32b11e1faa7955ea8c67eb1c32886c308527f93e75e387294d0eec7794c0c20aad0c705b27f3d1f86b04202f3b63068d12d4053cc71
 EBUILD markupsafe-2.1.3.ebuild 677 BLAKE2B 387f1c368046b9a37758137de87b9f2d299593055e30a3dd16b253e33eb14502d95b836c3c63cfb761fda0962d9d0f93595cd5e0afaa281ef091d9507e4cf67e SHA512 02fce39fc0bfa0f81bffc60a3ce9de05cf8a7ce03580754cd2069a8835b33f89bf66af215b6a73aec636e9a38d7d4bf0d9dfca9459d86bf94bc708feb87cac61
-EBUILD markupsafe-2.1.4.ebuild 681 BLAKE2B 2a40c3e12cea98adf86550e4c3de8bd712002be848c51e8a2b37988044c3850fe64a4db68e7d06d532ee971ab6e3f2191ce1e51ade1d933e3bff7c0ce7343bd5 SHA512 272e0b4b16d9302bb275572f7483afaa3372b1070b8308fc146bae4b2ee1da6a68ed99abd98a5d21f255e9f9ad012f563f7b0daec86a8f4c8931198ab53c2228
+EBUILD markupsafe-2.1.4.ebuild 678 BLAKE2B 5e428d69725bedcc3600f51cc5cb01259af1e0c032442eefe5dfed12bbf88a9ac3366adfe12e5af84ac2790b39709938f45aff88a4ccfb87a30c5ef0bdc166d8 SHA512 2eb119c184ef191720bed59f1a7c63332c8718ed0c2bb44a4b12b157cc6e8889682f8dc79fcb62304e314b008b004379fa66a2e4b7fe6237779c62af0ee2c792
 EBUILD markupsafe-2.1.5.ebuild 685 BLAKE2B 2c84c92721fb6e9259a2816a0fab7ae56c65a52bb85d76f5040666f96e46e721ad43c7d885dc6cc39f8dbb0650b8b872465c918b3c3413bbce48482892ad8ce8 SHA512 6ebb77c43fcec7e470935fd31018ffaf493979c8c0cd141755547f647a2f93dc44987519610f0e1498a84ccbe5114bb388f1a7a40a7f17765a3f660499cdb476
 MISC metadata.xml 372 BLAKE2B 3b33895aa8873e3e611625633941ea35947ceae506ae76b57c4f1d6396f91c6efc1e12a6c6bcb63aab409ea3320f34017f438af51f3bc6923cf465900f6a4600 SHA512 50d7ca17802ec57aaa22a227f49f62551a593810953b4f5b63834d93cb45fe1831f4a04928a32e88434bc26cad749564864df9f1fa6d6acfe9973e6ad8fe9d5e
diff --git a/dev-python/markupsafe/markupsafe-2.1.4.ebuild b/dev-python/markupsafe/markupsafe-2.1.4.ebuild
index df077580add8..80afcfe14e49 100644
--- a/dev-python/markupsafe/markupsafe-2.1.4.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.4.ebuild
@@ -20,6 +20,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2a9391c1af1a..0e48d073c792 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,10 +1,8 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
-DIST mkdocs-material-9.5.3.gh.tar.gz 14676809 BLAKE2B 340e1a1e8527797e9256f034d39c0fedb97e4ff667f608fc6d7d2d94a9d24f35afc9d7372002623fba3f6da171fc5062d5ad7d3a843bfcafa4a2d423d41845c4 SHA512 5e5745193e661eab7016346cee619ad9b9d848cf49956aa9f9a3c3bb647525a0fa39c63afc6569c8973e566f6061e368d4512149f8634a463af98602c52d2163
 DIST mkdocs-material-9.5.4.gh.tar.gz 14681148 BLAKE2B 1b4b652a446a71986256dd53d87258519176b415758105ae644d2bb0fb39dd32a94462307dbcfa8011a6ba136e5f00ab8379c4937123a1435d66a94f660a9640 SHA512 79167e6751765830eb4defb6d82f7204d38dfa664a95f9e576179a9c6ee65e3dfcbce90a095e78a76c04201244400c8d67c3337130ce8f8a7dc1ac213b09581b
 DIST mkdocs-material-9.5.5.gh.tar.gz 14707046 BLAKE2B 34c5287ac701a06ddb7713fd1a7b18307cbb62de12f4e455cff6380255bfe7d28249c86e922c394d581dd0b95368309396f5f5055cb3c6edb283345ddd6a7e9c SHA512 73a4a513eed242fb690aae6a338636baf049bb510a7779ded6cefbedcdeb2cd1c681646b3587527d8e2a251315e70fa347acff4aeaa6959a26c9bfabd9ef3a64
 DIST mkdocs-material-9.5.6.gh.tar.gz 14705120 BLAKE2B 6dc6d8eca86e3f1b2942203dc3abafdf5b961afc9df0e59207809016b0c42b440d1b7e8c083cc9aa43db2095a49d3663e5e60d424f51be268906d09796b21e63 SHA512 4746f7e1ffad1e024f62005452e2250a7213c5c97a67446d664abdf68b13af670c61be0b94dda89dab72f9a2375e34e9c9a61ff343632e28182dd36af85ef381
 DIST mkdocs-material-9.5.7.gh.tar.gz 14715071 BLAKE2B 4eb978e28150b00b925fa151445b459cb048b8a48526aadc1f82b12fab65e8635d1417546b280cfd7af3dc6a9cf4d2ed7984958896bfa910d3d14fa27059c907 SHA512 4a5163bb5e5705a1d9bf35ed88746cff1e8bb74e7dfa92b73304a9261702449e6c63fbbcaf7680ff28ba8a344376adf777d74f145f3668076036518c143064e5
-EBUILD mkdocs-material-9.5.3.ebuild 1793 BLAKE2B e89ab7edb24b94a213c9abcb98dffa51bfa915557b2d5ba1f45c9fbf0592845f78a89f53501b4dcf40fd6e87c04dbcb4454ace107118a921337a608a7b6daaa4 SHA512 ff33a9bc4c84d089a8477441c7c52cf9e076a33f76e11d426382cc6417257de5aa9f0b8f99387b96fd53b4a38eb35f95430405b90462c94884b588a610a9d056
 EBUILD mkdocs-material-9.5.4.ebuild 1793 BLAKE2B e89ab7edb24b94a213c9abcb98dffa51bfa915557b2d5ba1f45c9fbf0592845f78a89f53501b4dcf40fd6e87c04dbcb4454ace107118a921337a608a7b6daaa4 SHA512 ff33a9bc4c84d089a8477441c7c52cf9e076a33f76e11d426382cc6417257de5aa9f0b8f99387b96fd53b4a38eb35f95430405b90462c94884b588a610a9d056
 EBUILD mkdocs-material-9.5.5.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
 EBUILD mkdocs-material-9.5.6.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.3.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.3.ebuild
deleted file mode 100644
index 5bf4cbc8a473..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-9.0[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index 4db8ed99d61c..6d5faaa84650 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -2,5 +2,5 @@ AUX mpi4py-3.1.5-test_memory.testReadOnly.patch 1197 BLAKE2B ede5e0a7185e507ccd2
 DIST mpi4py-3.1.4.tar.gz 2493282 BLAKE2B e1a048e6053263f6685c549e2e6f96072b7d95db68595c8848d0ecdb0a6cadf2b102e4c4ce589053ed17a090335afc56f4b3630b60944aeac7e4bc4ad82d4a1b SHA512 f59ad765bc272f8b63f74cfde4e588f640c4fc3d47d05729509da45a2155f830c1d409ec716ff374756748fa8ebfa6e72f9fbe188a6b89ea3fa115740a532b08
 DIST mpi4py-3.1.5.tar.gz 2469777 BLAKE2B 0638e3def52f731b64e2999f83f2d6ccc94dc2f8b37d964c10e49ca12470d3d3ef77ff2737294d85614b2d59d1eec49880e74f2ba3d73fd090152b63c8cc701e SHA512 04da1d6daf66cc86fa3ec574eea6e01749f895035e3394afbc68d6245394c5b03557ede0bda3642b06d9c6ff2c1e6e878a6c8c30d3fa3491392e2e13b82cdec8
 EBUILD mpi4py-3.1.4.ebuild 1520 BLAKE2B b62d397d02ef1996d627f73f50e54db13e83f6dec605fc67c5cb2a16aae404653252817375d56d43ad80f77c6b1cc336f45d257be9e678eb3d9a34a0462903b8 SHA512 c89e7b37be6c7a8c44c5be146c396e4c3334f23263299ccf402fe22a1b462f1cac2acbbf7845f5e1f1d2277947845109b47202579147cd0fd07b5e437e1b46ef
-EBUILD mpi4py-3.1.5.ebuild 1713 BLAKE2B befea86ec8188a2b4a302cd3678f10195155288281f5c75fae24bf67460e5c0fc63de3b269d64a068ae21cf38dc80d529f069a2071cedb94b25b4e077ada9fb5 SHA512 aa0a06745d91dedc0f01f067c1b1a228266afcc654fd485b456942c7253c928adf927facdd140e601ba4853ba087995dc7294bde89f5b339c7722adb4f661a64
+EBUILD mpi4py-3.1.5.ebuild 1712 BLAKE2B 8bb81722ec01c64d388bfea6ad39661d80fa63b9426b03b183476c672e6921c1c2027dcbce139abc8149a63d11556397a5e786cbd177bddd950565c517d872d4 SHA512 fe1625b9ead239e1df8c504f5cd8ec52eb0195f50bd5c210b1184f1c7450034eedac79e98951cada3ec6278801775bd3aeb3cd1690bd6bb6582254fd176c5913
 MISC metadata.xml 1229 BLAKE2B 1634ae0e35f9b9362e9b4eaf21443a1fe6c7fc54ec6e4cc5914695533a3563586371cde7b48e34dfcdad6dc5a89f49bec705e434e68353e93e122c272fa163f3 SHA512 d0892adce1d1b5253185a9b539d2dca2a0d4cc96ce7e6e5cfb0507a90fdc88d92d7c74fc6fc93e951872bcfad73d4071b403b7e4269081c55b18789f09b35226
diff --git a/dev-python/mpi4py/mpi4py-3.1.5.ebuild b/dev-python/mpi4py/mpi4py-3.1.5.ebuild
index b0a4789dda26..9bcc7d4e4b68 100644
--- a/dev-python/mpi4py/mpi4py-3.1.5.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.1.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/mpi4py/mpi4py https://pypi.org/project/mpi4py/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index c278ffcb36de..0a6ee1b57fc9 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,7 +1,3 @@
-DIST nbconvert-7.14.0.tar.gz 851778 BLAKE2B dcad57a56b1d7070188eb864668e1a12f26fb45ad88b0c566b26bc262bef250559bc4e011280c792d82c614330f38816f5f8fc9c3035d5d218aff8c312b78df6 SHA512 140c335c1ad5fa8419f273d102e2f39179edadff96caaba78f3b87118ee7690dee2978981d972ddd06ed3a67182f7d24467f8d0ad44760d1f0d74a2f5dd7ac35
-DIST nbconvert-7.14.1.tar.gz 852119 BLAKE2B 22248b507220e7fc71fca95a2d43646c9365adc89ec89c2f840705937f2715a070c2d509301cf9252fd0489e2041f0c6f1df38c928ed5e449a3674a2f1639873 SHA512 91e29460f746ad6a9db898e27de755c469ba0011d21737f2149d8475c9dcc4442178802b79f890424666d81108a416c1727eaf3de7db13370713ec9cd9b77262
 DIST nbconvert-7.14.2.tar.gz 852202 BLAKE2B 195a4f8088ec82d7fcb56b7450878d8e769027bedf64dec82adfb2683936400c74b62ceb2a24d47724584df0cfa0e9c773e53357b412eda0958aa2c4256cb3fd SHA512 79a91b2cacb50af8eb584668b070bf233de4cdf783fa0d9d256c2204de4a97efc5224088811b6f2b5f89015e4180a24da63c5b79a026b1966df157de325114cd
-EBUILD nbconvert-7.14.0.ebuild 2374 BLAKE2B e2581e34e9bfb6be4809b1dba1a953b1b249d576f3bd8bd14cf6ad36f9381adc47e36c240611a56f3bb3a27ce2ba31ca62b4557c036a2233b1f6274189df1989 SHA512 195965b4886b315ee4aa59b85359bb7d636ef1ccb380f3ad1f7f6c63e1e1f4c6a613622116739e045c682de08f3b2aecad62f99d187722528c6ebce928e7b916
-EBUILD nbconvert-7.14.1.ebuild 2136 BLAKE2B 977df81ed6e32340d84d104efa8969b83a876e96aed32600151a31ef2c6cb1d692002481718472f6ae4ed2b16d1635bd69d5bdf7d0b068c3a2836c48df728140 SHA512 005f516a9011e128e8b867315fc1ddbc57b615d7ff11d51fe21bd73068b1bff5b1f7df2898450a545516fee35e11c0d64db2d8b34634f92bc41c659826bdeedf
 EBUILD nbconvert-7.14.2.ebuild 2129 BLAKE2B c985ceeaa9b95b9c4404cdab39009e13d3b1873e96fcd351237a0e07642fb845900035bdfe8d1e1f7d27c51a58d5d1f74442cdf9346c47f0b3732f7c89cbe313 SHA512 8954d7e0a0a8a5a139c2b6ffb19185061db8fa51e7b77a4ac9bedb1e83326722a599f05b1cc0486a9b81af380d4ab36eb98a5c3580f771678cfacfb327b88a94
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.14.0.ebuild b/dev-python/nbconvert/nbconvert-7.14.0.ebuild
deleted file mode 100644
index 4f3fdfbc64b9..000000000000
--- a/dev-python/nbconvert/nbconvert-7.14.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.5[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	mkdir -p share/templates/classic/static || die
-	# tries to refetch stuff even if it's already present
-	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
-		-i hatch_build.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# crazy qtweb* stuff, perhaps permissions
-		tests/exporters/test_qtpdf.py::TestQtPDFExporter::test_export
-		tests/exporters/test_qtpng.py::TestQtPNGExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-7.14.1.ebuild b/dev-python/nbconvert/nbconvert-7.14.1.ebuild
deleted file mode 100644
index 90b36a68a170..000000000000
--- a/dev-python/nbconvert/nbconvert-7.14.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.5[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# crazy qtweb* stuff, perhaps permissions
-		tests/exporters/test_qtpdf.py::TestQtPDFExporter::test_export
-		tests/exporters/test_qtpng.py::TestQtPNGExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 4d0b3ab69e58..e84422e14443 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,5 +1,3 @@
-DIST notebook-7.0.6.tar.gz 3930144 BLAKE2B 488689b34b61c37f2233d57d6ef75b3bf843e2340846e88593a6b49d88fc52f908126d2e718808451df1f8cc6f9a5624adef47c1ae4984cd2ff5ed535d47cb37 SHA512 9f9ac4fae93af425a442c25c8a601578a76c802cc50018a6ff6ef99fbabfe3fb649094625dbdda2b7c526cb7262d2c463745b006d35cc1834d40712f3820895b
 DIST notebook-7.0.7.tar.gz 3936954 BLAKE2B 9171ae3974bd4eb36c804858224c386292a3772633017a8bf0c0ef408526278234b022087faad7930aa975c66762690e24a5a368bf9290937bdc8dff63757575 SHA512 05725f6bae2d916c9393f483a05696f6eb0e38a1b15a8427cbd61f508a06d78ead8a70c8764a00403c323b25a1278ea3a8daaf1ff5b5eeb0b35f6ed5e64ea638
-EBUILD notebook-7.0.6.ebuild 1541 BLAKE2B ce669a28ddc3cec9add5a00b425d927510eb14ab55e6ab4ef1258b1da3798f5ab07643cb49413f1d46c121c8850e17f4de43f4c71628e1a8e0d30725fcc225b1 SHA512 1676577d6103d52b1b75a961713f19de1817ba004e0340beb973cd7547bcd86227b0e7c659f3451afd1df704fcb0834615b01f426a29ed88d0170c90ea6e6ff0
 EBUILD notebook-7.0.7.ebuild 1541 BLAKE2B e5a6b879fe317ac615ad141c5f2272b9ebc7fff473ec28dff29f8199e4b1cc8c5848ca3a6bc13138cdd66aede7c30cbfb9094f5a579c9c108650c6a0f780abbc SHA512 72aebc9998459beb5e65b8bb81fe0277e1ccaa2c46650b4b50604d8740b62619bb06053833b380880ad9800f857eb0204510afd8f9546226c6629f61382fa2e2
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-7.0.6.ebuild b/dev-python/notebook/notebook-7.0.6.ebuild
deleted file mode 100644
index 602f6a2bb0f1..000000000000
--- a/dev-python/notebook/notebook-7.0.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.0.2[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-5[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/omemo-dr/Manifest b/dev-python/omemo-dr/Manifest
index 99c6a762ca01..0571e41e97ea 100644
--- a/dev-python/omemo-dr/Manifest
+++ b/dev-python/omemo-dr/Manifest
@@ -1,3 +1,3 @@
 DIST omemo-dr-1.0.1.tar.gz 152526 BLAKE2B 218e51996a71f506739489c54a3ddeea023a778dea57ee34bb1f50a03b27d740d6871f89ecddcad5fdb0208bbb876a8e815be78f51e3f675347323085c20963e SHA512 38306e88de1e384eb42848029d8eee7d5aed0bcc3b9ed2867c75fd5bac09daba31c136d10cb815153f21ea6ab6ccae4cfa2d3453db0863e2dc4b065fce8f24e3
-EBUILD omemo-dr-1.0.1.ebuild 564 BLAKE2B b2450ad406c10a296503c7b7f06f1744c1420425e735b5bcda67ee65024a6ce87f42edba4ce9080dca9522c6d8e3bd5323e9fac222584da644094160cd95cd1e SHA512 c149fb52ee1eac54e8677842aaf872cbbdec1e2bddb78c5a9caa9d0254424ef759e73bebcdc33eb2d1d1aa9b78065a979300a30f98340ad6a8e8c1a7f370cc00
+EBUILD omemo-dr-1.0.1.ebuild 568 BLAKE2B e2c702bb6a953a4caaaf203d04fddb306ab2f95ddde00c638a76f113a0e886b07838739e9d04d11c0d101f472367f710ec816785a0df458d553df0da348bd083 SHA512 a9cf0090186fa5ff018ab237991a5f33cff9d789431c7a2b3e5b1ef9d9730954cb12460b8465fb0becc75b29a432afed675f13f1f61dd1ae9eedeee09b864935
 MISC metadata.xml 312 BLAKE2B 5f4e3484489b8cdd211c411903657954f40770f2e2a787439c5214502deae9f9e3dec062f6708ff92cc00aaae9a2f2ad91480f5c174dafe00dba48008e8f989f SHA512 e5864f030b211faf2a2f95cae0123750697fcd5785883da1c7c37c86a9bd4dfa075a75e4c26e08a959f6e26b0998cc9d1aedaa98edd43329624cfa40a4929935
diff --git a/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild b/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild
index 9d26941bf859..f1d6adf6f325 100644
--- a/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild
+++ b/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index 0f7d9e962093..f763b9684fae 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -64,5 +64,5 @@ DIST zerocopy-derive-0.7.15.crate 527188 BLAKE2B 14f407cd48136c8a003084485de2aa7
 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 EBUILD orjson-3.9.10.ebuild 1723 BLAKE2B 664cd16bc00815baee4db771302b5c8c8473f115dd1214b2f7d89a48baf451f318f7685b1c2d9e3ec8e742421fc13cfdd2baad26bfb41e74dda157c0742fd29e SHA512 ee33aa451d168b1514dbe1833a2ed77661e78bb81da2facc69336dd5cfb4a944b452b9b5f5ea9dc26f5aa10ba41afc9839991b4af598ed5b404bbc3b14cbadf4
 EBUILD orjson-3.9.11.ebuild 1847 BLAKE2B 82c432134caba29b1cf8b838e082d847dab486f386634cb530a48cb23ce4b57d6052696a579683a61ba4feb8c656737a02346ee5d24709a52d6492eb1c028f3e SHA512 d605ef11c2a41c19c5423aa4ffb085b3bff1a116ea1561b796636b5160f5a7522dd3b6145580a607e179d66d14bf52323acead3831afa3ea642672129e94185b
-EBUILD orjson-3.9.12.ebuild 1846 BLAKE2B 6275f4cbc2ef0c99df32836cc9d27d4542dc30e8be4346c1d331d20bcc9e6e5a93c6c38d2ec4d46372af0d12b38258ec2673824d69aa9165d44d3952b745f562 SHA512 d93c4b048df8df9a4c16f87c3740aee96081555357603dedad6c8c3e23b6bc9cd937f9839934b34428f3cb410fc3c30f913283df648119bcd1623f4cf5e429da
+EBUILD orjson-3.9.12.ebuild 1843 BLAKE2B 4473f8c2c4672636dbad95ceccdc9bb0f5cf60c4187a75056ee239a90f85ef247d82cc1044ae96dc57408916f0f726c7c6b505d2ff29e3f24b825639d0923b9b SHA512 bf6c69e77347981a8b734aa7d2ea28272f34d2f8b40f5771c442f060929e7ba8fc0bc85bfff680a28f3c62b905144f33ce7006eef170daf41d8e86d9f69d6842
 MISC metadata.xml 360 BLAKE2B b19f85a4e5055dc309e35bf1706b10ebcc1961c96884bec0c9efd7ee7bf58adf53c0f61d8c1d1094c38f0e0bf78fa00c5be1e7ee58c85939ac1c6fff40fcbd07 SHA512 e168db6bda3fbb7f801aeb7a91733fad54441e21913a16447e7b8fc694fdeb0fe3216c15de2864efbf92f2ca8e1a0743eb3d62e8c250648e91be68a465c21ae0
diff --git a/dev-python/orjson/orjson-3.9.12.ebuild b/dev-python/orjson/orjson-3.9.12.ebuild
index c0ca5e06c7e5..2ef707715d13 100644
--- a/dev-python/orjson/orjson-3.9.12.ebuild
+++ b/dev-python/orjson/orjson-3.9.12.ebuild
@@ -70,7 +70,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index c643c14cb706..eec323666c4b 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.utils-6.3.0.tar.gz 104397 BLAKE2B 1195363df16e103f49d783c644bb060719fa3b43a549e229bd1c6b8f682e36b6135fb33284f536c08460892ae441c276d9e0445f30c6a5bc6d260b9a0f4bef40 SHA512 d7d1f160865238d4dd49dec891d275455befcee1926920f22409142bbab47fe3e287ad280a72f11baa99c49beaf1d0dc52745307888b8a3edda4cb9052443336
 DIST oslo.utils-7.0.0.tar.gz 103879 BLAKE2B d07af70592faac1821dc60f1ed0cd72fe948b1e105b515f18711b11152898fb2ab494d7eef2db965c43e961696b5f43eaca9d1c106f960d1ce91a9b5bb6ff924 SHA512 44202ec5de818b52b335026fdb24d1f771c24451422ad6b8328d4d14a4566b6c27b3cf04ba564d45686c9a4104ba1eec9a0874227498a707c5e9039b1d5c706c
-EBUILD oslo-utils-6.3.0.ebuild 1506 BLAKE2B 3701ba4e9269d6d0262991c41966525a146c21cccf693a84795abb9865309f6840a533507e881d3502ec61d77a2ee7cdf1ba9c8178b043498c2f445c17f387a3 SHA512 a325b6409bd80b28b8cc4b1dcc8ecf8270bdc35f10280ce152970538e8cf23b89244ed88fce848ac4adf5013a63061dcefb9236888c7f69f45364a7bfc54041f
 EBUILD oslo-utils-7.0.0.ebuild 1506 BLAKE2B fbb3f757ab1e34533a287a4c45a06a621d16996cfbe74bc02e563a46fbf8a058ea3ec57c918917494d346c6f602e5e2f6b1d2a821c5afa83a85ecff32b9eb347 SHA512 9907e938d6063271e872ece58912ff29c95d915d1000acd8d3dbb737acafcb03a367bdeb16fe62b63f5337eb7a94db382fd8b71d27a442b3cf02d4d22c1a8084
 MISC metadata.xml 667 BLAKE2B 2d3b1f3c01b74c3db8239b0711f6b10488cc17b214509a64607f3112e7100eb39f2d8774639d47a40cbad6786e7dee1430327a78b357b516325e5d06babcdee5 SHA512 e97a4a1f3718a69d39706d816f17018a7d57fd81702cd88ee01f9b849405f2f08769d381c5e41be84d8ae0c69a2a977b0dcb3ee1a481502ebf49f5ad6a5d6a95
diff --git a/dev-python/oslo-utils/oslo-utils-6.3.0.ebuild b/dev-python/oslo-utils/oslo-utils-6.3.0.ebuild
deleted file mode 100644
index 6af6c545b8a5..000000000000
--- a/dev-python/oslo-utils/oslo-utils-6.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.utils/
-	https://github.com/openstack/oslo.utils/
-	https://pypi.org/project/oslo.utils/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}"/install -name '*eventletutils*' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index b54076168961..4b6353c4675b 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST python-phonenumbers-8.13.27.gh.tar.gz 4915760 BLAKE2B 1a46d8b878ca9529bece2bf1144baf7800f2d52a2b613d27d2d6dd3f16a94fb6655fc892b9e305f4926674e20a3221e891a10b683ec009dd3b57a6e31da38136 SHA512 a057a7925611a25f1d100e2d32b16b76fb14880e91bc166a78ece18c0af2089f8dd0dbed66751f454040072b516c795dc60f42659353b4cab4c6c39fc599352d
 DIST python-phonenumbers-8.13.28.gh.tar.gz 4914842 BLAKE2B 1ea137e877351b8730a29d3ae79ca1cdb6cb1ae3f7fac8b68b4fe7704da170bd0c8df2819f8a011d4b09461064e2d482417f091f461a9939b7c16317d0634eba SHA512 07d46b7fe09386d03bef2c655b5517aea047db0c3d79f1a93352e538d449facba915436ccdd5ff60042e7b24a75e6999dcd440ba15fdadbf87cf89b5f5c6939e
 DIST python-phonenumbers-8.13.29.gh.tar.gz 4914849 BLAKE2B 0a9cc4dd44a32bd2e48dca839427c5e95ef5a39b3e2337c17223dcaec1e5cdfb2e3533bb89ec2a1ac0b462699f7a937f9c2df7d6fae8a9f1b1f3c4f50c3f4dd9 SHA512 d456be2c95a6b0414370b418280977ff50a0c6b4e55680c30026b959d8c1db633a6f456246a8c3e01ab59b5f218960229834737ae06724998ef8c2052266344d
-EBUILD phonenumbers-8.13.27.ebuild 816 BLAKE2B 9a91edd2625fc7c277ba2897cb9d647aeee717ba6373697ab134e865b326990650b49bbaccc04ef442e326fea751b25c4dfedf4fefbedeaabdd83df64e551ebd SHA512 263c125e0c820cd1e0924e891444256676cf3e427b8f2ff1f0788584802c9cb55c496cd60619ea55cb7cb88a1ae5a7b7594057fc99f58b709b951a84203e5766
 EBUILD phonenumbers-8.13.28.ebuild 816 BLAKE2B 9a91edd2625fc7c277ba2897cb9d647aeee717ba6373697ab134e865b326990650b49bbaccc04ef442e326fea751b25c4dfedf4fefbedeaabdd83df64e551ebd SHA512 263c125e0c820cd1e0924e891444256676cf3e427b8f2ff1f0788584802c9cb55c496cd60619ea55cb7cb88a1ae5a7b7594057fc99f58b709b951a84203e5766
 EBUILD phonenumbers-8.13.29.ebuild 818 BLAKE2B 9bf355913b9ee3be2b380dfa5f679c08da753ead0df156ede2bf5e6499699814a7cfa6e51988d987cd92f632b07d222fb9cf261a0eae7bef32d55ededef6e406 SHA512 8656a45bd6078afd23b7f511c8223b20e00df91e35324c8a8ad6bc43b73700ebdb3ad28b98c29338939bd1144f48a715eb4f36f616481fa002ba5d0bab22e17b
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.27.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.27.ebuild
deleted file mode 100644
index 154cbd60212d..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.27.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index a4f9b7b6916c..225a42f48a79 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,11 +1,9 @@
-DIST pydantic-1.10.13.gh.tar.gz 766572 BLAKE2B 3d4f4453469f960467ddf3512be8e97f0abf40406d441a1bc8909df1ebc0e7deaa5e84640d8614395e36d619e87f9d47327cd71526dae203046488d114ade49f SHA512 7ae96c08080e9d3bf3b66ee8ee77efc0b89b6630d4f0c37679e27a28a6433b3628fd342991cf38412ff6d1034c4a907841f74759c2e6b4d51d413d76625d5bfd
 DIST pydantic-1.10.14.gh.tar.gz 767164 BLAKE2B 0018f8db7f0d1e1063e9cf58047319f317aee968cd07837a1983c4283ef317a54d45d717829d2b7e4d5ae6257137a125372323322873fe3354c709ed096f320c SHA512 ba90fc57172b395398b87cac44778e842fba2d28c31d8d90ad49bf870c27da71b9eef2a5cf786b0de0a3ee84af187c0759b8b27a42edaa0feb7183a2b99aa52a
 DIST pydantic-2.4.2.tar.gz 654020 BLAKE2B 2f91b6bf89f87230976a2e777541bb7418382fb3534f5e61e1dc74a18e5e939508a2440d6bee9a09030beb5f2b6a60fd62c3bf30ee0ee2c7d3f71575920a47f3 SHA512 f0e0d90ead4ba754974b38f8e3d24bc017696674ca1ed3300104389d149baa41c495218a118f5e7f98bf20d34b3c17439921eaff0ccd7bf76cac96a16e592b4e
 DIST pydantic-2.5.2.tar.gz 652158 BLAKE2B d3a7eeb4e1933d4893df69d2600437a4df1a640f4ec6564079669f8703b8d21bba548197277a373e5a653f4aea67de2336ea983906c2e96b514cdab3f8821dc1 SHA512 56753c9739759251004476620ca25d69bebc7743da911f69a09fcbffa6d6e5ec9b9fc22975e845599fcb2aed5cbbf081c3737d6eab55b9e1696818c4da405e6d
 DIST pydantic-2.5.3.tar.gz 651797 BLAKE2B 9494bd7a243d5cda762d916b10120861870b5f3112f581aa33b888eab7b605adcd3eb861853467e2d021b88b1c2583bbaf6ace8e96154543c6946e13722ed345 SHA512 bfc2f9704688815dbf418e2a7c72e193de80f279ac578fdaefe763f7cd8a9dce6c9152bd950d013f7fa48ea743468ae588adf61e277924536637590b63792779
 DIST pydantic-2.6.0.tar.gz 677208 BLAKE2B 10df7e22a05fc01e1d35b71f266f852599f949080c44a3ecbee8f8b42344de13fb2bc13957d2d2104337d4311ceda537073d0dda6f8cd9c5f621d381293d4e8c SHA512 5d3912f2b388ea49ba853b6463478c0fbf15ea67877291198ef69b4dc6f037215e62dc872e62ad6152ce02de0d809c89dcd11b5b0c94e668f15eb559a3d8a536
-EBUILD pydantic-1.10.13.ebuild 2518 BLAKE2B 84f7ee9b095b56518792f81df308652cdc725c6accef3388615bfea735c676f45e449e0c60ec030349b067a8a97833669071f493325c6644c7a73d08d348dcc3 SHA512 7fedbe4158ce80d41e8686ed19618bb818d3efdf8d508a8d4fdef7f8525a3e4e1364a340ba0d710f2b33327a280e33e5df15c0ea2920446dfee3d1b95cc4862f
-EBUILD pydantic-1.10.14.ebuild 2583 BLAKE2B 69d31306d11e54823656f30414978598d8862cfae26a179196cf469221ebccc30e2f9cec538fa18b94abd3f3094c464ee52386db4ce190a1da037d6b4ee2698b SHA512 a62fdf1a3b21a7e565b4ce0739e44b58a99514772273121b2b407bbd0782f000de91a394c2c54f055f514a117540bf50afed88bf9195b2d676e72012d173cb0a
+EBUILD pydantic-1.10.14.ebuild 2581 BLAKE2B d4da679a307497ba7adba5ed59015feb164d4e8b6934c87ad2301d9a4fc5610478d5f7c9b498585ecb6608e230b66cde916cd903f4c8fa99a33b491db13de357 SHA512 8f5b260a7fdc2407ea380827d18faa84fdb3d92d2543a69b164bf9ddb06a3cd5a341b6155d457585f18983893df93a4419ce83f99fae6ddf08b7002c8b6e0783
 EBUILD pydantic-2.4.2.ebuild 1250 BLAKE2B fb5c066368f642dc425e0781fbb3cdb5c26ee33f3a82be385be5a82dd398a9a9321bbb61f44f57afc68b088def410fc78a828811562823baed1ff1d26231915f SHA512 fc87f16830ad126ddefa4ce73b36a9b7221a52a2b911923893dac9f7b26afc6a5563225c8ef2dab7aaf4ee115f32a5908b65430d7664e77636eeb491aa5877ea
 EBUILD pydantic-2.5.2.ebuild 1301 BLAKE2B bfc58ebdd2138eb90f4971145ad575e5d1a9eedea480195db7dffbecd3582bbf60ec14fa1c3dc7c47a3417f35da839346829851a5a56e873218a37f16a51c4eb SHA512 05739299d4a836fe99b52230c6d6af22da0200f3040bb701091aadc8c0ea85b29c26b22d1e28c7d422a051ac17bfd8b52e2aa9682d72e0d7235efdfe00892071
 EBUILD pydantic-2.5.3.ebuild 1302 BLAKE2B d8119cd4e9dd8ee700c9312d6735d5785662a4e562a48c505e01864673923c710cfc8b2568e1773ea5b2ae74279428fbc4e9e0fa527fdee7e1fb3fd67bd09de8 SHA512 6e898cc38a7d721e572f80176f734644e5c251f37a5b089d66a234fc5c75769b9b5b8dd70d67f4210f7495c8d88600cd85caedac3f5b1f2e771d839dc859f847
diff --git a/dev-python/pydantic/pydantic-1.10.13.ebuild b/dev-python/pydantic/pydantic-1.10.13.ebuild
deleted file mode 100644
index 68345cdc15a8..000000000000
--- a/dev-python/pydantic/pydantic-1.10.13.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		<dev-python/cython-3[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_abc.py::test_model_subclassing_abstract_base_classes_without_implementation_raises_exception
-				tests/test_generics.py::test_partial_specification_name
-				tests/test_generics.py::test_parse_generic_json
-				tests/test_types.py::test_secretfield
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.14.ebuild b/dev-python/pydantic/pydantic-1.10.14.ebuild
index b200a0c432e0..56c001864743 100644
--- a/dev-python/pydantic/pydantic-1.10.14.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.14.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index bcd888a6c59e..8d3a293500a8 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -2,5 +2,5 @@ AUX pygobject-3.44.1-py312.patch 1941 BLAKE2B 93af1e4f307e003b7e9cd62b787efa9690
 DIST pygobject-3.44.1.tar.xz 559432 BLAKE2B 7edfe91ac1b7301befaf8ef17078b517666467f446bfbe25850336cd365d314153d444d29ecf028ce44a12cef1c94f139d110ac6784c8a2c6077730d4836f6cc SHA512 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327
 DIST pygobject-3.46.0.tar.xz 561552 BLAKE2B 6b8c9b4bf6df819c09b7bd2ea6dcb0e7c24ed7f171487b774469bd2c4694df9d4473dbde05273afc7a370f2b1f352d60347aa221bdd674a4aa8a54123d5e54cd SHA512 48293c193ba5aece38d99f45d325d0329ac33e88442bf00848fe818a7c838977b8d2cf50a404c30e8852ccc0b4a44dfda07751d51acc21f740aa2ab6aa3ce661
 EBUILD pygobject-3.44.1.ebuild 1992 BLAKE2B 0dd334932fbfe25a72f394ff496b6c9bd291f0e3b62520bc5aeeda57324b783116ff7352e495cf37d7fe9d902ad49dc7f0e751aa5923a627fbf0bf4f5aae19c5 SHA512 145a1544194f896ccdd8c26fd5136970b90e660171ade50a1bbd2cbc8e4812bff86677829a6a5f7f6fb7cdc3b9baa4d54786c2bb00a1cc9736cff18a98b44520
-EBUILD pygobject-3.46.0.ebuild 1825 BLAKE2B c84dcfe55d45b279a131d759fcc66b09f0d2db57c20df59fdd162fa2b94de73228d9b90870257541d111437b51780ece766f8e9fffd4fb5f4f42625c402835d2 SHA512 58d74137230ed7d42034b8c6c60dde7babd98dfb31235ca1fe32101be2e27c864d4c36c543ec066234fad33618b172353957b1d859a25c6c3dbc5a2ee175a576
+EBUILD pygobject-3.46.0.ebuild 1823 BLAKE2B 330f531b67a6321bb6a7d7e075f5100b308209a7af9f60f77f11664148c9495ccb9d446de8d42a0b485de7cee7d115a61565cdc2fadf5f810b5deb08df2a1968 SHA512 8b98d9403ddeff8d3b46b129e2e0731178ef3488f8389468d079eca84b27b8a992eaa1aacaa27e73aa39e899e129a4ea617a284aee9916f360fb18da06a62635
 MISC metadata.xml 1398 BLAKE2B 0f89629267eea1f03252ac53ebf6478977301f5edf58024152b7e25cac1bb238241d419241dac72181bc82d0bda4dc281fe490a72967b730df7087300562127c SHA512 49ec255944b9530fe59ba325925713512ca84d71149b988c034d092d4a433c6f7a23822d685180c343a40055bb5c879980996d34a30cae8fddc617707bc1a417
diff --git a/dev-python/pygobject/pygobject-3.46.0.ebuild b/dev-python/pygobject/pygobject-3.46.0.ebuild
index 142546cb711e..99eb180556b9 100644
--- a/dev-python/pygobject/pygobject-3.46.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.46.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 2df84e26e20c..5465ff744f5e 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -15,5 +15,5 @@ DIST pypy-exe-7.3.15-1.ppc64le.gpkg.tar 11100160 BLAKE2B 294ba3f95fc81122348747e
 DIST pypy-exe-7.3.15-1.x86-musl.gpkg.tar 9861120 BLAKE2B 97d3d7b80150246c49688847d2a7008cade36a0a3c89c3223be6205cf17c4623520786b393c301d42146863afb6118f7b58bb406a25bdabd9b6737016cee8718 SHA512 ca98a1bce5cbc9e9d2b90c6766b6eee094165420c38c676e63a185f54db50f275723b4b5e6183b1cc44ffec199973a57c3b0cc5fb4b0b9c6ebc2837ba84095a8
 DIST pypy-exe-7.3.15-1.x86.gpkg.tar 9902080 BLAKE2B 79cc4705c9ebdac2a4a982f095750538ecb63ca38db97dcd995ce922781f80c006311025f8e51dc8e4ef32ebfaa0ae4ae333513b19e9778503947edd1a7c69bd SHA512 12cda3f33a38c3a624095ddd25bcdde8b3ecb5b6886182ee94d7149389703b98733413d6dcbb818d9363195b46d89fc997620e72b9bd26f797223604707fef57
 EBUILD pypy-exe-bin-7.3.14.ebuild 1947 BLAKE2B 562e85ea51a050f1e4a601c20135b1dc37bb45852a839c053aae160e2a9d60522ab356e33c1af51b603e7b35dd1587a728952952e90359daf3aaafffc8bb9823 SHA512 a494110779e442ccb92fabe56b4154d8606496b53da182aeddd31f2b342a43104c7aba4117b4cf327fe6791c7ae62009ca574c8db7c1d8d6feb1e1dee53c7f16
-EBUILD pypy-exe-bin-7.3.15.ebuild 1983 BLAKE2B 615619171184e5afbc664e02b44e922677024e858d1bdcb94fcdf0a366a89182f1cd985972fa25a8ac3ef8a80aa174eed2025f7250fab9bf011eda329e3d6adb SHA512 e5a3c1e90aec2ca9832c33d8171520a8cc65a32bf40d85fb0eb32cea2a487e194ceee23ad46530f6c5258634eaeb23d32197826febef1c2881957eeec2c4df00
+EBUILD pypy-exe-bin-7.3.15.ebuild 1981 BLAKE2B 9a1fdbb307258d44bb18d872406426ca154e3a029e5e54a06d7b420bec290b08e7d2cc12ecad688b7b67b1c4b62781c91e2eea0af2c716bfcaec698c136f60bf SHA512 74ec12199918322c5b3f14a8ac974e82c2830670cd8c3302d05c247d1a2bd57419be2222216213837937a0c2007af4c99d470b8a29a2df4d3d3f7ad8dc5ab814
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.15.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.15.ebuild
index c0fdb67c4006..900de22d9f93 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.15.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.15.ebuild
@@ -53,7 +53,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index bf43c81af8bb..fdcf31be91d0 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -3,5 +3,5 @@ DIST pypy2.7-gentoo-patches-7.3.15.tar.xz 5324 BLAKE2B 395b1292b59cc9b2147fd4887
 DIST pypy2.7-v7.3.14-src.tar.bz2 19910947 BLAKE2B 3d03b16b4e6344b8590aaf1815202782bb355ab21422c5ea5b40cd84f36fa2ff37b2493313a3faf242039b9b91e3c8ea8fe1237a487a0dac44e4c27bf29f5f85 SHA512 e806aedc1625c1601fa623c3b03881f820d37455c5432bef345f85ef0300247f7725efe3bf470fe533aa422dbceaadca636d0c4bf74c65e1e04c0f82380e53f0
 DIST pypy2.7-v7.3.15-src.tar.bz2 19834343 BLAKE2B 4e1145cac007223de0616029dfe763a8d2b3e25a6d867c98da0e8e0431d775c6aa7e50834c761e19f96b96309dbb415a39d7811c68b1b3a26c16cd222911205d SHA512 40448c7c94878bcb88402de8719a4a6a4ffe3f68d7e70500f04fe77a460b1605c83dace360988d2dae70fa2c9bb31a20c22003f70a3a2fde988f6d60507edefe
 EBUILD pypy-exe-7.3.14.ebuild 4060 BLAKE2B 30f6af4cbf5c9a0aef6a580eea66f515c1331dc937da396de4ab658fb7a6cdc422bc4c50a7fd7c4c71813bdac85b1207b113a273c606b0b8d415f29fa1712c8f SHA512 3cbb29c46142f5518246ac902000039d0f92adbea616293e28660a5b058860f92375017cfcdb950d156a31b0d6e7dac127c9ad89904c8ddc235f210ccaec9022
-EBUILD pypy-exe-7.3.15.ebuild 4151 BLAKE2B e538d92455d65fd018140e60effcff16214f6ab769684d404dfc13c926b0a8d991c0aa31aba24472d73dfca126b81cefebdc408796d507360a819fa5175e008e SHA512 63c2e03db16741e1714042fe0494e8740e6a103715073718971d2980cc1887b9dd7ee6a13d2ff1ecf91e7a8653690880b236a266ebb7c0ff0b8f46a54822e897
+EBUILD pypy-exe-7.3.15.ebuild 4149 BLAKE2B bf785cb4c08173ea4f3a69b193b7c7945b6ef24471665c5fc7226c68b73a9083f444acd7511ec2db881980623fc9847126a8de57ff8514bd17b3997787a60929 SHA512 68db0c972d9e62985689186f59a1e1ef46402ed651a518a5438e82683fd189810460c737953ef9b14b76a4ddc7db9e588f6d53ced55e11b551c65ab40153048b
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.15.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.15.ebuild
index 7af34673edb7..e6d19abc0125 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.15.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.15.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 DEPEND="
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 194991e908c0..6bc3d9e55250 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,2 @@
-EBUILD pypy3-7.3.14_p2.ebuild 583 BLAKE2B 5ba38cc1ca041e6f7cbcb152c0673ee3566d4a1eb708d5277b4ffb621c2c082fa6b3bd0f2620b6cfb310584abaafa84c84722bca7a6ec3567a4b8c4d6b8221f9 SHA512 f67c2c9d20329ca2bcd5c3044bf71b4bfac7628f21829ac7c4d9929f44aa1e849b0b418b445e35985d4e28872596971624ddebb9fc2fc16308c421faa38fd5dc
-EBUILD pypy3-7.3.15.ebuild 585 BLAKE2B ee89e4b7c3d3abf4c149145605d6dddbbd27d68f5bacf36a5a5e07aa4b1c6e4cde77e5a9f6599777674d1e6a0c0738edd3c25c979765ab045c886110e04e3a65 SHA512 f4281ec2cfe94d7997d5f15dbc01e7b113073b9fbc589b42926eee397771eed9fd66198c463b14fce7e74d25650098b3fe4b85b62ea9ef3595f0152befb9ff23
+EBUILD pypy3-7.3.15.ebuild 583 BLAKE2B 5ba38cc1ca041e6f7cbcb152c0673ee3566d4a1eb708d5277b4ffb621c2c082fa6b3bd0f2620b6cfb310584abaafa84c84722bca7a6ec3567a4b8c4d6b8221f9 SHA512 f67c2c9d20329ca2bcd5c3044bf71b4bfac7628f21829ac7c4d9929f44aa1e849b0b418b445e35985d4e28872596971624ddebb9fc2fc16308c421faa38fd5dc
 MISC metadata.xml 317 BLAKE2B 9da451fe362dc5c1f6b3412b33065ab6e316e5ae49fd8e6a8e7485cd5cb7440c316c7c5c9b504a69c4f21a6370317edfe11f388238665133b8557a26acbfe1eb SHA512 96039ea2033b920e595e05c8749ee7e316e951bc6ff544a2f4d175d862cf7537401cbba1d4535f20245bbcac32d5ce1261d04aee412953401b513ecc5e7217bc
diff --git a/dev-python/pypy3/pypy3-7.3.14_p2.ebuild b/dev-python/pypy3/pypy3-7.3.14_p2.ebuild
deleted file mode 100644
index ba301054faf0..000000000000
--- a/dev-python/pypy3/pypy3-7.3.14_p2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYVER=3.10
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+gdbm ncurses sqlite tk"
-
-RDEPEND="
-	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,tk?]
-"
-
-src_install() {
-	dodir /usr/bin
-	dosym pypy${PYVER} /usr/bin/pypy3
-}
diff --git a/dev-python/pypy3/pypy3-7.3.15.ebuild b/dev-python/pypy3/pypy3-7.3.15.ebuild
index c8a1509c574f..ba301054faf0 100644
--- a/dev-python/pypy3/pypy3-7.3.15.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.15.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+gdbm ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index 3f2d756a2166..f78c97e21d33 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy3_10-exe-7.3.14_p1-1.amd64-musl.gpkg.tar 12011520 BLAKE2B 9e66f952e4d36dd35d8f3499fb0177b53bceb7e17a23e3393a7ebd97d1e6c4def8aeec414b4cb52fc9ec8b212187d8ff9a8257bc7ee558451e38cde03d00d49a SHA512 c013b3f69cfbe43709c46387c7f4c2991700aa4b270977e3797e2153bdd15c99758bc1787d9150a4e8cd5ede7d877371e5f626843316013d09031c5e60fdc765
-DIST pypy3_10-exe-7.3.14_p1-1.amd64.gpkg.tar 12011520 BLAKE2B 349cc839f6af09b2b0cdc66c2ec72c9007df27fc7db405d246320537dc377068c3866624daf6599452a68049d79457e6fc6acd6ba8663f1eea3e44d7c5e193e2 SHA512 463e71e41e7c8951e595bea9e0a0f0fd08177b8c26f8a298684494cfac6c5c8f53b7b15dcc97bcbef1d12c6457f38d751f7aea19e8bd5970990dea2cd0a7e3b3
-DIST pypy3_10-exe-7.3.14_p1-1.arm64-musl.gpkg.tar 10158080 BLAKE2B e29d4a41b9c96d1164053c31eaafbf568f791382db8b5fa20daa84bd182f3a595471f2a821a71eff8f1aa3aeefcfcba027fba37ca4eec1eae14aa76331568096 SHA512 58da7cadc5e3a444a071a0786894d5c78b5d8f50a4814b91111d7b67057af5c0c8101c00ee6bb259246ed2b5c13935aa631328c17ff3a71580f547efdcf20caa
-DIST pypy3_10-exe-7.3.14_p1-1.arm64.gpkg.tar 10106880 BLAKE2B 4b119dad9d74c1908e94243f19f01c17095bc4057248fa306639048b9865a33b7c536ef246814d4430db0d48491cd75f728c6f11ec28195a038ba90c0ba1163f SHA512 10aa71b494dfb57ca4a6237897d2c76a2340afd3d9468d57e48d5fac69a6d19349b73c544ee89758793b684bfd9a5f19f56d66c582d7f5fc0866d42a2d58f144
-DIST pypy3_10-exe-7.3.14_p1-1.ppc64le-musl.gpkg.tar 6748160 BLAKE2B 560a219f05c89b8f980d95903b2c962aa1b010c6b841a8c727341a312a1913271628b4c326d25b4498487790144f10ed1fd200680db47b8848dce2254daa38a1 SHA512 4cad0797253995b3c68c2586e90734293ca3fbe8f84bf145e4aef00ac11236648ee08131e2d94066689178ae78295e303d138c10cebd25bc22ed3e0f3d1009da
-DIST pypy3_10-exe-7.3.14_p1-1.ppc64le.gpkg.tar 10352640 BLAKE2B 844039054d1932e530b997af73685457f5dbb37554e446c98819b88dd3b269f7b8d0c1efa16cd3300ad520945b24cc6cb51b2c21b2b01f35455d3fb1b3d6bf3c SHA512 635b6da329258df90a4df971648b044d4355f02befe91f204c5a3238722a16ff58f764f14bca4c8a50f4069907101e7f7281d663cf82e7e988f8d0270f522a02
-DIST pypy3_10-exe-7.3.14_p1-1.x86-musl.gpkg.tar 9000960 BLAKE2B 87d02a2d4372c7f05ee876b4f16fc6c9949b558faf6b589793b6af683982528b87b1eda8aa2339d1962833a05295ec40e6768fd7d4de555d8ad5dd672dba8c2d SHA512 dcd81b65c16682ca021f469baa74863efd6f357b8251db4968c7ed56c0aad2411ebe66cee81a96eafac0988d240dd90f9278c319765c96c9be4b225a42168362
-DIST pypy3_10-exe-7.3.14_p1-1.x86.gpkg.tar 9031680 BLAKE2B c5cccc0ebccb9f508c522dc5800a28116b4ca6617d030d047614ecdf8495390af9cec7dde17d1bdec0cea999eef0ba2b3ac7771e84f5cf6351b9f7f7902f9b4f SHA512 1ca328f387d2ea775701ede811dac1e19191521ca4259e42e9d39cc23bf9788430342f984dfe956b2fd3ab8e16c752ee68edc42f8a08cc5a44f123294038a8c0
 DIST pypy3_10-exe-7.3.15-1.amd64-musl.gpkg.tar 12021760 BLAKE2B ffd47668ced69ffa0ff685afad343a9e4d6fcf2bb679c974ad639ad9d345bc7f87451c324e9491ab9efa5b0f8eae43ba9993f6771f2aa94caec0ec66acaf7dd1 SHA512 d515fbf498bce06680b3ec9689f3be7d4e4d467c6b00d8e8a392138c3bcd8e7ee078a57cbcf58e1e73815cfc7647583f00ce4147d0d5cb6658a170844f5c45e1
 DIST pypy3_10-exe-7.3.15-1.amd64.gpkg.tar 11991040 BLAKE2B 5a2d723b767bc1bb3861aca6400ea5a69f191b7afeace13c38c5c767a1fc17c2c8c1234835581cc8713e07334069afbc2e177772bcb84a88ecbcbd5083a66747 SHA512 6bc7212478a255b549bec93c47f949e9eaf5080b10fa1679f1e8138e2302b5d5c7dd2fb7bc4d4cb66b5f691d721b0b346ce7e40767eb96bfc31f0b50e5be22be
 DIST pypy3_10-exe-7.3.15-1.arm64-musl.gpkg.tar 10127360 BLAKE2B ae36fb4e6dbb2e8c79eef5ab0def608a18aa3c3d30c83493337fab5b20b679cd68c7138290f12cd42e957ee94dd3594643a93c0003bba5365fc69c66141c906a SHA512 c31a30ef1d552d428ea2ab30e812e8506434c8c0bc1167793d1d8469f59671850278a6a34d796ad509b9b647d1d886752734550d2fd4fd27295b754b133970c4
@@ -14,6 +6,5 @@ DIST pypy3_10-exe-7.3.15-1.ppc64le-musl.gpkg.tar 6758400 BLAKE2B 737a1a6779e65e6
 DIST pypy3_10-exe-7.3.15-1.ppc64le.gpkg.tar 10465280 BLAKE2B b7af5d3f89e6881f697cdd16e7b8f3a7f3dd574125c0559b21f2ae5bb7ef1f948c1149c1a891ad5815461ed03e224086ab810fe45071dd2cbef9b35fe1c8cc00 SHA512 90f610253833c31d10e09e81e2ada135f5ad7486816cbc5421087cf386d1281901cfde13331c440df726d8bd2b703cf068f7effa7a13cafde48af0833027c1f0
 DIST pypy3_10-exe-7.3.15-1.x86-musl.gpkg.tar 9062400 BLAKE2B 14e371118171709a7a88cad1cc6877a486269819758f27f86083f37635d1d148ae1cdcac0f25eb0db241c199341f34f709dcaffe8292ec8c34332ddba2477f75 SHA512 833f915fd2b873ae038844bf594863fedef2bb534e81af599f356b6f9287584bde8748b066d54ad972f2a77df41fe4e61ad1a51d48e8b60c3e91cb29d1e7e210
 DIST pypy3_10-exe-7.3.15-1.x86.gpkg.tar 9011200 BLAKE2B 6d6766f1e343dfde5627d9a1ca33a27c1df39377dbf3e42c969298e20586c4430fd81ba7b9332d4258fce01167ec2c95783c65496262a1fc56bbcd07a57c1c5e SHA512 f4804bf874389eb8493a692d238e354dac3e52e6a7888c34a2bf3801429121e337e6008b0da8c9c36a15d579a3fa04e617339aab7e82e3c83ebbc0747345bf33
-EBUILD pypy3_10-exe-bin-7.3.14_p1.ebuild 2034 BLAKE2B a4b48d2c984497be2f071919587ce9ae272187994ff89e84d200eab9e4de60017c923a3b523cee4c10ee15874bf0941223371da8c83d0446c2def9ab540e1a5d SHA512 eb215c342002129012fd9aa57fbda9795eacbbda48f4d81c6bbf0c400760631d006d1ed63634b15161055c1792b7054d3d12896e7f3382151a61148e36478747
-EBUILD pypy3_10-exe-bin-7.3.15.ebuild 2070 BLAKE2B d1620a179878d11cbb3e3c9b14d0d6d33ca45f68b53edb0c612fa3df3ec6241b1b35a630234b4810c339fd1144a0ed614fd1c344b92ba6240c83bb7a7339219f SHA512 f44b89ab0ffb78d5db91b347d296809397360c2ad62daf2c44ad562758d682d8c7e14fb971a3a8f3e04e70a03d8c78878cdf04113f9f33c746c4ba60eb726f93
+EBUILD pypy3_10-exe-bin-7.3.15.ebuild 2068 BLAKE2B 0332db45eafd5c35c0496dea1b16a1c27c152684de0c9c1597cde5be063edd31c54490563c483aa8bf414784df83d754fe18c1b80dca37136f6b965bad443992 SHA512 0ffe92f81cce9369a52ffe44053dbda0eeed9f3ba7425a9ca85cda5513fc5cc027b8ac5f63727d9dadd5b652cc736bc6f867fda6096f024614fcc093cd1cc2ca
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild
deleted file mode 100644
index aec9d2ecef61..000000000000
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14_p1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-PYVER=3.10
-MY_P=pypy3_10-exe-${PV}-1
-
-DESCRIPTION="PyPy3.10 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy3_10-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy${PYVER}-c-${PYPY_PV}
-"
-
-src_install() {
-	insinto /
-	doins -r image/usr
-	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.15.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.15.ebuild
index 7f49ead5be5a..9849a9ecfd11 100644
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.15.ebuild
+++ b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.15.ebuild
@@ -55,7 +55,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index 26338b673814..292fe3eb4259 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,7 +1,4 @@
-DIST pypy3.10-gentoo-patches-7.3.14_p1.tar.xz 5176 BLAKE2B 9cc684a9257a2855e44bed01d01020c0009dc966ff6fee7a789439e19814b1bfacc5fa0da166c8cb886f0dbadba365f6c6e2c520a4f5116e90ac637748e31e73 SHA512 11e468c2cab5e2234ffc68d98407bf7a676ea3b495a7e9ad7481f47fd39e2b1868b695da81b4edcee74cb8f01e997b72e994f18826331695427d80b2e43e926b
 DIST pypy3.10-gentoo-patches-7.3.15.tar.xz 4760 BLAKE2B 9131794293aa15cbafbc245727b5b60183606bb0273b05f4ebf8d24b525c3d6a39c8fe6f2c38487cda4a47d5defbdbb494c7786ee25a9ddc23cc9f209e5fc3cd SHA512 d2780be7ce91524bb71a47d51d9e9ad9a6aa5bd6c19903c90391cf7e6d4c9a96a98f414d22e9da7af67960ab9639f9a0f58f103c90ca9d694dcdfc4f0982bd6b
-DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694
 DIST pypy3.10-v7.3.15-src.tar.bz2 23934723 BLAKE2B 12b438729547faa81bc31c429e166d4bfab2b4e76cb16a687886903ad83e3369e0532297222eafbc8b0f4ae006d87cbe15b2c360ad828fd9a44124067aa788ff SHA512 84f9a30484cf0b0bcf3ef1f71ce2ecae02a51b6609acc4f6edd4096302c9940541dc947f3f0767216d83d261f8db85ea43760af8ce3c9137c70aabe5571d1249
-EBUILD pypy3_10-exe-7.3.14_p1.ebuild 2859 BLAKE2B 865ec9b33452355455ad7bbf50f923ee18a58d45fb0865f4c8e625c89d9af17bced48a512489278c5058504eace6b2059c7768cbe64be8786f30d00d1a6d0307 SHA512 c4631848917b9e5ca229b5ea50d49133c7f25fd8023e2cc6b6ed11997e90ec9d1ef6d5fe53c90934cd9ec15d650ac5c0f70db42d06e2e6c33505a192bb564e78
-EBUILD pypy3_10-exe-7.3.15.ebuild 2950 BLAKE2B e4bd943f4445acfcad14adf26bd5056bc1000bc7242a1f358173b6a95bbfab30911ad1d3aac0bb51feeba5f6be775754d124fc2481c2895f49892c3c64a6f77e SHA512 2d4d234105b20b28b8293fe9bc93aae330a40f05845371ab7dc73efc6defafb727b6e33c3a14df73b32067d2da9771831afdd213424bb3bae407cbf9f58d3a12
+EBUILD pypy3_10-exe-7.3.15.ebuild 2948 BLAKE2B e6d6ee57575a49e9c04d568df801e5081ca2090a5cea12bd66e95219e14a43e5db46fcd6f09f10c1a9ea76a0176e691b0e0ad5c533274f75b0134888211302f9 SHA512 6173bc93052fca7fcc6aac4e5f5b970fde523fab06f4538fa2e193553f488deb56a779adcb89d1aec558bdf14d5f869dcf7b3a5c9853e0d4d9aa2b57ff720937
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14_p1.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14_p1.ebuild
deleted file mode 100644
index 33ead6eab113..000000000000
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14_p1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV}"
-
-DESCRIPTION="PyPy3.10 executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libintl:0=
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${SLOT}
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/pypy
-	virtual/pkgconfig
-"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	# Yes, yuck, but it's being worked on upstream (bug #918971).
-	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-		--withmod-bz2
-		$(usex ncurses --with{,out}mod-_minimal_curses)
-	)
-
-	local interp=( pypy )
-	if use low-memory; then
-		local -x PYPY_GC_MAX_DELTA=200MB
-		interp+=( --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	cd "${T}"/usession*-0 || die
-	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
-	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
-	doins *.h
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.15.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.15.ebuild
index e43d52fb8c34..6f4df92ae903 100644
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.15.ebuild
+++ b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.15.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND="
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 6fa4051f3290..2dabc12d40e3 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,7 +1,4 @@
-DIST pypy3.10-gentoo-patches-7.3.14_p2.tar.xz 5660 BLAKE2B 0381c95df65d7b77e9bbe53f4a714737736bc766ccdfac826a98abb7f5477797394e52e301baf29e9ab94575b243c4c62fc04744b2a1d8df75ac722514a019ff SHA512 5dd6ff6d546b1107ff1af29b36d0ff4b2787aeb805f4dd9787731935238f614acc123addc6d0a27cb7d4858f9935be41790152d1690871b681eba19e311ea4d8
 DIST pypy3.10-gentoo-patches-7.3.15.tar.xz 4760 BLAKE2B 9131794293aa15cbafbc245727b5b60183606bb0273b05f4ebf8d24b525c3d6a39c8fe6f2c38487cda4a47d5defbdbb494c7786ee25a9ddc23cc9f209e5fc3cd SHA512 d2780be7ce91524bb71a47d51d9e9ad9a6aa5bd6c19903c90391cf7e6d4c9a96a98f414d22e9da7af67960ab9639f9a0f58f103c90ca9d694dcdfc4f0982bd6b
-DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694
 DIST pypy3.10-v7.3.15-src.tar.bz2 23934723 BLAKE2B 12b438729547faa81bc31c429e166d4bfab2b4e76cb16a687886903ad83e3369e0532297222eafbc8b0f4ae006d87cbe15b2c360ad828fd9a44124067aa788ff SHA512 84f9a30484cf0b0bcf3ef1f71ce2ecae02a51b6609acc4f6edd4096302c9940541dc947f3f0767216d83d261f8db85ea43760af8ce3c9137c70aabe5571d1249
-EBUILD pypy3_10-7.3.14_p2.ebuild 6368 BLAKE2B 28affbdfe3a4516f34daa4130541bedc9aeefdc980d45caf4871fdf2a1cd4fbf6a8f62172594185e996666547306e3e9a0defea0477d08ad0d50d6fc5f386976 SHA512 13eb11c393b709aeb8fafc3f1aedc77567418ccd1f6a8464caf70d1607ed7696944ed683844490933675411c287c3dac71673c5e4f7abead001a0663da2f3049
-EBUILD pypy3_10-7.3.15.ebuild 6332 BLAKE2B a762d6c7db414bbcaf3db73b04f1e5f2b130293f9c4752410a054157e76716c5d42d95e9e2a80591fef2606c58a452b819bb1db11fc5e2262a4eeb04a350ea9e SHA512 50cf5d33e0b5f4a1f239efddfcc62338375b8db06a35e1ff8cc398179b2672891e8f152f52dc6ed9233d86f20c9a7e493396882e2ff7cc40b2be2d8bfc3ea82c
+EBUILD pypy3_10-7.3.15.ebuild 6330 BLAKE2B a1bcc9080b3c0def956587509c10266550bf023963d2aadf812573ea7efdcabe3ce09092701f11753ea45464f29cd9725f50fb9d47332a234ec08b2bc90b6d90 SHA512 5c8010fee5d31f303514bd33a831d1f756543940c76e6dae0ed2b9a43bdda656321ea8b3245e4318ddd9bd33688307e3a17bd4b1a3cf6db5b9e43a1c75924f28
 MISC metadata.xml 529 BLAKE2B 4121978ab7ed8811781be50eb702082b54ce8e2da22b1cf24f009a64d14b1c644f1420467e7f74d48b65e9644b9100d6e55bd5da0907565a4dd0ba6fc4d029ee SHA512 c862efc8092df86bcf1399abb86081709829b9d3ce9564f8a4d0d8d5d59a4089f79a70156efc093fdf08a2b563cffc8c5aa3f51e33c87456369ae75a5cef3f1a
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild
deleted file mode 100644
index aa52589fefc9..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.14_p2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!~dev-python/pypy3-7.3.12_rc1
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	# typo
-	mv lib_pypy/cffi{.,-}1.16.0.dist-info || die
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.15.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.15.ebuild
index f4c610dc7626..5e7deb31db00 100644
--- a/dev-python/pypy3_10/pypy3_10-7.3.15.ebuild
+++ b/dev-python/pypy3_10/pypy3_10-7.3.15.ebuild
@@ -26,7 +26,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}
diff --git a/dev-python/pypy3_9-exe-bin/Manifest b/dev-python/pypy3_9-exe-bin/Manifest
index 6ae3afa5623b..812f5303c451 100644
--- a/dev-python/pypy3_9-exe-bin/Manifest
+++ b/dev-python/pypy3_9-exe-bin/Manifest
@@ -1,19 +1,3 @@
-DIST pypy3_9-exe-7.3.13-1.amd64-musl.gpkg.tar 11765760 BLAKE2B da943b5076815132a99de6d7a4a5f7c0ddb468802fa53a9c5348ac9447562e1716c171dd0cddba6445e6e284562bf662e069444b85054a6d98b5d15c48d6a1ee SHA512 a26e835001728b31128a9cb485575a179de040ac0a6f77ac7fc80520c74c902b98011433aad49834cd86ad877917b9a5ad057dee328b9e15a8a2d68054e243ac
-DIST pypy3_9-exe-7.3.13-1.amd64.gpkg.tar 11745280 BLAKE2B 2bfeec0f00e099b1ce41436943dba305f12d39802237b9da6749c06a82f5dfab52b06286fa7cdc6314b0c48c5bacd458dd304386a16c4061d40120c2ceac8f93 SHA512 1dbff0d9ba0e5309e50d7d6c6d0fc043c6ddad55a2eb4d8fa4c12146c3577d8f5d3046949434c4bea03c654fe1a435133add567a1adf8bfa30e1519a739fa8eb
-DIST pypy3_9-exe-7.3.13-1.arm64-musl.gpkg.tar 9779200 BLAKE2B 3f0e43c0a5e948fece7b3a338d2ce5d326efbeabef4a876678ee37317c022b156d59bb2f3eb7909476abc869616806b0c0da0a6170d9fe2bfa00a689b315779e SHA512 539284698c256d60e3f34190d5cfd54999574e7d5ccb37a3695a7e08dc5018f680215fbad4b6118c11d9606ec65e5d79bcbcd1e02264b989bde4b85d683aaff6
-DIST pypy3_9-exe-7.3.13-1.arm64.gpkg.tar 9799680 BLAKE2B bd32484e9a576bcf2c36df0558a08eddde37b89d7f4e9aa86db61db7646a3adb4a5984f8dcbdef0135c8507a92b367047c77fdf90a5df438ee3c740aee9c2125 SHA512 cbb6a64452ffa80e2cb9d3c9a24f24ee4b7f0718e48ae03bbbe7a2dffbc200fff83c43b11c2b226392850c898ca7ce6427256354eceb9a4260d6633815a84319
-DIST pypy3_9-exe-7.3.13-1.ppc64le-musl.gpkg.tar 6389760 BLAKE2B 1eb0a9aed7e282277fc8afaee1cb3db20f93363fb93c16b69c1398b6a859bcddaab1e219eccfee466bff657ef253f826886bc13cbc034b885314200d9b9ec9be SHA512 48f1655a610b3a1fac8b8d559659ae524e57535e1a72c0daa4d2742119de6172f2d81c4f28cee90bbf7c43b1de3350dfff74b0d50107afd17009cd10c7223632
-DIST pypy3_9-exe-7.3.13-1.ppc64le.gpkg.tar 9963520 BLAKE2B 07e02711f40e336077162887f1e39e761c295ef13300be46871082a4ecc998bedabbca38aba2a22d76899dd367d25194cf60f5ebe75fd89306c6661beaf4383e SHA512 939850b6d1c4acf634e9fb7eacabefb4888938fda2e333dd658e46304b281619b737cf3b5c1969c4114269a5a2ad90a193a1e7ca3bf57d67c4b777d308997cdf
-DIST pypy3_9-exe-7.3.13-1.x86-musl.gpkg.tar 8704000 BLAKE2B 22e5b403fe30d147d4eeff43b4ff010f5234a759a4383d2131a04e871039ac19f0c9918f43d2958554c0d25c2a1ad5532ab90a11bb2b401ec00f804b8a4f0b58 SHA512 3e9f5f3529473beaa13e1c473743449d08eb636f45fe6f94ecd5dc3560f2b48bd46ba9dc7aef9fbb54c94fd822e1835f0b58b611522a5349d54e5c509a5c1384
-DIST pypy3_9-exe-7.3.13-1.x86.gpkg.tar 8642560 BLAKE2B c5f481f79ba67c5250d6d72d3582ff72be3f55516f14acbfe6720b65d7d6b1464c9a2703f7bb75e9479c5a1e83b07f0c6fa628a55a019eeb9ac939cb68275e99 SHA512 0eadc7cf710c2c02ef9c0ba7ae0c45a9055bb65f0f341d5039e41934d3217b0cd92ee169569205a7b14217f92e91da9b8d376b0dfb25c6c41be150771711ba36
-DIST pypy3_9-exe-7.3.14-1.amd64-musl.gpkg.tar 11878400 BLAKE2B 200c9e8ad15eff269c26edb0db30fb642502f969a35290e86d1aa1814a1b331dbf2b5cbb7848164b2383f2e7b1bd03ed69f44c010c8240bc34d9ca44d638c5a0 SHA512 7e41264432aab6f70e552931e27be8ee0126b9eb530a8d7b5f7cac32f1e5778965481f92c92cb1ab485a6d3f0196300741d591e20ce2f0c53af08e6f25224236
-DIST pypy3_9-exe-7.3.14-1.amd64.gpkg.tar 11857920 BLAKE2B e65451a17c7c253ccf6865e0c1e4767cc382322f0d3d6d476e847db0f0535eb82db5ff1716f1e5114fb73fee9f9fa2ac8b3251cd53ba3a271e0a6a9170b38a85 SHA512 2e0c1fbff05f8b3f24b442f53cbe2c937d108176b86195483b2de718b48c198a3efd2916d1206bbf2b8579b93657a954b688445918ff306dcde1d0157dd3f84f
-DIST pypy3_9-exe-7.3.14-1.arm64-musl.gpkg.tar 10024960 BLAKE2B 68191a2c591d88dda53064572e85a4df07fd72c4219a89e73bcb03b87cee307aa385f4d8d366edf6ae7338b2f494d73c06e2b7f74f9251787d3fba9b92ba98bc SHA512 90870861fc0e9d70ab750b2ef259c056019173b475b514edf563231e05488cd3fd47d61ccd2d7742482b2c463fcb5280daf1f48089f16ef99eb43f9b24e69cc8
-DIST pypy3_9-exe-7.3.14-1.arm64.gpkg.tar 10024960 BLAKE2B 7e386315979ce7f4da6883906c3c754ad021df0ca7e5a9b57d81dc2bb1c09158d81b9960320bbdab47433d5b45d84f8024dc575a6f215c5e502bda3828797b60 SHA512 5311e5d8a6196398bc891b24d2b2ac0efe8ff64d254d27d04fae7e1d20418d77a19408a4276830b90951c1baf5f331bf4632476ac1e3845cbc8e4d47d0e578e5
-DIST pypy3_9-exe-7.3.14-1.ppc64le-musl.gpkg.tar 6584320 BLAKE2B 7fdcf4a6ed39a0c25be6dac0c3b5880e7aa7f5ea179b8790ac9d520b69fc1165554094d783d9d9327a3b3305b839c5ff3d94bcae04139606d6f10290f263c5c2 SHA512 299b851b509ef0905313761f82d89034cfe3cae5defeeb938635cb6a5d456ff9f3254b3875177d3720622168fdd0e8d635c62ddb6179d1ff2652ea333e1e730a
-DIST pypy3_9-exe-7.3.14-1.ppc64le.gpkg.tar 10260480 BLAKE2B 94ec718a5c37dbf6b15e91346147918284e9778b8f5240dc0169fe13cd2356fbea87ae0c24a718f86e04929cc63a8e8e0b5291da4c257338c7f4f419448848ef SHA512 809f76e514ef3a050be570b81e56a872573a7125c55581104057505a13d11580d2f0f71a3e59c6fd22b2dcd3fb3cd1e2ae046ff4dcb9bf2c791675e112ff6526
-DIST pypy3_9-exe-7.3.14-1.x86-musl.gpkg.tar 8888320 BLAKE2B 6aa189e8a5e80bbed01216808d2b7b543831a19e0039f7e8ed037881ea6a5a22ecc3acb1179a7892a4896dd2ef783ce169689a8f6c45bbaef662528cc2b74264 SHA512 4b68eae8185ece64a59b0ba952779f8fa31594f874dbccf125a9243ff656b86e0381d4ac39f70f2456edf58a2715277e0ee29840126437643587c4dfcf065904
-DIST pypy3_9-exe-7.3.14-1.x86.gpkg.tar 8919040 BLAKE2B 3896f0db4893fb54bc085f79a861cafc2395a3160efe8efe344530052e5c9e4547121e6e3263e4e1ad36ea7aa45de62b454bd89a5ddefd999d088be612b9d97a SHA512 1dd32f1e05817f18ca76a3c5ad38b100ac8601a2df20307fbec1336b0139a7e2a701759a833b5991875458a117a772bb94b7aba80f7a2712ff380a2e3d9be62e
 DIST pypy3_9-exe-7.3.15-1.amd64-musl.gpkg.tar 11847680 BLAKE2B 6e2e13c6ef1faaa9ba451727a64a1749f3e2ab4645d4206420c6ee2c186438817f2a77c9a7939d485a4f04fd5b1f39d0886a42c32969e9869b44ca16fbf60be9 SHA512 fd757c68631381400901ecc2f18299eba701baa5086fb0c77ac2fbedbd7f188061c16ec0e4c84c8864ed5d235e4f98d8c5f9f26843f9acc881e2fa661d3e0131
 DIST pypy3_9-exe-7.3.15-1.amd64.gpkg.tar 11857920 BLAKE2B 052bb16e6c983ac32a860b5de1532fca6158510364ddc52f9992b1c69b948f6d6e7ba32fbaaba86597fa73db5f09a19c3e6a0208f624c9d3bbc28c43b056c886 SHA512 336f484699f89e5e3fa8bab7c8468d4e1a6cf957f947a727858b59cd9b372c94a07f5304b1f367b0bd3cd443d688fbfbe17fd23e6939988d0270c4be6df9f7a9
 DIST pypy3_9-exe-7.3.15-1.arm64-musl.gpkg.tar 9943040 BLAKE2B 701257e473f784e367a9e984dfe6af7d50ee42b214e8ebf0aa4e761102ef83b48c88ad69ea601c52b17333527bf45f908754da7e128659bd79b1849a4041612a SHA512 0bb71f3acd90f3a45dd802d1108da13b0b4c41ecbf212fa5aec22633daab85b8420c37a58bfc52dfaaa2f577ea5885df588750e634a51e165bf7fc933e5de4cb
@@ -22,7 +6,5 @@ DIST pypy3_9-exe-7.3.15-1.ppc64le-musl.gpkg.tar 6635520 BLAKE2B 89974e2537e9c2f1
 DIST pypy3_9-exe-7.3.15-1.ppc64le.gpkg.tar 10301440 BLAKE2B 0a1a6f625a0929a65bfe01b333143d1ebe6c6c89a9a9bc1ec0c2a9274f897c56e8e080fecfbf6066d0b033d84582c7d71fbf03cb6310c01393e7f28d2e4aa2c1 SHA512 256fa79652a070747a865728f7e53e5b6d6ee4f8cdaca7cbbcf310cec883f8ed9606756bd1cb3d628fa7ba8e55f9fb7f2fa497e93c82567ff285c8ae913a3da2
 DIST pypy3_9-exe-7.3.15-1.x86-musl.gpkg.tar 8919040 BLAKE2B 58f523aa9082284adc5b4fb131023adbeba411654501e71ba286abe5e0501d070180a44236c57f39bc310ad35f5734f314139b9701c4e48ae304674eeae5ec4e SHA512 9dda550b304e73453e5eea8a5243ac2796576cb3e70ba770c8096d3077c99a0663d6a5d3f2ade3e88b6e814f994e71d5b56dfe779c3d2fc51242c01f8602bcb2
 DIST pypy3_9-exe-7.3.15-1.x86.gpkg.tar 8898560 BLAKE2B c8d3fcb749e5317e5bdd37981318cdea6ed801fccfdcf19dbc2c40457ac32e2d02e8ec500f25149172daea91decf79e62f7fd410512cf9d3e63c31f1d7c323b8 SHA512 1a547f42b739095658d96e1c8432b43f49913e0053f7ec596b2f409d6428c6291f741b56addcf88dac97f053089ca37c66b46a44b4284b00dc37b1918a5fdeff
-EBUILD pypy3_9-exe-bin-7.3.13.ebuild 2024 BLAKE2B 4c187873f36c357f98926b74ca630433f108857489e3b7edf38dfa95b6204792fd7f1114032f331bcd62c6779138f6476a8415fcb7b469d0673d15fb9002de64 SHA512 caf6b5685a328ee31e399d5586e1f404ada1d3008fcd4630d2d1976770797c540dee0db6550a3a707616d0ee0d2d218fcbacff77eb89fbcdfec3004cef8b78e0
-EBUILD pypy3_9-exe-bin-7.3.14.ebuild 2024 BLAKE2B 4c187873f36c357f98926b74ca630433f108857489e3b7edf38dfa95b6204792fd7f1114032f331bcd62c6779138f6476a8415fcb7b469d0673d15fb9002de64 SHA512 caf6b5685a328ee31e399d5586e1f404ada1d3008fcd4630d2d1976770797c540dee0db6550a3a707616d0ee0d2d218fcbacff77eb89fbcdfec3004cef8b78e0
 EBUILD pypy3_9-exe-bin-7.3.15.ebuild 2058 BLAKE2B a5f799ff5f584a2c735f9f9b4055a8b4e56159bf199af5944bd3d5272c619e9693a76283b3e1775a27088dc2250ca8c12d425caa392e1744c489d30162cceadd SHA512 bc98f03d75554b90cb83d5306b158038520de835169558788fec732105aa2e378ffac99c19abee490080d03b1641cf9116d6e3eed55af087206f4fb9e90eda05
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.13.ebuild b/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.13.ebuild
deleted file mode 100644
index d714e8dea6e4..000000000000
--- a/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.13.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-PYVER=3.9
-MY_P=pypy3_9-exe-${PV}-1
-
-DESCRIPTION="PyPy3.9 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy3_9-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy${PYVER}-c-${PYPY_PV}
-"
-
-src_install() {
-	insinto /
-	doins -r image/usr
-	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.14.ebuild b/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.14.ebuild
deleted file mode 100644
index d714e8dea6e4..000000000000
--- a/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.14.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-PYVER=3.9
-MY_P=pypy3_9-exe-${PV}-1
-
-DESCRIPTION="PyPy3.9 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy3_9-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy${PYVER}-c-${PYPY_PV}
-"
-
-src_install() {
-	insinto /
-	doins -r image/usr
-	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_9-exe/Manifest b/dev-python/pypy3_9-exe/Manifest
index 58ae97c95d74..74b8517a4337 100644
--- a/dev-python/pypy3_9-exe/Manifest
+++ b/dev-python/pypy3_9-exe/Manifest
@@ -1,10 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.13.tar.xz 7476 BLAKE2B 70f80c489686e92e933a200d2e92a095a80e2300814ec4e1f3cb31ec5f5500a45667f7bfe9570ea5eef3933fdda33a9930bdf2cf683c28e3ddb610bebeeca6dd SHA512 5170f5141beb93b3b37cc94f85324c88182967eaff2f8ca26b81d63d5b0d20414a139ca44c250c07b46c747e27c97fd0fe5a2365f6636aba2dd28df3bc55cdca
-DIST pypy3.9-gentoo-patches-7.3.14.tar.xz 5808 BLAKE2B 92ab7e9129838ff22cc13a64fe1ffe9ffd3af45ec777bde531ce2e15b87681e17fca2f1dc037ee4798bca5a9312ca4c961ec97b0a53bf5e6dc36fd12241151c9 SHA512 dffd17558d5ec2625682e5476ea53a9fe273f553b94d2589628e23ac3b45c50b5bf3ba9c7d92935e477374d9220af6ed310abae1270175f091a8c5a267a4bacd
 DIST pypy3.9-gentoo-patches-7.3.15.tar.xz 5800 BLAKE2B e3466eb528c7cfaa8a189552041852d29bbacb45e08dc967deec1d8486107725ab2b2b1e65c98307983ff1f3ad038d3e54bf84eaadc32060185661c8023dea06 SHA512 c834433bfaaa1cd081fb71f9e122810b66fbd0a52f8473b6ec02a8615f0b0328da51ca1e3f0f209d325d9884876b634dbd1ec202f428620044fe5e60b4ce910a
-DIST pypy3.9-v7.3.13-src.tar.bz2 23452374 BLAKE2B b5ce8dd78e4851b5c7fa6aa0c6f2f5c198a3b2d1e4691ccb20d1b229397d60ac41eaecef37f7c76e4de837876bdd6c1e4276302afc292080e0a38f1a58869580 SHA512 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59
-DIST pypy3.9-v7.3.14-src.tar.bz2 24683302 BLAKE2B 318fe17b423ce9c5b374cbceacf480ddbad7862bd6507d74289bbc0bd8ba8cf350ad21297b1e2dab7dfe6e7f542d929259be8d57867420b8a9a59284532aa9e2 SHA512 77db85092ca8ce419e30b274ec001566bbd275d88e74e5a3a3d0d557b18beb5a1e98428487f338e46f64893e54bf426464d372056c37a87a2b42b36c7d0fb536
 DIST pypy3.9-v7.3.15-src.tar.bz2 24694333 BLAKE2B 151c3c8b828c7a35cfd63dd73b8683c3fe5529c5f6df7cc628d2967e5c61e16490b8663efe838fc6efd9f0b4a08fde8c9315e2f0a471bb62a2395055f2f130c6 SHA512 64faca74c507ef3e8dd2df34ad81874c24bc336e79ecf53bbbb43c21adebdea60efafe6ad38bdbf15bc2a677980d7db2c2c0affa04beb7e7e1b739d85e17f333
-EBUILD pypy3_9-exe-7.3.13.ebuild 2662 BLAKE2B 9b78336e1adc2bc216953a6e464f8dc433ceda3898dbcd6ff96b60f886cd35b6d0532e22f5d77b6a1247b0f203cac01d1dd85b23eed8b7f9ecb7a822d45b841f SHA512 6e7019c636edfd391824b725d1552fcde4960284e9ba2c595aa6973cf65586a7c8ffe6ca61694904328c777898dacf5bd79c5d57117d4512e293af95bd928902
-EBUILD pypy3_9-exe-7.3.14.ebuild 2662 BLAKE2B 9b78336e1adc2bc216953a6e464f8dc433ceda3898dbcd6ff96b60f886cd35b6d0532e22f5d77b6a1247b0f203cac01d1dd85b23eed8b7f9ecb7a822d45b841f SHA512 6e7019c636edfd391824b725d1552fcde4960284e9ba2c595aa6973cf65586a7c8ffe6ca61694904328c777898dacf5bd79c5d57117d4512e293af95bd928902
 EBUILD pypy3_9-exe-7.3.15.ebuild 2751 BLAKE2B da9b92b12a8996c96c9c5e42c996863477899b5d94e4b68f9e36e3fe37ca82310caed49b12b30c872855398e49df5543457c481bd81371813aefe56674654c9a SHA512 ea1d2c71d44f0e106d23fb373b5da06e4300eca019f8144870a75e3418cc88162f9ec22bdbe34c5151b205420c7730fcac4c0fc46972edd521c0b734ced7caca
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.13.ebuild b/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.13.ebuild
deleted file mode 100644
index a6d7ba06e1b1..000000000000
--- a/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.13.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.9
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy3.9 executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libintl:0=
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${SLOT}
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/pypy
-	virtual/pkgconfig
-"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-		--withmod-bz2
-		$(usex ncurses --with{,out}mod-_minimal_curses)
-	)
-
-	local interp=( pypy )
-	if use low-memory; then
-		local -x PYPY_GC_MAX_DELTA=200MB
-		interp+=( --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	cd "${T}"/usession*-0 || die
-	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
-	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
-	doins *.h
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14.ebuild b/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14.ebuild
deleted file mode 100644
index a6d7ba06e1b1..000000000000
--- a/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.9
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy3.9 executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libintl:0=
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${SLOT}
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/pypy
-	virtual/pkgconfig
-"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-		--withmod-bz2
-		$(usex ncurses --with{,out}mod-_minimal_curses)
-	)
-
-	local interp=( pypy )
-	if use low-memory; then
-		local -x PYPY_GC_MAX_DELTA=200MB
-		interp+=( --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	cd "${T}"/usession*-0 || die
-	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
-	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
-	doins *.h
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_9/Manifest b/dev-python/pypy3_9/Manifest
index d7d54d390e77..f7ae4ee82d75 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,7 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.14.tar.xz 5808 BLAKE2B 92ab7e9129838ff22cc13a64fe1ffe9ffd3af45ec777bde531ce2e15b87681e17fca2f1dc037ee4798bca5a9312ca4c961ec97b0a53bf5e6dc36fd12241151c9 SHA512 dffd17558d5ec2625682e5476ea53a9fe273f553b94d2589628e23ac3b45c50b5bf3ba9c7d92935e477374d9220af6ed310abae1270175f091a8c5a267a4bacd
 DIST pypy3.9-gentoo-patches-7.3.15.tar.xz 5800 BLAKE2B e3466eb528c7cfaa8a189552041852d29bbacb45e08dc967deec1d8486107725ab2b2b1e65c98307983ff1f3ad038d3e54bf84eaadc32060185661c8023dea06 SHA512 c834433bfaaa1cd081fb71f9e122810b66fbd0a52f8473b6ec02a8615f0b0328da51ca1e3f0f209d325d9884876b634dbd1ec202f428620044fe5e60b4ce910a
-DIST pypy3.9-v7.3.14-src.tar.bz2 24683302 BLAKE2B 318fe17b423ce9c5b374cbceacf480ddbad7862bd6507d74289bbc0bd8ba8cf350ad21297b1e2dab7dfe6e7f542d929259be8d57867420b8a9a59284532aa9e2 SHA512 77db85092ca8ce419e30b274ec001566bbd275d88e74e5a3a3d0d557b18beb5a1e98428487f338e46f64893e54bf426464d372056c37a87a2b42b36c7d0fb536
 DIST pypy3.9-v7.3.15-src.tar.bz2 24694333 BLAKE2B 151c3c8b828c7a35cfd63dd73b8683c3fe5529c5f6df7cc628d2967e5c61e16490b8663efe838fc6efd9f0b4a08fde8c9315e2f0a471bb62a2395055f2f130c6 SHA512 64faca74c507ef3e8dd2df34ad81874c24bc336e79ecf53bbbb43c21adebdea60efafe6ad38bdbf15bc2a677980d7db2c2c0affa04beb7e7e1b739d85e17f333
-EBUILD pypy3_9-7.3.14.ebuild 6311 BLAKE2B 02ece4d982b6444166c1ec035f3a95e2af738b25df03a8614d06edce6318df28f04d553464e55f2112ac79ee1ef124ef67495db291445ab436a5d4bf559910b3 SHA512 a83d9ce03cace746c3b113e89a31880b67287876f0e7d53daed16195e1668d8e2c04aa045762d13126adaf29b8bbc5b1ffcd84003730ca5ee09240c827639676
 EBUILD pypy3_9-7.3.15.ebuild 6329 BLAKE2B 0f39bd23b8735e3fe675a272f9d980ac7e9f6368736eb4ac5035bc5c0151e625c217f339be3b9656e4406e3a59ebba13f0dd368f77023b38714b3feb77c38d22 SHA512 bd3e93c88fa50e5e3be2dfa101bf3acf006bebb110ccca2c160842c838c84b536bc0f7edf0a52b7760e3b646f149a608ea9ecd7f749a3077361f477d567f2053
 MISC metadata.xml 529 BLAKE2B 4121978ab7ed8811781be50eb702082b54ce8e2da22b1cf24f009a64d14b1c644f1420467e7f74d48b65e9644b9100d6e55bd5da0907565a4dd0ba6fc4d029ee SHA512 c862efc8092df86bcf1399abb86081709829b9d3ce9564f8a4d0d8d5d59a4089f79a70156efc093fdf08a2b563cffc8c5aa3f51e33c87456369ae75a5cef3f1a
diff --git a/dev-python/pypy3_9/pypy3_9-7.3.14.ebuild b/dev-python/pypy3_9/pypy3_9-7.3.14.ebuild
deleted file mode 100644
index 6a263ec2fbb4..000000000000
--- a/dev-python/pypy3_9/pypy3_9-7.3.14.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.9
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy39-pp73-336"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-7.3.12_rc
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pytest-datafiles/Manifest b/dev-python/pytest-datafiles/Manifest
index d81a85506e84..05b2d3ae4fde 100644
--- a/dev-python/pytest-datafiles/Manifest
+++ b/dev-python/pytest-datafiles/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datafiles-3.0.0.gh.tar.gz 69479 BLAKE2B 26838e819f386d78eddaa90b00588bc9c72eb94521ab7bf501bd0aa681c7149827332f5d1530950f07b8419276735600c64cc87904e59929941d7a48f730e90b SHA512 8fe42d10b4e96e6df89a448e6b2f929973ce20d9d7c509afb87adb230b1dae17f098540277432ab107575c6c44c34d353fb8c1213d5ed941a3025b524249394d
-EBUILD pytest-datafiles-3.0.0.ebuild 617 BLAKE2B 33a80e34cb67427c63c53cf7755557ae5e89addf3fd80713ea861c623d32a1a0454ce49c8a7ea34b1ae80bbd194445b6edac513ed22646d863acdef2a7a3fbcb SHA512 01ad55efab9bde9920d4381bba4e8f6cf48bdef8bab1eb5a3f4f525ede385066e1f7e84f7c19d5463b9684c0c36dfd898a8bae4bc56cdf8956ab3445ea2afcd6
+EBUILD pytest-datafiles-3.0.0.ebuild 627 BLAKE2B c701c737e3bd71d8ff538743ef5c58589b1e168cdc11a48247ab01c765bee4ca4dba187f8dd3a4187b87cb62d36734e60d87f490187b9521950e43b15ebf810b SHA512 e7e58e9dc963486d9b4b7f13dd490da10a92b23114831b9ec34588e6173df50b3ef9d379007f92c1488801484be59511fc0cd5e90ba1d5879eb7dde03ab9c99a
 MISC metadata.xml 387 BLAKE2B d29cae380e1152845b8bf445fbac6bcf28d940e064a0775f7d6990ab1418e6f0d86f7576923fd7975990d63f92e401f6e84da9bc0784e217cd0ff0f86a8f09f4 SHA512 4ca79e3c7b3a25c29dc17c81bc8eeb4491433bd1e3177962c7b5a280391e35d0daaa22e7fd321e5daeabb117701100745d1fe43201e88db4542023067a2400d3
diff --git a/dev-python/pytest-datafiles/pytest-datafiles-3.0.0.ebuild b/dev-python/pytest-datafiles/pytest-datafiles-3.0.0.ebuild
index 085d0e11c791..a074e02df679 100644
--- a/dev-python/pytest-datafiles/pytest-datafiles-3.0.0.ebuild
+++ b/dev-python/pytest-datafiles/pytest-datafiles-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc"
 
 RDEPEND="
 	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 4aca20be3776..7dd4cd90565c 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,4 @@
+AUX pytest-mock-3.12.0-test.patch 1460 BLAKE2B 890582314f162041e1534e788590987f7979c5f00590d4ae3af15f0f2f1f6a3a11a6c3405421c2a4b5bc56a4ad425f513c73e73bdaba7cf03b06bbaac9ee97dd SHA512 bf20ac46065b8b0ba206dad81a0d34b4a8965c53d6087b9ea010b49e0f64ca5ab960a58cbef6a6940fd7d3f167648e5b6908dff1a8803f296329f0c67fc7cbaa
 DIST pytest-mock-3.12.0.tar.gz 32139 BLAKE2B 4bc2289579686b8ca9e840440b21b7299817e803f108726692cda6f1a138564462b04b9ae6a3038a5e36ec4d665bb7c8f54c26d231d6b17188b8d830d553b20d SHA512 6da429e646a4e3a825f699969dbc87033136918bd9aa111ff334fac324e5ac89ef6516e82ffeeb20cb6a857fbbe904d8ee985acefba2d2b7bd0ffe4b9227ad82
-EBUILD pytest-mock-3.12.0.ebuild 1235 BLAKE2B 86631d6db534c3f1387249cab08f14907b3bde25b80c12569d016cb56f3154db7b214f5bd95f88f4af15d82cb29c9ae36cb6c2d57ac4bfdbb8e36a0bb2c93496 SHA512 e467081ebfc9673a5dcf9ccfd9f1a96a8b5df6f82a7e8499c980376c5e2b781f8398877068dc97f00da2387185756bf2ab1aaeea3a979545abb512c5001fb263
+EBUILD pytest-mock-3.12.0.ebuild 1333 BLAKE2B d05478e086727ceecd2eb0226c632f6e2c72fbb21bc15303c4df6e3b296b0e62b3d27ee66017c256a30fcf74cbc49786239ecd67acadcb15087095501ce5c896 SHA512 aaaf236803ed9c3fc9e1000904d6e929d789b3670ebd87e031ad5226e8169ac5e611eefbeb4b7aec07ee090fa01a31e09fd594089955f25e8ced6ab38bee29a1
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/files/pytest-mock-3.12.0-test.patch b/dev-python/pytest-mock/files/pytest-mock-3.12.0-test.patch
new file mode 100644
index 000000000000..e3938fb1457c
--- /dev/null
+++ b/dev-python/pytest-mock/files/pytest-mock-3.12.0-test.patch
@@ -0,0 +1,34 @@
+From 39547ecdc051123750dd17a890c0492ac5d5b1a0 Mon Sep 17 00:00:00 2001
+From: Daniel Garcia Moreno <daniel.garcia@suse.com>
+Date: Wed, 20 Dec 2023 13:39:14 +0100
+Subject: [PATCH] Update expected message to match python 3.11.7
+
+https://github.com/python/cpython/issues/111019
+---
+ tests/test_pytest_mock.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
+index c185f2a..01534a4 100644
+--- a/tests/test_pytest_mock.py
++++ b/tests/test_pytest_mock.py
+@@ -25,6 +25,8 @@
+ 
+ # Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0
+ NEW_FORMATTING = sys.version_info >= (3, 8)
++# Python 3.11.7 changed the output formatting, https://github.com/python/cpython/issues/111019
++NEWEST_FORMATTING = sys.version_info >= (3, 11, 7)
+ 
+ if sys.version_info[:2] >= (3, 8):
+     from unittest.mock import AsyncMock
+@@ -240,7 +242,9 @@ def test_repr_with_name(self, mocker: MockerFixture) -> None:
+ 
+     def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None:
+         expected_name = kwargs.get("name") or "mock"
+-        if NEW_FORMATTING:
++        if NEWEST_FORMATTING:
++            msg = "expected call not found.\nExpected: {0}()\n  Actual: not called."
++        elif NEW_FORMATTING:
+             msg = "expected call not found.\nExpected: {0}()\nActual: not called."
+         else:
+             msg = "Expected call: {0}()\nNot called"
diff --git a/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild
index 21e83bfc0670..ccb417b563d1 100644
--- a/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/pytest-dev/pytest-mock/pull/404
+	"${FILESDIR}/${P}-test.patch"
+)
+
 python_test() {
 	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
 		einfo "Skipping tests on ${EPYTHON}"
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index cee564600e3a..1318d7976ac3 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,3 +1,4 @@
+AUX pytest-trio-0.8.0-test.patch 1813 BLAKE2B 5c9feb01f75dbb302d4f4ab833affc5c02e9a2dde53e9c49425ac4acec25b25a8d9e5f7b68f00e00268841b6072c5aae9439ce2747c1d3cc7f9403d47631a5dd SHA512 bdd5457127949bb7d36e4427140ce99db3c914f26dcdea607ca12947f273487d3320206741a669e27f4fb34f8980f1842d87110a4b7cc460c6ffb5605a6f760f
 DIST pytest-trio-0.8.0.tar.gz 46525 BLAKE2B 54660dc9b021af0ec18eace72f053223d16e89635c74d71329a005e5fee3bf6e2055cc29412d9de7443b2594ee53d68890d1e30ed7c94560c355d4342bb3d035 SHA512 79141021633b7b2d8a840d7eaf6a3447bccd59d1bd4909e7feba88a9ae8244376f281b64fde4333b5a575957e3f73028e389a9abf0d19a35417f15c47eeccd05
-EBUILD pytest-trio-0.8.0.ebuild 1325 BLAKE2B 9e8a99f764e1f79ad49b5bd02b57144186553e1710b31ba7835e3406af5981a859025b2cda68107e14e25b37bb56dfa30b8d7adce2f6599be595381277a19df5 SHA512 25972f7b6113cbacbf0cbd021bba28bf65fbc00f39f20baa898eb90270102bfb48c017ff17b56ebeba2ce814e85fabb245aeb2f33b2dd36525ec2e7a8eb43ce1
-MISC metadata.xml 420 BLAKE2B 42bae65fb9b23797c96bdc057faebc577f89f0c83f27031079176c2a122cb15e70eb5937a8cd52d09b3d7c5a7d16f62768452c87523fdb0fad876b63836c171d SHA512 5dd3d9e96df753347ccdf41428b5faa1df217985d7cfda1d7bd933fdf755f8f254fd9fa80e7cbeedff318327c4ff4257d8598a17def8ee6144d27aa89305cc3d
+EBUILD pytest-trio-0.8.0-r1.ebuild 1434 BLAKE2B 9f502cbcce71bcbf7e734b983a1743d0312837c017e88cebea10a2b55a117347a447af9f703cde84d593182c0f7c8c1c29e13ad3c42a7223bdf1538f36fa0d04 SHA512 eb05be9855a36311053a93ef510fe61280f374b21f44ebc63b7742077c67d10d88e944b51893a190eae90bde7c7405d6d39ce027115e5fa186d29169b1c061aa
+MISC metadata.xml 521 BLAKE2B 330ebeab4ff6df94e8c813af8dd789aeced74dd28e673ea9458a95a0855007738f81c37acce03cde17c599ac6168e853d583565ac1a3bfd8fea96eb353236ebb SHA512 b4f2f3152d0a7d40d2c21311b5d2efe3593ee69df35c4b2c5653ae2c2ca7eb46dc0885fc8b97d44ff934c7d86209898d027c9ebb51221729fe1f3d912ffd3ae4
diff --git a/dev-python/pytest-trio/files/pytest-trio-0.8.0-test.patch b/dev-python/pytest-trio/files/pytest-trio-0.8.0-test.patch
new file mode 100644
index 000000000000..a65fd2aee071
--- /dev/null
+++ b/dev-python/pytest-trio/files/pytest-trio-0.8.0-test.patch
@@ -0,0 +1,52 @@
+From 9cda20bbb966fe1e4ae51921d566c668654ee5e1 Mon Sep 17 00:00:00 2001
+From: Vincent Vanlaer <vincent.vanlaer@skynet.be>
+Date: Sun, 3 Sep 2023 00:00:54 +0200
+Subject: [PATCH 1/2] Remove trio.tests import causing warnings
+
+It is deprecated and the replacement is made private as trio._tests.
+While we could be using that, this commit copies over the one relevant
+function that is actually necessary. The other two imports just repeat
+tests that are already in trio and do not need repeating here.
+---
+ .../_tests/test_hypothesis_interaction.py     | 21 ++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/pytest_trio/_tests/test_hypothesis_interaction.py b/pytest_trio/_tests/test_hypothesis_interaction.py
+index 75aa9f7..cb95a96 100644
+--- a/pytest_trio/_tests/test_hypothesis_interaction.py
++++ b/pytest_trio/_tests/test_hypothesis_interaction.py
+@@ -1,10 +1,5 @@
+ import pytest
+ import trio
+-from trio.tests.test_scheduler_determinism import (
+-    scheduler_trace,
+-    test_the_trio_scheduler_is_not_deterministic,
+-    test_the_trio_scheduler_is_deterministic_if_seeded,
+-)
+ from hypothesis import given, settings, strategies as st
+ 
+ from pytest_trio.plugin import _trio_test_runner_factory
+@@ -38,6 +33,22 @@ async def test_mark_and_parametrize(x, y):
+     assert y in (1, 2)
+ 
+ 
++async def scheduler_trace():
++    """Returns a scheduler-dependent value we can use to check determinism."""
++    trace = []
++
++    async def tracer(name):
++        for i in range(10):
++            trace.append((name, i))
++            await trio.sleep(0)
++
++    async with trio.open_nursery() as nursery:
++        for i in range(5):
++            nursery.start_soon(tracer, i)
++
++    return tuple(trace)
++
++
+ def test_the_trio_scheduler_is_deterministic_under_hypothesis():
+     traces = []
+ 
+
diff --git a/dev-python/pytest-trio/metadata.xml b/dev-python/pytest-trio/metadata.xml
index 485f7038656c..a0206c25c87f 100644
--- a/dev-python/pytest-trio/metadata.xml
+++ b/dev-python/pytest-trio/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python-trio/pytest-trio</remote-id>
diff --git a/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.8.0-r1.ebuild
index 4159233367eb..a73c87ac4e00 100644
--- a/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,11 @@ distutils_enable_sphinx docs/source \
 	dev-python/sphinxcontrib-trio
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/python-trio/pytest-trio/pull/135
+		"${FILESDIR}/${P}-test.patch"
+	)
+
 	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
 	mv pytest_trio/_tests/conftest.py conftest.py || die
 	distutils-r1_python_prepare_all
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 90bf5320a803..4af7ef09c651 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,5 +1,3 @@
-DIST python-memcached-1.61.gh.tar.gz 29238 BLAKE2B 4b24ae56716a0c17297c2041e26c555e0e675d87d3e77f75fd33e60f9c7f3791f1e4ef0e8fcaf0f895a2dce2f5539ddf5a6d2e42d3198a71d5edcc9a52716442 SHA512 ea66a04129816863d700718ae525838b381aaca6da3a239e3b2ff5cfc92297083a4b66fe0a10c1460f597e066b3d30902cdab1c38999be49b77d745a078d1da2
 DIST python-memcached-1.62.gh.tar.gz 28598 BLAKE2B 4251931d4e77e83b959d1d3c23d96b532083ebe86e23c25e899185485de59348994041529c03be22be412128657e8bac9edd326b81a218113c465d69e4ae2b4f SHA512 0394a3c6c1521e2dd5ce27953ebe285ab6ffc514ea64f8da22e9e630d01d49e975f5f81e8fc12080424a35409f7b39b4d8a0ff9893ab4b4985bad1005c6c1026
-EBUILD python-memcached-1.61.ebuild 1093 BLAKE2B a8d0e3a13986777fa9727aeffff50ae0c385cf2e6031c6cbeff4a3397c8b2938973a15437b353d794304eabf97bcd5b73d8415778613507c7c5ea3ac5d8f86ff SHA512 dfafc56f94eaa9b0316427948daab3d7aadf011ae9b0d01991c83f7c40764d25481c453eadd2f398c805bdafc990efffee8ae67e5b2515c282c693efb82753a3
 EBUILD python-memcached-1.62.ebuild 1093 BLAKE2B a8d0e3a13986777fa9727aeffff50ae0c385cf2e6031c6cbeff4a3397c8b2938973a15437b353d794304eabf97bcd5b73d8415778613507c7c5ea3ac5d8f86ff SHA512 dfafc56f94eaa9b0316427948daab3d7aadf011ae9b0d01991c83f7c40764d25481c453eadd2f398c805bdafc990efffee8ae67e5b2515c282c693efb82753a3
 MISC metadata.xml 486 BLAKE2B 6126b61b0955941698b9221d4c6dfa239d7ecf04faa96a42cbb8bb00d788f54f349e64702852d3c0bdd467a6a73612f87a614f54ac6625e119a83922ce6379e6 SHA512 30513983f8440d212d772e3ee53dae96dd937805f1e89781e532c147d213d61d87877bbdc38597ae2b25fce7a6ca14d5134cbf24f0af4e05619679c012df6ee5
diff --git a/dev-python/python-memcached/python-memcached-1.61.ebuild b/dev-python/python-memcached/python-memcached-1.61.ebuild
deleted file mode 100644
index 528ace0c5f5b..000000000000
--- a/dev-python/python-memcached/python-memcached-1.61.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python memcached client"
-HOMEPAGE="
-	https://github.com/linsomniac/python-memcached/
-	https://pypi.org/project/python-memcached/
-"
-SRC_URI="
-	https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		net-misc/memcached
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	local pidfile="${TMPDIR}/memcached.pid"
-
-	memcached -d -P "${pidfile}" || die "failed to start memcached"
-
-	eunittest || die "Tests fail with ${EPYTHON}"
-
-	kill "$(<"${pidfile}")" || die "failed to kill memcached"
-	local elapsed=0
-	while [[ -f ${pidfile} ]]; do
-		if [[ $(( elapsed++ )) -ge 30 ]]; then
-			kill -KILL "$(<"${pidfile}")" ||
-				die "failed to kill -KILL memcached"
-			die "memcached failed to stop after 30 seconds"
-		fi
-		sleep 1
-	done
-}
diff --git a/dev-python/sphinx-celery/Manifest b/dev-python/sphinx-celery/Manifest
index 9be27567f4f9..30f3e9e9236b 100644
--- a/dev-python/sphinx-celery/Manifest
+++ b/dev-python/sphinx-celery/Manifest
@@ -1,10 +1,3 @@
-AUX sphinx-celery-2.0.0-extlinks.patch 1022 BLAKE2B 72afdaf8be3832bc4d4d20ece22065696340d715e208810dd315586b87d5a23fcaaabf63f9e056afedb86976bc874b414722998edf96a9bafbc4fc22e84a3c9d SHA512 07431b7763df6616783f0fe1d9ed560341a6f3c3c848264251d798ed4f26d5b92a3bf6a92bd8c377a1093e582e15a886b13ffa3314554696519ae93226aa380c
-DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
-DIST sphinx_celery-2.1.0.tar.gz 16612 BLAKE2B 8fc50186f589e00b26b7550f28ee4b4e863b58ccde682a53a70e90d53d4cd31777f6363a8d2dc58000db86bff0cdb957b74234d15d68c189cb9371c6e4b06cd0 SHA512 63abdf8de1f30550172f15c41eb51c1f200b83eaacda1b6c209138d9a4057fa6c0f711904fe11611ea08d18e957b3966038a0b6b4ca4d5d7cdbbaeab9bab601a
-DIST sphinx_celery-2.1.1.tar.gz 16615 BLAKE2B a4e3e92d54b78e04638185afb1f51f093303a2008b80369263357d3ca7e8cd18c1292e621c14a600def0c2e88c214d940fbd505aa70c8b7e29f546f5654e130a SHA512 8236409ee05647f4d78cf7e7ea210a0b3d9052df48d493c120ed9a21601e132885c5b054a5f550489e0787ea7e7bb34c84bab81251a0578a7ef59a4be04ff65d
 DIST sphinx_celery-2.1.3.tar.gz 16647 BLAKE2B 5dd5861e9581cb576058c86e3fa077bc95d2f8f7c15d2055469a15f2cfaf8b8f3b2ea147b8ad90bbcfd6c888808c92edb57c6a2219364225ff9eca27b3e4ed37 SHA512 87ea7cc229a9db25ca32559010bbab66197506eedffb3a8e80e847f68dff664ad3eb4257c615ce74387456fe9d70c4b47eabfb769f371a529e46c867b03560b4
-EBUILD sphinx-celery-2.0.0-r4.ebuild 591 BLAKE2B 47536da25c21a807990d92efbc3eef6a136dba38e4717fb19a653a27eb8d727c988110fbf76a1baa18d407e35eb84f0a6d591d707a5a55a5642301d84f3a01db SHA512 eeb2d568dd88349589e3e2ffbe0a29326bd847e628ef77004f5d6caabae8bec99496afd9687080e987f87a9d478cd7bd28b6bcbf7ecee1341821886211bfb38e
-EBUILD sphinx-celery-2.1.0.ebuild 498 BLAKE2B 4e09392ee793a6733dd3cd30b22a9a4e4c0d480246e1700e2cb74a1a87996b9bd3015e381ab315b147f0de3feb367a2b468e87109fa9ca94fbd9841dcd0dac74 SHA512 a0664fa49da2991c35acb53790be4318057ed03c0fde777475753accc9859f8391d418614ed1ec81dd196766e73185e3fcecc74767098b4a5a8209a12b65d534
-EBUILD sphinx-celery-2.1.1.ebuild 498 BLAKE2B 4e09392ee793a6733dd3cd30b22a9a4e4c0d480246e1700e2cb74a1a87996b9bd3015e381ab315b147f0de3feb367a2b468e87109fa9ca94fbd9841dcd0dac74 SHA512 a0664fa49da2991c35acb53790be4318057ed03c0fde777475753accc9859f8391d418614ed1ec81dd196766e73185e3fcecc74767098b4a5a8209a12b65d534
 EBUILD sphinx-celery-2.1.3.ebuild 461 BLAKE2B 432949155e5d85bafc2263860e270b398d10df1a0aced6a691d73458181c8ad7b4875bec7bb85dde3cdd75cb225b3791c16a24916f404a43fed4b75214e6d818 SHA512 147fad954d36a4689e367d034f106c136636c42c9f1250c594060558ca14b11e055f7a332420a2125cc7366fe3c50524e13f710ccb153ba7ad8c8f3b6697dbda
 MISC metadata.xml 355 BLAKE2B 12bfcfd706cacbfbd3c28692b0e50f45b8d62306682e1207123d2bdcb490197b3f0e3e142d0d57778a0eb9caa868f0d88e1b7b30b17e22cdeaa7a8265bef4eb8 SHA512 b6a7a301eb8f6984a60e707fd8ca5c5a88cb286e24b6dc98baea473670bad8d3e898384b140bc22711ea80a514e6bd0d256ce6e7a814a175c36f6755713a0e44
diff --git a/dev-python/sphinx-celery/files/sphinx-celery-2.0.0-extlinks.patch b/dev-python/sphinx-celery/files/sphinx-celery-2.0.0-extlinks.patch
deleted file mode 100644
index c01e8dde882d..000000000000
--- a/dev-python/sphinx-celery/files/sphinx-celery-2.0.0-extlinks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 46d3ea167e7b6eab24f35354f44822981bc76767 Mon Sep 17 00:00:00 2001
-From: Oleg Hoefling <oleg.hoefling@ionos.com>
-Date: Tue, 23 Aug 2022 15:56:17 +0200
-Subject: [PATCH] add placeholder to each extlinks caption
-
-https://github.com/celery/sphinx_celery/pull/40
-Signed-off-by: Oleg Hoefling <oleg.hoefling@ionos.com>
----
- sphinx_celery/conf.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/sphinx_celery/conf.py b/sphinx_celery/conf.py
-index b35bc2b..8a6895b 100644
---- a/sphinx_celery/conf.py
-+++ b/sphinx_celery/conf.py
-@@ -161 +161 @@
--        'GitHub SHA@',
-+        'GitHub SHA@%s',
-@@ -165 +165 @@
--        'GitHub branch',
-+        'GitHub branch %s',
-@@ -168 +168 @@
--        'https://github.com/%s/', '@',
-+        'https://github.com/%s/', '@%s',
-@@ -171 +171 @@
--        'https://pypi.python.org/pypi/%s/', '',
-+        'https://pypi.python.org/pypi/%s/', None,
-@@ -174 +174 @@
--        'https://en.wikipedia.org/wiki/%s', '',
-+        'https://en.wikipedia.org/wiki/%s', None,
diff --git a/dev-python/sphinx-celery/sphinx-celery-2.0.0-r4.ebuild b/dev-python/sphinx-celery/sphinx-celery-2.0.0-r4.ebuild
deleted file mode 100644
index ff9f3a023eac..000000000000
--- a/dev-python/sphinx-celery/sphinx-celery-2.0.0-r4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="
-	https://github.com/celery/sphinx_celery/
-	https://pypi.org/project/sphinx-celery/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-"
-
-# https://bugs.gentoo.org/show_bug.cgi?id=911637
-PATCHES=( "${FILESDIR}/${P}-extlinks.patch" )
diff --git a/dev-python/sphinx-celery/sphinx-celery-2.1.0.ebuild b/dev-python/sphinx-celery/sphinx-celery-2.1.0.ebuild
deleted file mode 100644
index c1cf8b5e4213..000000000000
--- a/dev-python/sphinx-celery/sphinx-celery-2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="
-	https://github.com/celery/sphinx_celery/
-	https://pypi.org/project/sphinx-celery/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/sphinx-celery/sphinx-celery-2.1.1.ebuild b/dev-python/sphinx-celery/sphinx-celery-2.1.1.ebuild
deleted file mode 100644
index c1cf8b5e4213..000000000000
--- a/dev-python/sphinx-celery/sphinx-celery-2.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="
-	https://github.com/celery/sphinx_celery/
-	https://pypi.org/project/sphinx-celery/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 67b2a31e1bb1..46593195816f 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -6,7 +6,7 @@ DIST stripe-8.0.0.tar.gz 1070432 BLAKE2B 9f0b605d1c2c5f58dafcc78fb3d4878406c466b
 DIST stripe-8.1.0.tar.gz 1065303 BLAKE2B be82278fa4b401c0259e5d48a4d232557cda98771254cec5dddd7ef5bcd2896e7545d9a3463c9d27da5b6df0b98ff07de292888c00c92fa51f4ebe1b04806e7b SHA512 fbc2c7d3d8da5d0ba261c38bd9371df26beab4a509c86fac6f759678fe8fb387a178bcf49b4cf4a10d44469bbac1626a0bc79d5ba99797f6fbdaa7fc5fdd34b4
 EBUILD stripe-7.11.0.ebuild 2139 BLAKE2B c42fcdca6bdae6a0cfd2abefd1347acb645b2845c81c3434613418549fc3c95db6ffd4a08822348a36b68596a9c5552b415caced5165cc67a02dc198d0e5b497 SHA512 2cd8c6d898bd13fca943c647cf165266783437ab0e66b4827da40243c7cc6b237435da630e5a8b662612d660cb509615b1d7ff47295a5f180512de2918525cac
 EBUILD stripe-7.12.0.ebuild 2142 BLAKE2B 3cd84fb8e32d5bf2f9f48e889d1f4463571bcef1a8d0539a0ea48424acd0cbaae9ff6dce5f33d979307052caac1aacf1618d83ba22f298016614da1c123376e5 SHA512 3e480e177e37e09c20e75a30cea09cab309bc733e7017ada7631c7c0ab44592d7c88f5449ba21e3eb037409b8d018a077e13daf3223f6e3cc047d4ad9cdd4eb4
-EBUILD stripe-7.13.0.ebuild 2142 BLAKE2B 3cd84fb8e32d5bf2f9f48e889d1f4463571bcef1a8d0539a0ea48424acd0cbaae9ff6dce5f33d979307052caac1aacf1618d83ba22f298016614da1c123376e5 SHA512 3e480e177e37e09c20e75a30cea09cab309bc733e7017ada7631c7c0ab44592d7c88f5449ba21e3eb037409b8d018a077e13daf3223f6e3cc047d4ad9cdd4eb4
+EBUILD stripe-7.13.0.ebuild 2141 BLAKE2B 2688a1d5967c25efe9838a8acb7d8a5c13abce8ac10e66342de9dd93b1db95e2ab9b3f1609a576f1c945f0b4964397c89f9f194857aea58b3b2317d56547cda6 SHA512 026190509aad9d1b3c158b9cb3c326901783ff37074ac166a8d0a139624a2a38cb2f111a0c527b2edf2a58fd7fde2878b1d06b94c32264bcec64646a8d89f90e
 EBUILD stripe-7.14.0.ebuild 2142 BLAKE2B 3cd84fb8e32d5bf2f9f48e889d1f4463571bcef1a8d0539a0ea48424acd0cbaae9ff6dce5f33d979307052caac1aacf1618d83ba22f298016614da1c123376e5 SHA512 3e480e177e37e09c20e75a30cea09cab309bc733e7017ada7631c7c0ab44592d7c88f5449ba21e3eb037409b8d018a077e13daf3223f6e3cc047d4ad9cdd4eb4
 EBUILD stripe-8.0.0.ebuild 2142 BLAKE2B 3cd84fb8e32d5bf2f9f48e889d1f4463571bcef1a8d0539a0ea48424acd0cbaae9ff6dce5f33d979307052caac1aacf1618d83ba22f298016614da1c123376e5 SHA512 3e480e177e37e09c20e75a30cea09cab309bc733e7017ada7631c7c0ab44592d7c88f5449ba21e3eb037409b8d018a077e13daf3223f6e3cc047d4ad9cdd4eb4
 EBUILD stripe-8.1.0.ebuild 2142 BLAKE2B cd97002f710e38f9bcaf54916678a0a36c6a1107776c7baee1fcf011d111a4a5a043421e3db33824535db9942c0d3b6bbfd58715a340daf5af96c7735c9065a6 SHA512 4e9e51636a5e11444f2fc3d24412124620622957852b317f6e294ac2dd29c709225a4bda24a735587f6e2e7901b4ae9168f3c2d4579c5ccd1fe93d8fbfe7727e
diff --git a/dev-python/stripe/stripe-7.13.0.ebuild b/dev-python/stripe/stripe-7.13.0.ebuild
index e5d81167c1c1..8d0d55a4c6d4 100644
--- a/dev-python/stripe/stripe-7.13.0.ebuild
+++ b/dev-python/stripe/stripe-7.13.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index d5d044227acf..de356f5e3518 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -3,6 +3,6 @@ DIST xarray-2023.12.0.tar.gz 3602114 BLAKE2B f6753772d3ea5c5a79afb2e55e0fd9df764
 DIST xarray-2024.1.0.tar.gz 3612457 BLAKE2B 53c99ade060ee9aafb9ff1416ab50e27271a5c45c06b8bda5183757b64694eea8649ae9515261112926aa872364c7a9349fb874114b82d5c7221d4d6104feb23 SHA512 1a5c184e6547e867076cd4faf533476608de13c4cfdb7085362e93c974598ea29d42c8fa55374b4782cc36ab7d870d4b7174217b3854db367ae16772e7f37cc8
 DIST xarray-2024.1.1.tar.gz 3614037 BLAKE2B cc50fbfa19a2c9229b85b8c7d5d0e7e7f6d3e5a484955fcc81aa0b37839a0b992d2c2f928e4097ca05c7b8294ed1061fbd0c1b7e7c65c9087a940dab97c520ce SHA512 b6447ca2c80b3a3091ac2baba648fef4faa79ffff272360e9726b318b517ede9d2717d1b6f77f03fdacf55527233f1a37c0d114901fe1a265d3e435cf293a487
 EBUILD xarray-2023.12.0.ebuild 3317 BLAKE2B dbc5f4579037681d2def274b7c39131b714a06044fde95c73c464a9405cafc35009c9a4a5c5349a85593a6ef29eb9a259414e19ba05d5bb230643ef84ee227d0 SHA512 0f39d29d00a6cd1514d1f4a07fad76e42ed7a4b36004da20d64f552516bd5bbad7d1dad9a5300759b07e9f8bfb6e94a2f1f14291f63969f6c5df38abafe90f59
-EBUILD xarray-2024.1.0.ebuild 3437 BLAKE2B deda2e794cc468babb4cc26fc09769b7e4912d7b8e427610f2e87ed6cadb80befabba40f58a391e86f4d7598b6645167dbc54c052104daa409af187941579aea SHA512 4d99e24dd1e1cb4227656244856b59c22c3c8ef69cd78b40f11ca468835986dd0d7e16eae0bfb3ef7d90f80d8dbc9d53c67907a63e22b5109dfe03a85fa4d284
+EBUILD xarray-2024.1.0.ebuild 3436 BLAKE2B 5f7448b55d324fa8f56b7f382b5f7fe2b1d80de9ab73a4726eb8fc3eb572f077230944603d77239d10899665f831410c8db9e1b760f8a132cd49d26ab8afac61 SHA512 593196248cd8da65d11c0d4d3b3a5e7f2ce0e87ddd3b36449ed71fa7a4ec7a36c46b540c578555930e121d6c4718b5dc2bd62c3abc4f2aa03ab79f515b3c1494
 EBUILD xarray-2024.1.1.ebuild 3558 BLAKE2B b4836ce310dc0989332b2b4bb898358f53d0f8fa18d7dd43162513798a0dc7433f0f7b92d5aa191af418b897ec7ea5814357f6129fe64b1e9891d7281efd7213 SHA512 c74ff517b276d36408af249a7cfe27cbe7fed261c4be366d46c6bc11d71ebc18576262ffe9097375b4cd58316d519b9a2663bd62bda6b776abf2488acdc1b5ca
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2024.1.0.ebuild b/dev-python/xarray/xarray-2024.1.0.ebuild
index 0fc8cd23af4d..ad6bb47cea43 100644
--- a/dev-python/xarray/xarray-2024.1.0.ebuild
+++ b/dev-python/xarray/xarray-2024.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="big-endian"
 
 RDEPEND="