Adding metadata

197 files changed, 984 insertions, 4559 deletions

diff --git a/dev-python/Faker/Faker-22.0.0.ebuild b/dev-python/Faker/Faker-22.0.0.ebuild
deleted file mode 100644
index 7654943106a7..000000000000
--- a/dev-python/Faker/Faker-22.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Faker-22.2.0.ebuild b/dev-python/Faker/Faker-22.2.0.ebuild
deleted file mode 100644
index b726995539a4..000000000000
--- a/dev-python/Faker/Faker-22.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Faker-22.4.0.ebuild b/dev-python/Faker/Faker-22.4.0.ebuild
index b726995539a4..7654943106a7 100644
--- a/dev-python/Faker/Faker-22.4.0.ebuild
+++ b/dev-python/Faker/Faker-22.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Faker-22.5.0.ebuild b/dev-python/Faker/Faker-22.5.0.ebuild
deleted file mode 100644
index b726995539a4..000000000000
--- a/dev-python/Faker/Faker-22.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 5f46d5572961..e5745dc20ed1 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,6 +1,3 @@
-DIST Faker-22.0.0.tar.gz 1702044 BLAKE2B 17bb5fe42f3d754358a1cf21a23a6917571bdeaff5967b94b3dcc62e08b274f9647ab19b9fa252ccf0f6f821da93ad474c2dddce3c07813048cd910b96d6c68a SHA512 b1539ca7b37d14dcbb06a4dbc198dfacaf4f0d7189f8e8a8986b42ac44780fa1b78c5b02d6f7a289c68a190a83e439f76a92587ee582105c4001246a39d046ce
-DIST Faker-22.2.0.tar.gz 1702497 BLAKE2B ed5d215399d168b79661a5db5a0b7c9a8321f5fdba30041eb6640cc9e6700d838aa7291060b022cc76a44ce2dd3c28eabbe30be35e4b0311edf4c09f4c523042 SHA512 c9a97a29885d73cbd9920938574e7615be43243a4d524391a4e51a1dcf8ca3188a9606094e715773fbd81740145813b1920ac35e99e49dc932d95045e14fa546
 DIST Faker-22.4.0.tar.gz 1702616 BLAKE2B 1a50724c0c8faaf4b2e72d3b23f242be19862133c79a1d49b8919512355ec84d565768b1c0868f287708880a13e833bab4dc911a9f4df53d9a225fa3ea75e00c SHA512 a8531b839c46c0403c37d1f5d58b026a2f8bf9ef66c4ce6302673dc7988250d51d069740bf783abf5b610afc2d01e23aa769c7d32ee03927befb13a610adc586
-DIST Faker-22.5.0.tar.gz 1703089 BLAKE2B 8c03883f60fa7ab39cc4dee6f73907b34d8b8a7a2f2f55f3842e9807625ff92dff5e3268f4f48048483ec707f4e0c0d4fb4d4c8b6a52f86ec204b8dbd4cad9b9 SHA512 b3ed913304cca9768b79685e449f49c56ad94274e213d77f64afe713b765e128dd5ef8d02222a3519c87ae5d4f567c64e2f8734972c95072f7a23119cc76cf09
 DIST Faker-22.5.1.tar.gz 1703337 BLAKE2B 603b06512deb04c6e320904aa32b7e210ecbe270ae634814adeaa420d2af342d44744755ad7ae575ef7902bd3ad6d117c88814bb13a1d84952509ec881b402f9 SHA512 469cf1af9535be0610c1b8750874b1623b0746b762a995805a86a9bdb54a2a8cd3d4118254b1a75240f24a6294629669aae3b6e062e8b229eba30de56cb2bbf8
 DIST Faker-22.6.0.tar.gz 1703974 BLAKE2B b6deb022fd38f52baf9a76e697451ca4ba175e530c3c232d09722f1f809de779d7885b92d1b87be64d9b87da2a7bda80af6cb5968faa55c60547156a5a7c63b7 SHA512 100db2723e4e6961ea239bd1c083cc8ed90cec2af3a8fb82c77df4cd2faec10b51f6cc5ff502e3afaf4d53142f6eaf04b1c6bd955ae8173e5c2f7b19bb7cf561
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 1e53617e7d30..dd0424d53b62 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,4 +1,2 @@
-DIST Nuitka-1.9.5.tar.gz 3911838 BLAKE2B 064ad4aa48d94b4eb7c886d445e7228c72d03dcb22e75e82a7c43b42a20a32f1b11855017f72101e54c45b4591ffd2af0912191eb7f13367f16726208308a6de SHA512 8b8bc0ec0f4666ae63bd4cb3463c6321bd1cbde7a64ca37d500bd2e60d50f6a13aca5dc89a101d7b8e39622e21091b24232ecf8361b4ae9a9913c187742c7607
-DIST Nuitka-1.9.6.tar.gz 3914776 BLAKE2B 82a50f642f8b93caa725bbfffa6236d490ccb8d731ea917886d0cde03aa6c2237f6c8ff7687ad3140c985cc7c5b525e16aaf07bd604232e32b7fa0fb102a00f5 SHA512 005be29f72685677da1e037b36381765c1248bc2940eb92a46e8e5df990f0241af831b8cf28ab2957d3a7d3d0cb03c2b99ab5af4e900afba53b5ac60e95d1a24
-DIST Nuitka-1.9.7.tar.gz 3916330 BLAKE2B df269672d0c7b860a0aebf0cd9f321442344c69e1ea8ccaad193a835b11ca6cfe048179d3ab03a616525aa022327e168c48406c733354ed13c07c49e26cb0bb8 SHA512 71ce5ef929489ce7a72a2b62b7106dee35380b0d185788e105044cab6448d9c3470e3d783c71a9796404038b8035019816553a360a62d868cfc870675b3bb384
+DIST Nuitka-2.0.1.tar.gz 3928704 BLAKE2B 404b1678b761abd2853baa9998fec3710d152a9affdf747d5ccea0d1dc16b861525379ab1999964f81948557484948f43da15614a397e7d85f2f98d4d09afb3e SHA512 70ca004c4207d176e5d504e185a7554a2df4fde8cb93cee440c14a7d785e6dafd587d205c277a681dcbba40e221c3fa46f240c97ecf08c15e2ca801cac4fcc68
 DIST Nuitka-2.0.tar.gz 3964226 BLAKE2B 76ace502390dcb9c10ae9a9dc624575453a0e9c440509b40e74162200d84942be565f07a0877f3bfeb8b82b4f1398f8d7c9150e19d8be58e3f67859f0656277d SHA512 93125344fa8556c0c185dabce14786f52f9db37ba1cbdb1d9fafc08d72be66bbb2bad4e55b12a92c84d85efef6d914fb6ae4e5ca7c4da0574f1892152b111ea0
diff --git a/dev-python/Nuitka/Nuitka-1.9.5.ebuild b/dev-python/Nuitka/Nuitka-1.9.5.ebuild
deleted file mode 100644
index ace539e2aa7a..000000000000
--- a/dev-python/Nuitka/Nuitka-1.9.5.ebuild
+++ /dev/null
@@ -1,52 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/Nuitka/Nuitka-1.9.7.ebuild b/dev-python/Nuitka/Nuitka-1.9.7.ebuild
deleted file mode 100644
index ace539e2aa7a..000000000000
--- a/dev-python/Nuitka/Nuitka-1.9.7.ebuild
+++ /dev/null
@@ -1,52 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/Nuitka/Nuitka-1.9.6.ebuild b/dev-python/Nuitka/Nuitka-2.0.1.ebuild
index ace539e2aa7a..187b012ee8f1 100644
--- a/dev-python/Nuitka/Nuitka-1.9.6.ebuild
+++ b/dev-python/Nuitka/Nuitka-2.0.1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 flag-o-matic optfeature pypi
 
 DESCRIPTION="Python to native compiler"
 HOMEPAGE="
-	https://www.nuitka.net/
+	https://nuitka.net/
 	https://github.com/Nuitka/Nuitka/
 	https://pypi.org/project/Nuitka/
 "
@@ -39,7 +39,7 @@ distutils-r1_src_prepare() {
 
 python_install() {
 	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
+	doman doc/nuitka.1 doc/nuitka-run.1
 }
 
 python_test() {
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 051aa1598aed..c1a3d2e808cb 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,2 +1 @@
-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
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 c74639e200a1..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_{8,9,10,11,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 2b059e1ca9cb..7a404a082ae4 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/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index c614cc09379e..f4035cf2e1d5 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1 +1,2 @@
 DIST serverless-application-model-1.83.0.gh.tar.gz 5423374 BLAKE2B faa11adf7b6ec9df3eb625a77c2f6242b4c9fe170be8926f90da1cab94dc2c018e2ba7fc53dffec63756e68deebe7bdb22853d9e67e84e8e696399b81ed4b648 SHA512 f2bd8ce766894118107dd6cac245ae47b9fd819f9cb04a0c7d176ab3ec4f56bebbfc9c4e371f2b1db372c594a15d3c6871195b5aba06712a9f2408a51284cba1
+DIST serverless-application-model-1.84.0.gh.tar.gz 5467750 BLAKE2B 386abc362020a9f3da6e040d0d31c1da9ee24311d779dabf9deb84ca5fd2abc655daf78f0303884e81fee1eb4a14f30f42e768475b85ad389d10625452fc9703 SHA512 4d771dccb9ca2d5f03c7e04f3dcf40c06b7a23cc5eb9a59d1fc2ae76abb944d469127131b1995edb9d44c90ef637b21fe65af42df2adf559fd06af92016ff2e5
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.84.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.84.0.ebuild
new file mode 100644
index 000000000000..f01bb1ccf394
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.84.0.ebuild
@@ -0,0 +1,62 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 multiprocessing
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-3[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts= -o filterwarnings= \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
index 6354fbd94949..ac78ef0aa60f 100644
--- a/dev-python/beautifulsoup4/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
@@ -1,2 +1 @@
-DIST beautifulsoup4-4.12.2.tar.gz 505113 BLAKE2B 94412a87dcffeb14655417eb61a784c8933aea79c81721ebf30114d55fd3e0f58850e0cfed354d3573d1bf18b556f3d83474b64a2a8d88f503c5125d5931321d SHA512 1dbb620f675bb319ef050ece0f343e80359bdc59cd8b8de19b1851aa5bca1081a7e953e3221ad97142198c17f67384c05b0406af24a123d71398f209fb89db97
 DIST beautifulsoup4-4.12.3.tar.gz 581181 BLAKE2B dac85b2d56ad1d2faf040def2141cb7a7ca68def7fc48fab18e11c23878795fcecfdd43058e70229e014e23e67f56a55160aa4ba08bab4b3d955bd10a07c8168 SHA512 b5b6cc9f64a97fa52b9a2ee1265aa215db476e705d3d79e49301de7e8d36c56c96924cb440eec0715f7ec75c5ddf4c1ade9d6cef7cdc9bf9e37125ac6eb50837
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.12.2.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.12.2.ebuild
deleted file mode 100644
index 0095f1cfb2f2..000000000000
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.12.2.ebuild
+++ /dev/null
@@ -1,36 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/soupsieve-1.3[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-# bs4 prefers cchardet > chardet > charset-normalizer
-# however, charset-normalizer causes test failures, so force the other two
-# dev-python/chardet[${PYTHON_USEDEP}]
-BDEPEND="
-	test? (
-		|| (
-			dev-python/cchardet[${PYTHON_USEDEP}]
-			dev-python/chardet[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild
index 61f7bcf1d4cf..64381a6d922c 100644
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/soupsieve-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index fe46e614089f..494a2a301d2e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,3 @@
-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
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 6bf591555d3c..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_{8,9,10,11,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.23.ebuild b/dev-python/boto3/boto3-1.34.23.ebuild
index 13391b8a8e76..6bf591555d3c 100644
--- a/dev-python/boto3/boto3-1.34.23.ebuild
+++ b/dev-python/boto3/boto3-1.34.23.ebuild
@@ -25,7 +25,7 @@ else
 		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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
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 c6201d2c5818..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_{8,9,10,11,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 c6201d2c5818..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_{8,9,10,11,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 c6201d2c5818..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_{8,9,10,11,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.30.ebuild b/dev-python/boto3/boto3-1.34.34.ebuild
index c6201d2c5818..c6201d2c5818 100644
--- a/dev-python/boto3/boto3-1.34.30.ebuild
+++ b/dev-python/boto3/boto3-1.34.34.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 3d912bdda51d..affad7f9f0e8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,3 @@
-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
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 0106367c65a4..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_{8,9,10,11,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.23.ebuild b/dev-python/botocore/botocore-1.34.23.ebuild
index 2fc3a4924fdb..0106367c65a4 100644
--- a/dev-python/botocore/botocore-1.34.23.ebuild
+++ b/dev-python/botocore/botocore-1.34.23.ebuild
@@ -24,7 +24,7 @@ else
 		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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
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 fd76f2226b9c..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_{8,9,10,11,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 fd76f2226b9c..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_{8,9,10,11,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 fd76f2226b9c..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_{8,9,10,11,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.30.ebuild b/dev-python/botocore/botocore-1.34.34.ebuild
index fd76f2226b9c..b78ea904a0da 100644
--- a/dev-python/botocore/botocore-1.34.30.ebuild
+++ b/dev-python/botocore/botocore-1.34.34.ebuild
@@ -58,6 +58,6 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest tests/{functional,unit}
 }
diff --git a/dev-python/build/build-1.0.3.ebuild b/dev-python/build/build-1.0.3.ebuild
index 7f426b012ead..ac9368d2dc1d 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 616f25fc4ff6..38c10ee95f47 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1 +1,2 @@
 DIST cbor2-5.5.1.tar.gz 94221 BLAKE2B 651d229c9a4e5fda2ae61302f8bd72a165f15e008333525a301f2fc94dc81259698f4ae9b8c1f3a0b5fadffadd4d55f2ba4bf1445938a10342997bca64ceba31 SHA512 7878b997ae5bdf44cb04b7cef8445a94f11c1722819ea85073bd56f99976cf2c1c1180e72d9ae9cd7dd7d06a6aa55dc1cb3f919a869098a9feede210f8355fb4
+DIST cbor2-5.6.1.tar.gz 99268 BLAKE2B 95a310c6fea00f90ba512d836691ab8fb75ebb9f6b59ca0698b7f97d2c969d2f8809ed2717c48354812f309856a35873c96571194dd86c48a225696b27ec806f SHA512 9ddf2c3690780816ff50ff4ed371435ca45b597b706254c37c9f01d1f1a699892e2c945a72e69b5506a803c41692f399b58b4e32d9409a0197c677e537e656b2
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..d00d4f72a704
--- /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=( python3_{8,9,10,11,12} pypy3 )
+
+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 c8540efadf22..cd405e0d940b 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,2 @@
-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
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 b25ea48ce902..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_{8,9,10,11,12} )
-
-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/cfn-lint/cfn-lint-0.84.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.84.0.ebuild
index 62ae5c544686..d74971979a93 100644
--- a/dev-python/cfn-lint/cfn-lint-0.84.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.84.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.83.0[${PYTHON_USEDEP}]
diff --git a/dev-python/chainstream/chainstream-1.0.1.ebuild b/dev-python/chainstream/chainstream-1.0.1.ebuild
index d8d0d9d5c165..6b1b0df6c384 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 4e313c2acf54..017a314d9e9f 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,3 +7,4 @@ 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
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..82c18f7c0f95
--- /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_{8,9,10,11,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 fdc3fc52ebf3..e2abaa6075c2 100644
--- a/dev-python/dict2xml/Manifest
+++ b/dev-python/dict2xml/Manifest
@@ -1,2 +1 @@
-DIST dict2xml-1.7.3.tar.gz 14240 BLAKE2B b28343f2cfeb59a91011bb158ffe7db008f19be1576293e6b07c3b49e07f3871761c8a3a32c214bf0608602487e2e7110c7f2a2f31a7dbf44a441f44ca7f568b SHA512 631415e425688c612c15b72fc339db33977df32eb25f7f8f03a63e5115c8e06f4aa5b247ded3e16cddbb9b16597aeb0ef218f193c5f4c44ebdcd7e39c2052ed2
 DIST dict2xml-1.7.4.tar.gz 14333 BLAKE2B 9d1a5180d6cffed171aa973902d6e88190b8bd90cd9e4d86744b5c074d82e45c7571763aa9cca67d190cf7af1b1fdd155cbff906a44a638dcb3a7033f1be86ba SHA512 13a2b34783e5f6414c173059ba16a2061ecaef41355b7b0099546d704c9c28b1e0f9ea3186d4b0db99083e66a2f22e69e57a4a415b72c00fd1e17bcb435e7462
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 5cc3874363b3..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_{8,9,10,11,12} )
-
-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 114c1de32af4..54653be97027 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 ccaf0175eede..3b24c91d3e7a 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1,2 +1 @@
-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
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 fb36cd892132..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_{8,9,10,11,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/elastic-transport/elastic-transport-8.12.0.ebuild b/dev-python/elastic-transport/elastic-transport-8.12.0.ebuild
index c01c4dff839b..e8df5c363863 100644
--- a/dev-python/elastic-transport/elastic-transport-8.12.0.ebuild
+++ b/dev-python/elastic-transport/elastic-transport-8.12.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 5d696f94397e..343f179839fb 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,2 +1 @@
-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
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 2b90c07d8c6f..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_{8,9,10,11,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/elasticsearch/elasticsearch-8.12.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.12.0.ebuild
index 33515a54831e..5d3c57264717 100644
--- a/dev-python/elasticsearch/elasticsearch-8.12.0.ebuild
+++ b/dev-python/elasticsearch/elasticsearch-8.12.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
diff --git a/dev-python/flasgger/flasgger-0.9.7.1.ebuild b/dev-python/flasgger/flasgger-0.9.7.1.ebuild
index 72a46a66df2f..0083adb6e59f 100644
--- a/dev-python/flasgger/flasgger-0.9.7.1.ebuild
+++ b/dev-python/flasgger/flasgger-0.9.7.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-api/files/flask-api-3.1-flask-3.patch b/dev-python/flask-api/files/flask-api-3.1-flask-3.patch
new file mode 100644
index 000000000000..92eddb8d8df0
--- /dev/null
+++ b/dev-python/flask-api/files/flask-api-3.1-flask-3.patch
@@ -0,0 +1,84 @@
+From 9c998897f67d8aa959dc3005d7d22f36568b6938 Mon Sep 17 00:00:00 2001
+From: Arthur Taylor <arthur@codders.de>
+Date: Sat, 21 Oct 2023 09:53:02 +0200
+Subject: [PATCH] Add compatibility code to deal with Flask and Werkzeug
+ deprecations
+
+---
+ flask_api/helpers.py   |  5 +++++
+ flask_api/parsers.py   |  2 +-
+ flask_api/renderers.py | 11 +++++++++--
+ flask_api/request.py   |  2 +-
+ 4 files changed, 16 insertions(+), 4 deletions(-)
+ create mode 100644 flask_api/helpers.py
+
+diff --git a/flask_api/helpers.py b/flask_api/helpers.py
+new file mode 100644
+index 0000000..f83dd31
+--- /dev/null
++++ b/flask_api/helpers.py
+@@ -0,0 +1,5 @@
++def url_decode_stream(stream):
++    import urllib
++    body = stream.read()
++    body_str = body.decode()
++    return dict(urllib.parse.parse_qsl(body_str))
+diff --git a/flask_api/parsers.py b/flask_api/parsers.py
+index 56f45f6..d056210 100644
+--- a/flask_api/parsers.py
++++ b/flask_api/parsers.py
+@@ -2,8 +2,8 @@
+ 
+ from werkzeug.formparser import MultiPartParser as WerkzeugMultiPartParser
+ from werkzeug.formparser import default_stream_factory
+-from werkzeug.urls import url_decode_stream
+ 
++from flask_api.helpers import url_decode_stream
+ from flask_api import exceptions
+ 
+ 
+diff --git a/flask_api/renderers.py b/flask_api/renderers.py
+index a9aed23..b5951a2 100644
+--- a/flask_api/renderers.py
++++ b/flask_api/renderers.py
+@@ -1,8 +1,8 @@
+ import pydoc
+ import re
+ 
++import flask
+ from flask import current_app, render_template, request
+-from flask.globals import _request_ctx_stack
+ 
+ from flask_api.compat import apply_markdown
+ from flask_api.mediatypes import MediaType
+@@ -95,7 +95,14 @@ def render(self, data, media_type, **options):
+             mock_content = self._html_escape(text)
+ 
+         # Determine the allowed methods on this view.
+-        adapter = _request_ctx_stack.top.url_adapter
++        if hasattr(flask, 'globals') and \
++            hasattr(flask.globals, 'request_ctx'):
++            # update session for Flask >= 2.2
++            ctx = flask.globals.request_ctx._get_current_object()
++        else:  # pragma: no cover
++            # update session for Flask < 2.2
++            ctx = flask._request_ctx_stack.top
++        adapter = ctx.url_adapter
+         allowed_methods = adapter.allowed_methods()
+ 
+         endpoint = request.url_rule.endpoint
+diff --git a/flask_api/request.py b/flask_api/request.py
+index 33c3eaa..647dfc6 100644
+--- a/flask_api/request.py
++++ b/flask_api/request.py
+@@ -2,9 +2,9 @@
+ 
+ from flask import Request
+ from werkzeug.datastructures import MultiDict
+-from werkzeug.urls import url_decode_stream
+ from werkzeug.wsgi import get_content_length
+ 
++from flask_api.helpers import url_decode_stream
+ from flask_api.negotiation import DefaultNegotiation
+ from flask_api.settings import default_settings
+ 
diff --git a/dev-python/flask-api/flask-api-3.1-r1.ebuild b/dev-python/flask-api/flask-api-3.1-r2.ebuild
index 028614801e3d..64ee25c35a64 100644
--- a/dev-python/flask-api/flask-api-3.1-r1.ebuild
+++ b/dev-python/flask-api/flask-api-3.1-r2.ebuild
@@ -24,13 +24,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
-	<dev-python/flask-3[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
-	<dev-python/werkzeug-3[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/flask-api/flask-api/commit/9c998897f67d8aa959dc3005d7d22f36568b6938
+	"${FILESDIR}/${P}-flask-3.patch"
+)
+
 python_install_all() {
 	local DOCS=( docs/about/release-notes.md docs/api-guide/* docs/index.md )
 	distutils-r1_python_install_all
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 79f6b060f6a7..3066012ff159 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,3 +1 @@
-DIST flask-2.3.3.tar.gz 672756 BLAKE2B 70feb2f1ec8bc4742e8da978b7e1063c5f0bcbfda5321f397cba121283376b5b10a275635eac76383945415dbba3b2c4f917e1495851ee1dfd745db97caddec5 SHA512 801b2521c42de7a4cd16005ea6ea7737aaef6c88edacb38ab03e2d78bb4e080e35e540c23e157e2bcdb43e4818b4b7a856c50c6cf41bb17f0b7b2590c0c6aff2
-DIST flask-3.0.0.tar.gz 674171 BLAKE2B 5ae270b429d6ea344828bead0cab855b42f4c28821c843a7754f4741ef0320c190e386a08adb4c6a5018e6a2cc7be588d955ebd4edf31ae59ea9d511c9cd93cb SHA512 dab4f97909619e380e9d8f14cea346dbda8932f3e9d19ee45e3651faf51b94aa5ccaa658116c69abae680f5357235842c63f0c6ff2a191de70cc103f0e7624a4
 DIST flask-3.0.1.tar.gz 675138 BLAKE2B 974eda07aa3c8d679495d34ac0d3c64a5aa2318c8675a52817068c2eeb3b90c7da07800230b18df0767329f15670b72ed4fe8fa6e4737ad00e842cdd9aa77adf SHA512 ae1f191b965b548e6f390b61ea1219b3399f773a1667d28aef63fcd4ab0f82d3eac9a430be43488ea01aa82a12d5677b3f6a5a48b8cce6c7204bf386d4c3f6f2
diff --git a/dev-python/flask/flask-2.3.3.ebuild b/dev-python/flask/flask-2.3.3.ebuild
deleted file mode 100644
index 5cbccb0368bd..000000000000
--- a/dev-python/flask/flask-2.3.3.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=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="
-	https://palletsprojects.com/p/flask/
-	https://github.com/pallets/flask/
-	https://pypi.org/project/Flask/
-"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	inherit pypi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/blinker-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.3.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log-cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-3.0.0.ebuild b/dev-python/flask/flask-3.0.0.ebuild
deleted file mode 100644
index 8525f1d838fa..000000000000
--- a/dev-python/flask/flask-3.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="
-	https://palletsprojects.com/p/flask/
-	https://github.com/pallets/flask/
-	https://pypi.org/project/Flask/
-"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	inherit pypi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/blinker-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log-cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-3.0.1.ebuild b/dev-python/flask/flask-3.0.1.ebuild
index 6da9a46bfe3d..d7fe19035248 100644
--- a/dev-python/flask/flask-3.0.1.ebuild
+++ b/dev-python/flask/flask-3.0.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 7bca74ead0f7..9b2aca5de693 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,4 @@
 DIST python-api-core-2.15.0.gh.tar.gz 193916 BLAKE2B 708bee6e62b4049d88bc88dfc03add6496ee1861954485e145ab01707284216aef224bd8646a3336417d8b114a8c196ce44e8da63e53c3dff3d616ff9bef25ad SHA512 1abbeb266e4bcb9cf8a2dc6ba795a5667b5e9a870fe8609335e929ac17410822e4324d88c7692f8c60534e9ee4b0933af0277cc44ccb2d805bcbaf8db1288bba
 DIST python-api-core-2.16.0.gh.tar.gz 205401 BLAKE2B a36c1e76912038b5d239c02c586d79e96f6167b200dab7d97cee1f9dbf679a217a2a67ab2075c86bdeb81a42649229bcfe4940bba8d0ec707ea1d317c364125c SHA512 6ffe94ecb56bc9e67da644365726e3c03ad7a678f18019523e555e33d4226631162c7a749286273b735d4d0bf62af676bfac7c6d17ad1d074a1274c575c8d925
 DIST python-api-core-2.16.1.gh.tar.gz 205716 BLAKE2B 9fef4c669a40d2a8b8432e329aabb6c7d672bbfd912a01ba2629e080a95a82935f31389964b76050d814f85b4f66e6115f5c7339e193eec0012762cb9971968a SHA512 c9bba140e95f4a968297886937f96d86d7d2598699d7957ee4136be3741d52334f2525e1f9c2151ad4b9325456f36ace51ce7fd49079178d5d6049c45e2b0e7b
+DIST python-api-core-2.16.2.gh.tar.gz 205804 BLAKE2B a0bc9668d0fb9958ecce78c23cd432399ff8d3a63536275e4b39d76f518da39ad2b3761e10e62475b0ad07216f353ea23d2c172ee524920be4a87530b3331489 SHA512 c7014c06d8038ee078dede46dcc2ffffffad9934c5fa55ec9445a9d73ac1d5e2eb8db4a4240d072ea2352727f3621de29769b1efe8cd72682f749e338f8db0c3
diff --git a/dev-python/google-api-core/google-api-core-2.16.2.ebuild b/dev-python/google-api-core/google-api-core-2.16.2.ebuild
new file mode 100644
index 000000000000..bde7f392fc30
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.16.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/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/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_test() {
+	rm -rf google || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio tests
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index a2a9ce649649..87b5731e741f 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,3 @@
-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
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 d95f9378286c..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_{8,9,10,11,12} )
-
-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/google-api-python-client/google-api-python-client-2.114.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.114.0.ebuild
index e4c330a85144..d95f9378286c 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.114.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.114.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
index ff379f1d72e6..ad8ecce604bb 100644
--- a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
+++ b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch b/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch
new file mode 100644
index 000000000000..c3d87ec4144d
--- /dev/null
+++ b/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch
@@ -0,0 +1,87 @@
+From 65e397d7332ab87e3b2455ff9dc99af24861b58b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 3 Feb 2024 11:20:00 +0100
+Subject: [PATCH] Support using httpbin without flasgger
+
+Make the dependency on flasgger optional.  The dependency has been added
+relatively recently (i.e. before the original package was abandoned but
+after its last release), and it is only used to provide a more dynamic
+landing page.  This is unnecessary for use of httpbin for testing,
+and it introduces an indirect dependency on Rust that is problematic.
+
+With this change, flasgger is no longer installed by default.  It can be
+enabled via "[flasgger]" extra.  When flasgger is not available, httpbin
+redirects to the "legacy" index page.
+---
+ httpbin/core.py       | 17 +++++++++++++++--
+ pyproject.toml        |  4 +++-
+ tests/test_httpbin.py |  4 +++-
+ 3 files changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/httpbin/core.py b/httpbin/core.py
+index a82c1b8..77576a4 100644
+--- a/httpbin/core.py
++++ b/httpbin/core.py
+@@ -33,7 +33,10 @@ try:
+ except ImportError:  # werkzeug < 2.1
+     from werkzeug.wrappers import BaseResponse as Response
+ 
+-from flasgger import Swagger, NO_SANITIZER
++try:
++    from flasgger import Swagger, NO_SANITIZER
++except ImportError:
++    Swagger = None
+ 
+ from . import filters
+ from .helpers import (
+@@ -165,7 +168,10 @@ swagger_config = {
+     "specs_route": "/",
+ }
+ 
+-swagger = Swagger(app, sanitizer=NO_SANITIZER, template=template, config=swagger_config)
++if Swagger is not None:
++    swagger = Swagger(app, sanitizer=NO_SANITIZER, template=template, config=swagger_config)
++else:
++    app.logger.warning("Swagger not found, legacy index will be used.")
+ 
+ # Set up Bugsnag exception tracking, if desired. To use Bugsnag, install the
+ # Bugsnag Python client with the command "pip install bugsnag", and set the
+@@ -244,6 +250,13 @@ def set_cors_headers(response):
+ # ------
+ 
+ 
++if Swagger is None:
++    @app.route("/")
++    def no_flasgger_index():
++        """Redirect to legacy index if flasgger is not available."""
++        return redirect(url_for("view_landing_page"))
++
++
+ @app.route("/legacy")
+ def view_landing_page():
+     """Generates Landing Page in legacy layout."""
+diff --git a/tests/test_httpbin.py b/tests/test_httpbin.py
+index 6b75124..2ce63a6 100755
+--- a/tests/test_httpbin.py
++++ b/tests/test_httpbin.py
+@@ -10,6 +10,7 @@ from hashlib import md5, sha256, sha512
+ from io import BytesIO
+ 
+ import httpbin
++from httpbin.core import Swagger
+ from httpbin.helpers import parse_multi_value_header
+ 
+ 
+@@ -115,7 +116,8 @@ class HttpbinTestCase(unittest.TestCase):
+ 
+     def test_index(self):   
+         response = self.app.get('/', headers={'User-Agent': 'test'})
+-        self.assertEqual(response.status_code, 200)
++        self.assertEqual(response.status_code,
++                         200 if Swagger is not None else 302)
+  
+     def get_data(self, response):
+         if 'get_data' in dir(response):
+-- 
+2.43.0
+
diff --git a/dev-python/httpbin/httpbin-0.10.1-r3.ebuild b/dev-python/httpbin/httpbin-0.10.1-r4.ebuild
index 8b18aa9839a1..553fb9ed723e 100644
--- a/dev-python/httpbin/httpbin-0.10.1-r3.ebuild
+++ b/dev-python/httpbin/httpbin-0.10.1-r4.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
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
-inherit distutils-r1 pypi
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="HTTP Request and Response Service"
 HOMEPAGE="
@@ -17,16 +17,23 @@ HOMEPAGE="
 LICENSE="|| ( MIT ISC )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="test-rust"
 
 RDEPEND="
 	dev-python/brotlicffi[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flasgger[${PYTHON_USEDEP}]
 	>=dev-python/flask-2.2.4[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		test-rust? (
+			dev-python/flasgger[${PYTHON_USEDEP}]
+		)
+	)
+"
 
 distutils_enable_tests pytest
 
@@ -34,9 +41,15 @@ src_prepare() {
 	local PATCHES=(
 		# https://github.com/psf/httpbin/pull/29
 		"${FILESDIR}/${P}-werkzeug-3.patch"
+		# https://github.com/psf/httpbin/pull/44 (simplified)
+		"${FILESDIR}/${P}-optional-flasgger.patch"
 	)
 
-	# unpin greenlet
-	sed -i -e '/greenlet/d' pyproject.toml || die
+	# remove unnecessary deps
+	sed -i -e '/greenlet/d' -e '/flasgger/d' pyproject.toml || die
 	distutils-r1_src_prepare
 }
+
+pkg_postinst() {
+	optfeature "Fancy index" dev-python/flasgger
+}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 0d021a8b1aae..3a029089e3cc 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,2 +1 @@
-DIST ipykernel-6.28.0.tar.gz 157701 BLAKE2B 61b5415e6209cc83ea5f97f7a485489c5338539e711abab0358006835f0cff3d4d3a51b797eaaf44ef4666b225a0b64b9d135b9607a42dcb7d43a9bb38e9155d SHA512 81efbaafc48ad22b54719eebe7564d9d386407272b6c9bad34a2685ec73e1f831a2753251a7ff47c337becad272a39311f15faa7dac331e53272f3ccc975a860
 DIST ipykernel-6.29.0.tar.gz 160814 BLAKE2B 4f5c650fda125a477ae7f16fad07e968f0f31a97375159ff5d3917181f31ecac3a618927e492332e5d5f69321c43fad69daa4c9bdfc67acc3756775ef855ceec SHA512 f924d8c4471f04349e1c8d0b980f8759e55c37585a4a44e61ba01ed1b96e3aa3897ec6e953e91f8f881debf5e599ab95b679075dcd413e43b8ed0263e8c9ca44
diff --git a/dev-python/ipykernel/ipykernel-6.28.0.ebuild b/dev-python/ipykernel/ipykernel-6.28.0.ebuild
deleted file mode 100644
index 234a6fb14e87..000000000000
--- a/dev-python/ipykernel/ipykernel-6.28.0.ebuild
+++ /dev/null
@@ -1,78 +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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	!elibc_Darwin? (
-		$(python_gen_cond_dep '
-			>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest-asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_debugger.py::test_attach_debug
-		tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		tests/test_debugger.py::test_set_breakpoints
-		tests/test_debugger.py::test_stop_on_breakpoint
-		tests/test_debugger.py::test_copy_to_globals
-		# hangs?
-		tests/test_eventloop.py::test_tk_loop
-		# doesn't like pyside2?
-		tests/test_eventloop.py::test_qt_enable_gui
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.29.0.ebuild b/dev-python/ipykernel/ipykernel-6.29.0.ebuild
index 3a4df971118e..234a6fb14e87 100644
--- a/dev-python/ipykernel/ipykernel-6.29.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.29.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index b6804f3a5374..cbf323dbc218 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,4 +1 @@
-DIST jsonschema-4.17.3.tar.gz 297785 BLAKE2B a0383bf5612ae50e94c95dbc1774d796b62c74a7aae3056a40edb7e042ad07fd7885e61d86220120a906a4017afe30d8ee8edbbf0cf01a6dec1f212984ff1c1e SHA512 626fc913c37d2e49e4b47c9e058aab4a96c1dc50c35d8def0b2ea0ca464dc25e3318d4fde4927c11ca38068743cd81779d5189464b821407ac1de1788bad30e2
-DIST jsonschema-4.20.0.tar.gz 320243 BLAKE2B 7782665aa97d080a3ade9f0ed600d84602135ba80641c75d027f31f118432d206d5c61243e90a59aa134bce2fcf6bed6aed685bca9ad243178c78d3002d43b66 SHA512 916ce6e5a1cce19e52d34394797d59c4821a3e7abad0248d929a8d5975e8e5a2c0a270b2839d6e1800037a53d0ed8fd38ca44264a88653b5aaba1705d459cb47
-DIST jsonschema-4.21.0.tar.gz 321324 BLAKE2B 0c2bcf26fd9cb2c5ce86bb556a1312b861984373bde30e7dae42dce7711967e0e0f51b648cb2683786240c743f276ce81a4ef70fb66ab878e783602c77d903b2 SHA512 7467a1c70e587d32c2d196050b60f01a765a27ac0c97f4481c2c654381863911999e7b8f7592ec6ce24a92fb81f4de4ce5197652977a82ace5b75928a6c2334c
 DIST jsonschema-4.21.1.tar.gz 321491 BLAKE2B 5c8fad04bf62af3f9204818cc5cff88dcc492b7957439be2a2fd8c0731a986c223d1612ab79d47696fa5695224fceacea35b5e699466f14393adc2cf9d89c83f SHA512 b0744a80d64572307860c9238ff5048e062b7665d9ed97dd390bae0b168ab96497f359ddc4e95f052d8b177161e5b808ee432bd9fe182c1ea39cbad417db9278
diff --git a/dev-python/jsonschema/jsonschema-4.17.3.ebuild b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
deleted file mode 100644
index d765247ff64a..000000000000
--- a/dev-python/jsonschema/jsonschema-4.17.3.ebuild
+++ /dev/null
@@ -1,52 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.20.0.ebuild b/dev-python/jsonschema/jsonschema-4.20.0.ebuild
deleted file mode 100644
index d4e14c595156..000000000000
--- a/dev-python/jsonschema/jsonschema-4.20.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=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/shiboken6
-	)
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.21.0.ebuild b/dev-python/jsonschema/jsonschema-4.21.0.ebuild
deleted file mode 100644
index 7f0e7a523ecb..000000000000
--- a/dev-python/jsonschema/jsonschema-4.21.0.ebuild
+++ /dev/null
@@ -1,57 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/shiboken6
-	)
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.21.1.ebuild b/dev-python/jsonschema/jsonschema-4.21.1.ebuild
index 7f0e7a523ecb..c13d00865fff 100644
--- a/dev-python/jsonschema/jsonschema-4.21.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.21.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.12.5.ebuild b/dev-python/jupyter-server/jupyter-server-2.12.5.ebuild
index e2663ee45ce1..d9c9f2c92816 100644
--- a/dev-python/jupyter-server/jupyter-server-2.12.5.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.12.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index ff5b4b2985f0..efa210cd9e1c 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,3 +1,2 @@
-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
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 e1ad42ed7c20..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=( python3_{8,9,10,11,12} pypy3 )
-
-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/jupyterlab/jupyterlab-4.0.11.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.11.ebuild
index 86c870676a9c..e1ad42ed7c20 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.11.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.11.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 4e313c2acf54..017a314d9e9f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,3 +7,4 @@ 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
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..5ed5b5bd096e
--- /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_{8,9,10,11,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 67d46cf2a1ff..177c2640a09a 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,2 +1,3 @@
 DIST MarkupSafe-2.1.3.tar.gz 19132 BLAKE2B 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba929be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783 SHA512 97dcfa9277c8b34e5ebf899069f690452e90943e0f84ba8ffac725263d84e7c2b782294f9f386be31e8b6846505f0ec70835e3965fc76a1ce07b19432de4a7de
 DIST MarkupSafe-2.1.4.tar.gz 19288 BLAKE2B 3c358e913b0fb9fc4ea1fb4ed983a8b20a5b6fc6a7212e12cbd4bbd6753e45339dbc88068105cdcab3a86ed812ecd2cb04a6d94222c50bce3752e3125edb783b SHA512 f9abe713349ee81eb0d89c584b665440f7e9c26df3f4f87e277894aa59090cfa769e099a12b16c9029d98257dbb311e49a1d7deeeb4ca9e1863fd38e574b2d94
+DIST MarkupSafe-2.1.5.tar.gz 19384 BLAKE2B d6ae0e1864983f4ab92f2fd9b58a012a8c76e6f47957681d4acc362b2129d63fe4f4625600a89081afe0e99f868eb604d6c75fec88de9a18ebb32c15f091681b SHA512 3ba5af43d23c266377f5d32b11e1faa7955ea8c67eb1c32886c308527f93e75e387294d0eec7794c0c20aad0c705b27f3d1f86b04202f3b63068d12d4053cc71
diff --git a/dev-python/markupsafe/markupsafe-2.1.4.ebuild b/dev-python/markupsafe/markupsafe-2.1.4.ebuild
index a98c581ed1e8..a649d9b318ca 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/markupsafe/markupsafe-2.1.5.ebuild b/dev-python/markupsafe/markupsafe-2.1.5.ebuild
new file mode 100644
index 000000000000..a98c581ed1e8
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-2.1.5.ebuild
@@ -0,0 +1,25 @@
+# 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
+PYPI_NO_NORMALIZE=1
+PYPI_PN="MarkupSafe"
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="
+	https://palletsprojects.com/p/markupsafe/
+	https://github.com/pallets/markupsafe/
+	https://pypi.org/project/MarkupSafe/
+"
+
+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"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 4076e307d1a4..7a7a2d38c4cf 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,4 +1,4 @@
-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
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.4.ebuild
index 5c9ef8955f7c..bc89d9ac9e01 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.4.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.4.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.3.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.7.ebuild
index bc89d9ac9e01..eec1908ef846 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.3.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="social"
 
 RDEPEND="
@@ -44,7 +44,7 @@ RDEPEND="
 	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
 	social? (
-		>=dev-python/pillow-9.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
 		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/mpi4py/mpi4py-3.1.5.ebuild b/dev-python/mpi4py/mpi4py-3.1.5.ebuild
index 54fe704b541e..f34f1fdbc3fd 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/nbclient/nbclient-0.9.0.ebuild b/dev-python/nbclient/nbclient-0.9.0.ebuild
index f5bf3c18a96a..7203ea66e90d 100644
--- a/dev-python/nbclient/nbclient-0.9.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index dabb2cd4b0f2..6bb995265f9e 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1 @@
-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
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 44df5c86a550..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=( python3_{8,9,10,11,12} pypy3 )
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~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 dd5389e68114..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=( python3_{8,9,10,11,12} pypy3 )
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/nbconvert/nbconvert-7.14.2.ebuild b/dev-python/nbconvert/nbconvert-7.14.2.ebuild
index dd5389e68114..fdfe32b234df 100644
--- a/dev-python/nbconvert/nbconvert-7.14.2.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.14.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.9.2.ebuild b/dev-python/nbformat/nbformat-5.9.2.ebuild
index 6ba0d28d872c..b89ab7c41ceb 100644
--- a/dev-python/nbformat/nbformat-5.9.2.ebuild
+++ b/dev-python/nbformat/nbformat-5.9.2.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
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild
index 8b8870cac14d..d265d91743fc 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.3.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.3.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
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nest-asyncio/Manifest b/dev-python/nest-asyncio/Manifest
index 87a4be42b97d..d04cb9a58fa9 100644
--- a/dev-python/nest-asyncio/Manifest
+++ b/dev-python/nest-asyncio/Manifest
@@ -1,3 +1,2 @@
-DIST nest_asyncio-1.5.8.tar.gz 6105 BLAKE2B 549c5b8663a7fcb928e6cb97408aa4291129d043f8e5a55f5ba66c6b6cdbe21b1c2dd65959fd806d0badc1be561cda8b11a097fb522156d2d41eabce66318be3 SHA512 b454ad77381e6eb2bfa34528a26f342ba66b8edbb648c6b5aa69fbdd3142537db4ae53f91c2b88a5f88f16ecbe1e3346cec5a7bca4ca5c065a4e5f3daa0bb7e2
 DIST nest_asyncio-1.5.9.tar.gz 7496 BLAKE2B c7a86321699d06e2befdfd5576a10b57bbdbb75d6a411af4374a633becd350e5128fdc224853f9cfa876d3b66f4f1ad8be15a347046c6d615033069e1a04f9e6 SHA512 8b99b1bd51463f0639c602995e68d1aa520e287ec3bd92dafd3a13b8c3359e04fc6823c78fc9b862618b491cd3b5599ba4453da6388a651875fc71b7243f57ef
 DIST nest_asyncio-1.6.0.tar.gz 7418 BLAKE2B 35073a931f5a3e3cda8f702233a5d3a4a027bf9a22fd75f699b43fa587de69e867e94d114fb6029ec30bf1d791dd083cf9d5cb8462d79020e56ecbe4a4f10379 SHA512 19addd99ed548393b7fa6da2eab77d94ab33c6378003a50f6731c29ef873d4227ac6a1633b15931ab100f0c8c033c8332762d30e8921e241e72cfcd83bfbc481
diff --git a/dev-python/nest-asyncio/nest-asyncio-1.5.8.ebuild b/dev-python/nest-asyncio/nest-asyncio-1.5.8.ebuild
deleted file mode 100644
index 631bf1d1d4c3..000000000000
--- a/dev-python/nest-asyncio/nest-asyncio-1.5.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Patch asyncio to allow nested event loops"
-HOMEPAGE="
-	https://github.com/erdewit/nest_asyncio/
-	https://pypi.org/project/nest-asyncio/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nest-asyncio/nest-asyncio-1.5.9.ebuild b/dev-python/nest-asyncio/nest-asyncio-1.5.9.ebuild
index 3101681a5ef1..06995f005d46 100644
--- a/dev-python/nest-asyncio/nest-asyncio-1.5.9.ebuild
+++ b/dev-python/nest-asyncio/nest-asyncio-1.5.9.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 523464a2b743..ef57412f0c68 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,2 +1 @@
-DIST notebook-7.0.6.tar.gz 3930144 BLAKE2B 488689b34b61c37f2233d57d6ef75b3bf843e2340846e88593a6b49d88fc52f908126d2e718808451df1f8cc6f9a5624adef47c1ae4984cd2ff5ed535d47cb37 SHA512 9f9ac4fae93af425a442c25c8a601578a76c802cc50018a6ff6ef99fbabfe3fb649094625dbdda2b7c526cb7262d2c463745b006d35cc1834d40712f3820895b
 DIST notebook-7.0.7.tar.gz 3936954 BLAKE2B 9171ae3974bd4eb36c804858224c386292a3772633017a8bf0c0ef408526278234b022087faad7930aa975c66762690e24a5a368bf9290937bdc8dff63757575 SHA512 05725f6bae2d916c9393f483a05696f6eb0e38a1b15a8427cbd61f508a06d78ead8a70c8764a00403c323b25a1278ea3a8daaf1ff5b5eeb0b35f6ed5e64ea638
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 9fb257fae910..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=( python3_{8,9,10,11,12} pypy3 )
-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/notebook/notebook-7.0.7.ebuild b/dev-python/notebook/notebook-7.0.7.ebuild
index 0dabc7a0aa6a..6a5dcafa02a6 100644
--- a/dev-python/notebook/notebook-7.0.7.ebuild
+++ b/dev-python/notebook/notebook-7.0.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
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 b4deb12160b1..b1591d56cd08 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/orjson-3.9.12.ebuild b/dev-python/orjson/orjson-3.9.12.ebuild
index 87db342f0b4a..d0ce27793297 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 4dc2944f9bcb..fc5548949b1a 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,2 +1 @@
-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
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 2ec0f08381f8..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_{8,9,10,11,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/oslo-utils/oslo-utils-7.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.0.0.ebuild
index 412ed5375dbe..bbd53325dbd9 100644
--- a/dev-python/oslo-utils/oslo-utils-7.0.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-7.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index f5d66b00980c..b44354f22445 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,2 +1 @@
-DIST pandocfilters-1.5.0.tar.gz 8405 BLAKE2B 962da4f0e0d469f28f35eb181b10df317cb4130d796f62fe7ef27078d257e52a3554f93c64c303f617bbdd8b517868024686c8fd9f82b83a0ae6a923708c21a5 SHA512 32586d4718fd4b7047d850ca767ffacf8fba60844edf8469458e8549286e571774e7178678c7121be62b9a3c819a25de2d30b8fe58a539553336f322b87e836e
 DIST pandocfilters-1.5.1.tar.gz 8454 BLAKE2B e909459f4c82659ef41b82624c6b4af4f6a622c198f573a9a818b512decc44353aa108f7358828b7ddd6052271feca2e12b54b3948ea896765e3c1d16534bd51 SHA512 845bb5dc15edc42509086096be6aac2411192bdbdaed8d65fb2a8c8f9a650a4d836a9761a5fbfd69b5709d8476a96139ff06592e38261f795b377e475746518a
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
deleted file mode 100644
index 50fe299defa1..000000000000
--- a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
+++ /dev/null
@@ -1,19 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Utilities for writing pandoc filters in python"
-HOMEPAGE="
-	https://github.com/jgm/pandocfilters/
-	https://pypi.org/project/pandocfilters/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
index 4af0272f939c..fb208ba6dcc7 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
@@ -16,4 +16,4 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d7810d4da6d4..dee403681fa6 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,2 @@
-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
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 778607a083c5..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_{8,9,10,11,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/phonenumbers/phonenumbers-8.13.28.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.28.ebuild
index 062c56c77784..778607a083c5 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.28.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.28.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index 0440a9606f59..03468aa5d9d0 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1 +1,2 @@
 DIST poetry-core-1.8.1.gh.tar.gz 367396 BLAKE2B 0305e4022d91632a5cf68e57df61ee27ff1c7faf53d1be6d63e8f30183af828c5fe8126dbd6326ed7a8b428c107878632c26cc1dc2468161b2b79cfdfa0599f8 SHA512 25b4787f45da88142d8cbdad22a518335a82f24ccdba34112ab0f9be8eb130251211969d9da9422bc89fa3c5990adb4e2cde2e3b6f7a4f57f81c6d2b21cf722f
+DIST poetry-core-1.9.0.gh.tar.gz 371033 BLAKE2B 67e4674bcc45f6ce1737a26d8f1fd1ce6e6469d692cabe461fb2959b03ab3ca26b9e3848d9cbf533c5fd9bf7d75ac8b70a6aad0cce1930472971cc1ad530aedf SHA512 a2d63480f0df36fabe61c234377a4fa9ea0a1ddce449006162d6e49e849c92ad9c77d0a93aba7c51561bac16a77d5db00a95594bd5e2de328e1664f3f41f689b
diff --git a/dev-python/poetry-core/poetry-core-1.9.0.ebuild b/dev-python/poetry-core/poetry-core-1.9.0.ebuild
new file mode 100644
index 000000000000..51e49298edd4
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.9.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+# check inside vendors/pyproject.toml
+# (note that some are indirect deps)
+RDEPEND="
+	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# These "fail" bacause of glob file path resulting from newer versions
+		# in our tree than vendored. But those don't affect anything.
+		tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+		tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+	)
+
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON} (unported deps)"
+		return
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/psutil/psutil-5.9.8.ebuild b/dev-python/psutil/psutil-5.9.8.ebuild
index 463f00431d17..e797bd18001f 100644
--- a/dev-python/psutil/psutil-5.9.8.ebuild
+++ b/dev-python/psutil/psutil-5.9.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index a7bba9870674..c1a48a62b04f 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -25,7 +25,6 @@ DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76
 DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
 DIST itoa-1.0.8.crate 10465 BLAKE2B e518264938d044e24a4d72cab788de717c36cc7396fdbf2805fe3a3e0cdfc361c4f6fedee7bcebea6fbacff254e073da26b2400a073fa75f75523b8ed9de9938 SHA512 6171bfcd70634a2587740c145a15790e12807d2c756a25e74950daf9dd36acc662f12836c5b87e20483b4d020bc0d98a352b8e9787b0b8544bf1ee1b6a0c2c8e
 DIST jiter-0.0.4.crate 78467 BLAKE2B 68179a86a8194d405cbb8ef719bce6e551c256701fed7a6f75ad219ef3fe865ee00bb8a6a09a5317b5bc274c4746ecad67568d3e6c88fad18ee68bd96a30d93d SHA512 50ac09bf73529b42fbd8dc0472dfe89da81e80cda75b965e3a633dd404087baaeb54157c5b7d56e470aa78c6506ea181e1ec92589361458b48541f26e3be5696
-DIST jiter-0.0.5.crate 79563 BLAKE2B 8fe39a300596b214d3cdbd77ae254bfff78830ae0f5cd413c1dd5436dd2ea939fc149110be8649871250547175bb443823ae5e79e8c7b0ef83b646312acf58fb SHA512 ab876c368d513f5f410a1456dafa8c27fc323473c94761c47ce1d68fcc438c25d0e73284911cf56feea6cf7c4e8972e42481673bda17105993d48f768e2df2bb
 DIST jiter-0.0.6.crate 128330 BLAKE2B 8f745b0bcc0eb107251e059ee1b591835c6162cd7f9956d74f35f2bed3e1b9ecea9511f98ee55b8dd5f0f6cbf64f2af06493affd279612ed51aa7e8f67d25da2 SHA512 7b6cf2b5e7c83dbbca2bc435015a283c61a903a7f16c4c1c2eb4827ca1bac10a27259c634cf0d05a8cf8726b7bdedfea9f08daee63aa05ba466b1c0d47614219
 DIST lexical-core-0.8.5.crate 26680 BLAKE2B 71f3cc95f47fa636f68d6d25612a47d4a178e2ffe484aa66760e78fb71e55633c055892647decaac08120d1b8b3b79d80d1a23d46a74d13b5e52d6b912839ea0 SHA512 f98d2b5afd331c6f4f599d24599ed8791ee3628a2fa2b8172b698cfe9a180e1ccd2da4dca4dd33fc76ef3417114c580399106d01a8d6153b45b38bceacee1018
 DIST lexical-parse-float-0.8.5.crate 180161 BLAKE2B 881e4db32a21c26a1919fd1373aef1ea16a6fca3d799edb18ff0c9e4a79d481f8ade7a93f9ded2a660ad10cf815eb757f6eec7887945f8203c467e700af7a9a3 SHA512 ef012cbf18f2e306724dd700ac259aaa73b44f6c4531377deb9979c80d31ae66fc1a8b2671bd677e0ebfad8f77e9a5cf25707c67a1c5b1f554953c036cb39d46
@@ -49,32 +48,24 @@ DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0
 DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247
 DIST pydantic_core-2.10.1.tar.gz 347316 BLAKE2B 782daaae0781da0abfa48056a9eebc8610737b719335f013f9573e3fa886f89af99390c5e9fa2ceeb46169392b480446a59acf0f182ab083b8f5dc8d62b090ee SHA512 c07d838268bbaa53e8a49afe18733532ac3f43005a5d4e4dee3a1cd23fa94af91d6471f9f2c146cc317cb8d14385b4aa7af404fdbbae7b4538f0cefffac7cf58
-DIST pydantic_core-2.14.3.tar.gz 359117 BLAKE2B 59a91a28009e8bbd5f58c37ed6b498c440bb2a5dce3a70841674d34f14b10b35c55b589f3aa137200f7a6c9ea6dbf229c65143d1d708358f25974c730744dbaf SHA512 e0327b1b48fb15f5695075da72ea229be93c9b7c7c59197638089e737d5941e11ad7e59678d5baf6ace3de3809d71eaa38e75849aad2fba2dae62ef153672a3d
-DIST pydantic_core-2.14.4.tar.gz 359851 BLAKE2B 9846b16b56cc7d9a567919a26edeaa71e4359e278a828b9bf2ec7ec749c7ab36b2f5c309fa53a47a24d85642de29e0b085d6b7731696460b745b860b78090502 SHA512 268be4220ab5eb4ada070c9eb7ffd56dfa29859896708bc3f0b494061a9848520a88e2d6b1e7ea9005b2dd84da1db98c2aca92f62e38317b945b8b9c211e418d
 DIST pydantic_core-2.14.5.tar.gz 360131 BLAKE2B 00385297c5a16b7a11c0d219b58f954fb98d0915826bcd0b2ad854307091ffe64735a44d93cd75512ffee1ea831f612435bfae91c895d3bc2f65b1032386c5f5 SHA512 e6c3081dfa58d9b59f8c33dfe80712d732ac3048a2f8240f9a0f5448d9bfc83e222c1e08b8bb49779b84f685c3bec3060cc935c113a818b1ab8aa955f3df2238
 DIST pydantic_core-2.14.6.tar.gz 360305 BLAKE2B e9e9469c6e17833660b3b6af5bf2e575fb10a8abb47c80a9a4490ea2fc69d0af4006d044ca45f5227ea0d71d4ecab00ffab9470dcbf2de9f130068568e0f93f4 SHA512 c5215ff9915d420e367dcefcec656fdc17c4782b672f33d4532c5d43b8119626298258b7540fb471b46ad7906c5930ca4887f11ecc7104c89fc746e3ed0b3b43
-DIST pydantic_core-2.15.0.tar.gz 364369 BLAKE2B df2044e96693db897328e6f73834ed439f0b3fab27e60c8f2f4300668cecfa3b7063c5fa820aa45e59b2e32d557843f2b72b5ff556d4667febfbcad0a7a7e2d2 SHA512 68f05f08cb7a089a8c8279f33c1339537828508af7dff89b623080301e8be6d7c12ce3a1ad87b79388e224e0338af841dab99b77ecc239d519e46682f0e49642
-DIST pydantic_core-2.16.0.tar.gz 367651 BLAKE2B bb6a876616d22378f85505b15f15c7303cd99265970e4853c2721e2dfd8026cf106e0626c7b23b4cc4e3b6a220c01b4b81cf94c9089c51b5ada88d730ef8a93c SHA512 8a08c1f3a30364a5285a48692273160ce11755bfeea620a96eb1f5a1b7e1918ffbad217a13dfe57819dbce9dc8f83c70681f99988f40530324dfea84115c4c17
 DIST pydantic_core-2.16.1.tar.gz 368201 BLAKE2B 59c411f606fa1ad3177fe25f44593b957532698482d7b4df275de1a5ce6224bf1cdaf7769811c6716a2af7d6eef780df14336a1a1a5ad2bf18a18f09e318ba22 SHA512 96949c6cf55b940398e7c0b8f7848b627a7e6fc50d7141cf54a38b9201ff33be0475b4cbed9b670fa5085a0dc452e03cf1cb0541ba03132c1e5c95bf2b2ed16c
+DIST pydantic_core-2.16.2.tar.gz 368903 BLAKE2B 79ef0652c832b2f2b2154adc0ff2b18e918136c2223d2c292beb0f2afccc8867cedf36ccc3993d3a2c54c1a801bb21a8a85f759ec0c046252ea17d2d26bca584 SHA512 1b17fe955a97b8c2014517764622195f82988b046233e8bb3191b7e4a11406f2df3ac1c72b369e9d7230328520b8ab88eadbfe6c19b2ac69c1ba764051703251
 DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9
 DIST pyo3-0.20.0.crate 431766 BLAKE2B 104bc21ce2c6931753ca0c7b2d91693f454c964260ca3c4628a899fc8e7edbe4238db913ed7356f3beff154d88a60a17c0e252b655768e75483e1d9d9b86f40b SHA512 85d9533c75f905752c62f6a4898582ae48daf085e287b44949c47260301205a5f00477927877ce46300d2801d22fbc04a958c058a37eb28374c834fff27feca1
-DIST pyo3-0.20.1.crate 434263 BLAKE2B 8cd52f6dcdbfc4968dfc82bbeba54a6c7b8b5ff2410500f9862060c3836b2ae7fed3973ac4cc5fc9aaed382e1cd266c38ab0524230609271c79df23dc2b8c684 SHA512 f49a8570b4ed535ef6ac209b080e0612e1185babc2436aa488e29aecb7abcecc12ccf2214225ac17ef38c6c38d343dc8c2a186890e795b81c59ccf2a2ec8509e
 DIST pyo3-0.20.2.crate 434326 BLAKE2B 3114fd6f3fb8ae7d1b35c9d2ac5ba6a49c5ac911ee3a5b941c5063263ca7cce47fa4b4f7ec34cbfe3083f3d1303fd7f061639fba833a04fedb9d5098f5784028 SHA512 cc5151a116179157046ec92677e5a72318b4cdb13a7d7e3bb83778739b5758040e5020f667dd83554a66b758581a08f5de05eb38e7b339813cec85e0712e6355
 DIST pyo3-build-config-0.19.2.crate 29206 BLAKE2B 5b1cd80d643e448cf8f1d28a514333526061c178121b9a0dcb5bff6082f402ecfd166536d94d42065f6dc1f108a73f12bbb78eedf9ea053a6aa2e9c80ac00ddf SHA512 ccc73061ec1989258921c5b5800689170635fa5503d74a4ac458baef903dd31efa41995d238783f1e099ece1f66d0a0e95c4fcb4b772b9f653dbb20e838b4e28
 DIST pyo3-build-config-0.20.0.crate 29534 BLAKE2B eb1d5f75276533483c52c6fcae49b294d6d8edf504859dae18811c1ef695dc6d0a055f2a34bea305975e4c1492c312433d2dcb7753484f793376c62cd59c8e40 SHA512 a01d06ebeb4b9cfe6ff6731046101e9437498453ca5aa68ec53df3bfb2f34665a489f8072636c2da16c1e867f536032fd293f05a43561117fd131bde5fe5aac7
-DIST pyo3-build-config-0.20.1.crate 29999 BLAKE2B bc352cc921d8eeda6fb9eaf569e40992daae7a250b2f2c083bf2d92a2990f7b3d04855f207af691c886adeeb97d5a6392eb4e4d0b6b8a66b64b22e219a687c4b SHA512 7e94e506bbcfe1c52fdf5ce2af16a38c62ca20f95571b930aa49ad3ff8da9356ca9dab1ad2952089920256d9ba24f5de819c3c88591bb62023dd2f17b7edf42f
 DIST pyo3-build-config-0.20.2.crate 30029 BLAKE2B 846eb95d1417a658763417a2750dca1c55201105a3978d61b1db5e3962680ede188f8285dd7deec778ea9860d43e40513b88f5a54f0b1881b08416760bdbbedf SHA512 9dbc669ec69d38716c3909fa8f3b6c5be13c717b20bfd5dd11edab59b8eb35247d7996acd260fec88f92eb3e71248c86e9b40c1a700827889e2990bba20ecddf
 DIST pyo3-ffi-0.19.2.crate 66500 BLAKE2B b4139fba31ef17017b6b60784e41ccda34931a072c2638af1eed8d02d7af701c46fe38b12772d2301cff41d10a433ff0f00a69d79d40233eadafe82abe585f8d SHA512 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32
 DIST pyo3-ffi-0.20.0.crate 64220 BLAKE2B dfe75b9459b4a564d1dd9f907166b76d00c5b50ba027db65d11540a7b993f3ef4e19e574135b538635ebb9c9eba66115c09198c7b6071b0b82fd94faccb1bb63 SHA512 a68f0b1380f2ac3d3034ac8b3788cd6573850137c6678694cbcc3e814b619510b9b21b11704c2e702d4eb7433d8b1d3a6dac663501b6db5197a409407802b714
-DIST pyo3-ffi-0.20.1.crate 64599 BLAKE2B b1a3487aa523a98407236bb8b15710123ebb36a5fd79f3b28e57aff7dfd1202a3124828a124e8bedb02b854e6974f613bad4838e8c1acf042b60ecf1dc2b4d2d SHA512 68274281005f81244231b74b45be8b2bc654daf4b6b9056a5449f60c0fe3ac7aba4cc114475e2d29f492cb80eb67dd4e2135ad8cc0cd5dea04053a0a58a486ea
 DIST pyo3-ffi-0.20.2.crate 64601 BLAKE2B cf1141ad34a13dcb46de0d1e15dda192ca41a7441bfc92a9295861876dcc690d1d5d6d39dafa51cd70c4627353efa91563eaefee8c39f655d12818003f9524da SHA512 ee6386b6fdb80689d104f9cd5229f02e1893d00a52be710bd36882c47305abbe24ef2f3cdef8200fddc0bb97e29001fa3a2fd9d3d2673ecd9a104a070420d01e
 DIST pyo3-macros-0.19.2.crate 7173 BLAKE2B 8862f42a30929579b0b0bc2ba7f0b416518724480e197fa13288e49324e851f964183e1529b7f31bf5d4fe0ae194a412723b6b401100e66fba98bbcd9c283866 SHA512 852cc2792aa3d30d9ab8802a451be5617cae6536adced1bf0dde71704a3c7c1bfe862fba751b6d045249819a8ba5d87dfc50914d142a0b662f046498c06f8c2e
 DIST pyo3-macros-0.20.0.crate 7678 BLAKE2B 03fdc0cc9c735086ca2d27e0bcd197e69538c3640ba7f87bc3d65907db374ac7283f61bdb67a1d45b66ce972072ddcb3b1daed4aeb9a66100d11bba6515cdc86 SHA512 79b61f55010dad60dda2c5061c9736bef3f6805f28db230726937340a5c40a3fcfb727a0db7779c3eb094ebd45492f7af4f40a3fcaef42f160989a8ef6174e7e
-DIST pyo3-macros-0.20.1.crate 7928 BLAKE2B e507629fecf15bb281cfb27246adcb748765e855580b98e02a8f41575bdc54c6d6dab7a4d4365aa18cbce64f246a0c22e6842b8e62d553b0f759e19c8c3ad836 SHA512 b1825f0d93a163f89e89a7f08eda4ba287a3e5944fb9309f92173859463dcebf466a20d707aae0deec30eb7daa711536ce8ff09a7c2bccc95178aaf0f021bc9e
 DIST pyo3-macros-0.20.2.crate 7925 BLAKE2B 00fc60becfa39bf452786d8a612247785f1737cc3e627700d0d144ab2efaadfb34ce8a8f46e932382a1ea99caebfe1946fbc517b5c26fadb0822ecaa8b2e9df0 SHA512 dd9ea9acda95dfc53689a4c26d8c2139f8a90a05ab06737037f19b8bccd5e52b0da5f297a29194b958f5f8b59cbb566b5f409b3f17a863eddf855ecb755d2719
 DIST pyo3-macros-backend-0.19.2.crate 49962 BLAKE2B 9d8a032c2205f55d2431b6bbc40df153339e08479df3a8a65506ade7d1f3d17cfaf664cbd09eaec9acff3f5a248598e37427d0c5a531eaf527137803adf49834 SHA512 fd708e6fdbd54ef7c676bedc62070175bac6b8f7ae11231578196dbf552b163a8a2499a1266f786bb6bfb85517fe83610902137d59a5c42efcb1a27c4235a07e
 DIST pyo3-macros-backend-0.20.0.crate 49383 BLAKE2B a239042abdfcf5ad38505b57bc6b858ba346bf8681e24acf2e433f53e4a40bf0b28928b434b96f596d12acbb602b14b7e1bbf4be1e5789e6d9c754368db00a1e SHA512 c823caba48b4a30aaf84c23f80934f0172f2c76a41b538b69ebc25afcb61611b54b8fbb4ab6cac1c7a78b4e6f9f909f22748a2cd279b508d3897b74b17021d56
-DIST pyo3-macros-backend-0.20.1.crate 49714 BLAKE2B 10c679e998aef25c3132bbd38c33acb75f45ac4b4ae13e8af67b43492526d0c3b74499d48d017131de7d0c898639180f35295c8633444a21fc488012f977f19a SHA512 f64a3d23f0f142b09a8d6d819c92c524c5d2417e9a40c332c6eb25e438e170d6496960aebe0672ea7f80cab1d3df84fc174fb7fa548c3b57b78bedc69897e660
 DIST pyo3-macros-backend-0.20.2.crate 49710 BLAKE2B 711b18984e61219555df4b62667f7f376951c6cb47e6dd947fc24618b923c4f4f790eb1aba1901abea4761632cdb58cfa81cce91f33586da3022e6c7d126bc9f SHA512 c6ca2a2cdae8630fba3f8e4122e81b60ef2ef0905ad2a3fbcfae134456d5ca9e73690b61590e391f3b9d82c24725809f18544c5dfa0b36ffdb1914844fe65d3a
 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
@@ -91,11 +82,9 @@ DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
 DIST serde-1.0.190.crate 76455 BLAKE2B d0f6a52615136d810760c6da3078387abc67ff5119e25953004d470ec6f5c569abf1c324b777c004714b4b15bd49a9972ec592372c807b26f3b4f124d534c833 SHA512 7f1cbe819fbae803865beb20b5d8b9fa52d503e04083be7181c1d04b702aaecf553796db960bfea87dc17ef864246e78a919219588064fb083e77dd2c6c16ce1
-DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506
 DIST serde-1.0.195.crate 76856 BLAKE2B 6a80b59335f222ae48d5e377c30611f30fe6416e6853ca47a39016e21f649cb9dfbe4964ce19e5da977fb9a963228a6a81c1e85af99ae12d7a0a5722901aa2f5 SHA512 0002ecb933d08fbdc8585ee74efb4048d385459f629261f5a4a8401b794f1c02b8296db79f479013a0b2a47ba99bee6c02d60d0fc2454e32f1b038b4071e8727
 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
 DIST serde_derive-1.0.190.crate 55676 BLAKE2B a6558987927298a6551a52d7a8e265acf1a3a0576716a881329803637b6f7ee7b3329e161bf5b37e410264c03913c2c16166df7dd25110b1295d61806600f4f2 SHA512 5b37b659c45ab95b0333d787cc5e8374076121d548837556774cbe768073b02aef4a6889e32b738ce5d85613264ba78570c0af48d049102d4d687ad791dd09ea
-DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41
 DIST serde_derive-1.0.195.crate 55687 BLAKE2B 4da7916e36f71dfe82defa6c45b3075395cae54631cdff08a4607e962290020e7214288258fd316439c02536073325f5902e7b00144f97269a207fc453496599 SHA512 8a82ae4e7cfe0c3ac27688cc95d74bf4c2e10c1fe845ab28fb57579b2f47f36d13218c2ae603f93f00114065d47c3e46166dea39b205be673f443c34305dacce
 DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc
 DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6
diff --git a/dev-python/pydantic-core/pydantic-core-2.14.3.ebuild b/dev-python/pydantic-core/pydantic-core-2.14.3.ebuild
deleted file mode 100644
index a359e90faec0..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.14.3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-CRATES="
-	ahash@0.8.6
-	aho-corasick@1.0.2
-	autocfg@1.1.0
-	base64@0.21.5
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.12
-	equivalent@1.0.1
-	form_urlencoded@1.2.0
-	getrandom@0.2.10
-	hashbrown@0.14.0
-	heck@0.4.1
-	idna@0.4.0
-	indexmap@2.0.0
-	indoc@2.0.4
-	itoa@1.0.8
-	jiter@0.0.4
-	lexical-core@0.8.5
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	lexical-write-float@0.8.5
-	lexical-write-integer@0.8.5
-	libc@0.2.147
-	lock_api@0.4.10
-	memchr@2.6.3
-	memoffset@0.9.0
-	num-bigint@0.4.4
-	num-integer@0.1.45
-	num-traits@0.2.16
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	percent-encoding@2.3.0
-	proc-macro2@1.0.69
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	python3-dll-a@0.2.9
-	quote@1.0.29
-	redox_syscall@0.3.5
-	regex-automata@0.4.3
-	regex-syntax@0.8.2
-	regex@1.10.2
-	rustversion@1.0.13
-	ryu@1.0.14
-	scopeguard@1.1.0
-	serde@1.0.190
-	serde_derive@1.0.190
-	serde_json@1.0.108
-	smallvec@1.11.1
-	speedate@0.13.0
-	static_assertions@1.1.0
-	strum@0.25.0
-	strum_macros@0.25.3
-	syn@2.0.38
-	target-lexicon@0.12.9
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.10
-	unicode-normalization@0.1.22
-	unindent@0.2.3
-	url@2.4.1
-	uuid@1.5.0
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-	zerocopy-derive@0.7.20
-	zerocopy@0.7.20
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	epytest -p pytest_mock -p timeout
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.14.4.ebuild b/dev-python/pydantic-core/pydantic-core-2.14.4.ebuild
deleted file mode 100644
index a359e90faec0..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.14.4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-CRATES="
-	ahash@0.8.6
-	aho-corasick@1.0.2
-	autocfg@1.1.0
-	base64@0.21.5
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.12
-	equivalent@1.0.1
-	form_urlencoded@1.2.0
-	getrandom@0.2.10
-	hashbrown@0.14.0
-	heck@0.4.1
-	idna@0.4.0
-	indexmap@2.0.0
-	indoc@2.0.4
-	itoa@1.0.8
-	jiter@0.0.4
-	lexical-core@0.8.5
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	lexical-write-float@0.8.5
-	lexical-write-integer@0.8.5
-	libc@0.2.147
-	lock_api@0.4.10
-	memchr@2.6.3
-	memoffset@0.9.0
-	num-bigint@0.4.4
-	num-integer@0.1.45
-	num-traits@0.2.16
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	percent-encoding@2.3.0
-	proc-macro2@1.0.69
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	python3-dll-a@0.2.9
-	quote@1.0.29
-	redox_syscall@0.3.5
-	regex-automata@0.4.3
-	regex-syntax@0.8.2
-	regex@1.10.2
-	rustversion@1.0.13
-	ryu@1.0.14
-	scopeguard@1.1.0
-	serde@1.0.190
-	serde_derive@1.0.190
-	serde_json@1.0.108
-	smallvec@1.11.1
-	speedate@0.13.0
-	static_assertions@1.1.0
-	strum@0.25.0
-	strum_macros@0.25.3
-	syn@2.0.38
-	target-lexicon@0.12.9
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.10
-	unicode-normalization@0.1.22
-	unindent@0.2.3
-	url@2.4.1
-	uuid@1.5.0
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-	zerocopy-derive@0.7.20
-	zerocopy@0.7.20
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	epytest -p pytest_mock -p timeout
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.15.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.15.0.ebuild
deleted file mode 100644
index b83a7414d077..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.15.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-CRATES="
-	ahash@0.8.7
-	aho-corasick@1.0.2
-	autocfg@1.1.0
-	base64@0.21.5
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.12
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	getrandom@0.2.10
-	hashbrown@0.14.0
-	heck@0.4.1
-	idna@0.5.0
-	indexmap@2.0.0
-	indoc@2.0.4
-	itoa@1.0.8
-	jiter@0.0.5
-	lexical-core@0.8.5
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	lexical-write-float@0.8.5
-	lexical-write-integer@0.8.5
-	libc@0.2.147
-	lock_api@0.4.10
-	memchr@2.6.3
-	memoffset@0.9.0
-	num-bigint@0.4.4
-	num-integer@0.1.45
-	num-traits@0.2.16
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.8
-	percent-encoding@2.3.1
-	proc-macro2@1.0.69
-	pyo3-build-config@0.20.1
-	pyo3-ffi@0.20.1
-	pyo3-macros-backend@0.20.1
-	pyo3-macros@0.20.1
-	pyo3@0.20.1
-	python3-dll-a@0.2.9
-	quote@1.0.29
-	redox_syscall@0.3.5
-	regex-automata@0.4.3
-	regex-syntax@0.8.2
-	regex@1.10.2
-	rustversion@1.0.13
-	ryu@1.0.14
-	scopeguard@1.1.0
-	serde@1.0.193
-	serde_derive@1.0.193
-	serde_json@1.0.109
-	smallvec@1.11.2
-	speedate@0.13.0
-	static_assertions@1.1.0
-	strum@0.25.0
-	strum_macros@0.25.3
-	syn@2.0.38
-	target-lexicon@0.12.9
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.10
-	unicode-normalization@0.1.22
-	unindent@0.2.3
-	url@2.5.0
-	uuid@1.6.1
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.1
-	windows_aarch64_gnullvm@0.48.0
-	windows_aarch64_msvc@0.48.0
-	windows_i686_gnu@0.48.0
-	windows_i686_msvc@0.48.0
-	windows_x86_64_gnu@0.48.0
-	windows_x86_64_gnullvm@0.48.0
-	windows_x86_64_msvc@0.48.0
-	zerocopy-derive@0.7.32
-	zerocopy@0.7.32
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=virtual/rust-1.70.0
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	epytest -p pytest_mock -p timeout
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.16.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.16.2.ebuild
index 1622d1763e35..1622d1763e35 100644
--- a/dev-python/pydantic-core/pydantic-core-2.16.0.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.16.2.ebuild
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 666f49c41bd4..0f8a0983884c 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,8 +1,5 @@
-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.1.tar.gz 651461 BLAKE2B 4c52abec0f1fc52fdaa0bd820bbb649ffdc348c1b1537ca31b73bf4c4477055841c0cd08df5336e0388974ebe20c384349c4233af20149317d79f51ee98208c6 SHA512 5a3ca05a57297cded56a21f37e13a61e7abce3faa34b1d2f4ad1abab0205aa8b7f753b6e0ac630336ea398b9c5ebd4c7cab55df4fa0f9e965e07b5a7e9d49f3c
 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
-DIST pydantic-2.6.0b1.tar.gz 675468 BLAKE2B 42c1ebcccd437e6c8de832f784732a1066aeb439804999ed58f39679b99672d26d56bdeaa6745aba1a16e4fc6daf66a15700d876dbdcc46828f8bd4610af453d SHA512 8d8252376de7e1662358dfd8b84bb5b9a811e164d41e1ec2af6c678faf584365a0ff2b31ad6d32c46c6f4bb0b926d9935acd116aeb72c0bd91c1d5c7cc6a69b1
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 2f4cd9c23a9e..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=( python3_{8,9,10,11,12} pypy3 )
-
-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 af1f52e4b616..86ab9b345a77 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/pydantic/pydantic-2.5.1.ebuild b/dev-python/pydantic/pydantic-2.5.1.ebuild
deleted file mode 100644
index 41a03efce1ef..000000000000
--- a/dev-python/pydantic/pydantic-2.5.1.ebuild
+++ /dev/null
@@ -1,55 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.14.3[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/Faker-18.13.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydantic/pydantic-2.6.0_beta1.ebuild b/dev-python/pydantic/pydantic-2.6.0_beta1.ebuild
deleted file mode 100644
index f371681d7f79..000000000000
--- a/dev-python/pydantic/pydantic-2.6.0_beta1.ebuild
+++ /dev/null
@@ -1,55 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.16.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/Faker-18.13.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 4a3892249123..2c5bd04bcd17 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,4 +1,2 @@
-DIST pydata-sphinx-theme-0.15.1.gh.tar.gz 2408417 BLAKE2B ce5f21c2f9f2b94a7fc7d907c44527459e46c735e3c7bf39966b2402acf94948d9f91941962598d61b992f33b8fde2381e8c5649e9593386572ee79712160f4f SHA512 34eccf49c69e55999e6af2797c0c861f49c43c0d014f05b200ee40cfd703abaecd90be9aaf52409556b9d5acff6238ce09040959a7a07f4dc285a6d40ecfc912
 DIST pydata-sphinx-theme-0.15.2.gh.tar.gz 2409617 BLAKE2B ee9405e36241bfac93927e4de2d12f65b95717e459b1f584179f0d7ad2c5161b85b39ef60527de8b2e0eac8a38621452e3a5dcf15733980359b4f03526a906bb SHA512 11653f36def68ddc63994d00e1de63575ce6a24f7b2887c53ea8c3063bdc30fe57baf25e239a70f63a1598625a3707ac405171230c977d7e0ed3f88404c8cd21
-DIST pydata_sphinx_theme-0.15.1-py3-none-any.whl 4521543 BLAKE2B c5e20e42ce2fd32a46b39037fe680c2ec6a420cc76a02dc1c391f633e3a164de28d107834add9b427e5f27afde0a86e8d32287084c10959cf444f5580a3fb231 SHA512 13ebf72548c963fa850aa2da9d73863cc4c771c7db5a5d90a18af3408f2cf3d75d908aa40c16dfe098941ec5128a0117e5c29aab3e3119715207af28e3a6f8d5
 DIST pydata_sphinx_theme-0.15.2-py3-none-any.whl 4523706 BLAKE2B fdb3ca53d26b7da882b9530929bb41729d77af6aef8c5748c41ab9ea4b43cdc858dd3f270432c18accc59e5408a267125f840b4ed2815d0cda7e748afffa90d0 SHA512 60c00161768cb0259462e7af16b8d2324ddc367391d83efcb34dd7999364b2745795cb6807a903f80cfaf21bd8b2b466cbee3fa9cb800be4221955ab888481d0
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.1.ebuild
deleted file mode 100644
index 6877b09fe803..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)/pydata_sphinx_theme" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2.ebuild
index 14f577fd28cf..6877b09fe803 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/accessible-pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 1b698b4ba2e3..747ccdfb9741 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,2 @@
-DIST pyfakefs-5.3.2.gh.tar.gz 225929 BLAKE2B 1a84f52e8d85b55d2ebc0dcf9c4b44bd053c0a3a12d6c47c1f8d5aec304e39a83ffb01d4c707929955ca5cd86ae9427332d5bf043cb7f910fe1d17fbcc19e35c SHA512 4cc2c861fa358c06832df6e8a7cfc91e2b9be42f1164378ea6bd0a3a6cc48f36c545b7d61e03591d025ef7bd98fdc812f903973f28a278056961aec22ca88641
 DIST pyfakefs-5.3.4.gh.tar.gz 226538 BLAKE2B b0cac2799c7d9517a1fc89d15cf92222dc5d5438ba4c43bc8796afbf77c2c7a2729bf42e1b57b1fb3777a91aa0fa12e0d6a0a6e0068855fba86bf6e372bac28e SHA512 10c56af0b871b8b8ce483d01234ebba953b038fd030edf4f0fedcb5b23ee897c912d9e9404521ec11f9e8d0d041d4bde4f101a4d99b3b527721c4c291c2a6745
 DIST pyfakefs-5.3.5.gh.tar.gz 227359 BLAKE2B 635e41cb9892e1707555559769c01d5b575e44c5f1dd412acc05c3bed3b2dad2724ba32341b59cdecdfb658c94008e09396970349d8c1ffdcb90bf89ea82aca0 SHA512 342dc9cc0378af8cd8a9b0783fb6a1415207505ec8d4992f8fdd7e8d2bc4aada26d0803ed3b74d30b42a50dffb793c70acdeb3f28f199c0918783e1ea0a5e0d8
diff --git a/dev-python/pyfakefs/pyfakefs-5.3.2.ebuild b/dev-python/pyfakefs/pyfakefs-5.3.2.ebuild
deleted file mode 100644
index 1cdb10007586..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.3.2.ebuild
+++ /dev/null
@@ -1,36 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.3.4.ebuild b/dev-python/pyfakefs/pyfakefs-5.3.4.ebuild
index 6cfb5f72f231..e4dc76ee08d2 100644
--- a/dev-python/pyfakefs/pyfakefs-5.3.4.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pygobject/pygobject-3.46.0.ebuild b/dev-python/pygobject/pygobject-3.46.0.ebuild
index 369fba8a7f83..86c01c0fde2f 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/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/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/pypy/Manifest b/dev-python/pypy/Manifest
index 8cef9defe619..f69ffdbf3c8c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.12.tar.xz 5340 BLAKE2B 1a7375412087e8df02e69c80cee6d8246cc444a352323e6a49c1e1a0e6f5d662584c4cce194f03fc139f29de4ecf5d9f68cea5a8c19a720f1a51c1563804e19a SHA512 026a435377f0f04a526d4e0bef1ac832543f24ff2b39579e2cc7ca2cb3eae0415fcdb3c701fc4b85b0659a2ab17180a45469d79920262ed6dfd68d401df85fa1
 DIST pypy2.7-gentoo-patches-7.3.13.tar.xz 5340 BLAKE2B 843a7a5e4c2fd56fc4db51ba388736c0aa6593d45b145503f6428783a9fd815a77e2a06809077effced6fccf75c0dd38527a0695211852fd2a4c61b34e40c15c SHA512 cc8f6fc69f00030609a8d79f05a60b2e185141e9fc70a53b476b60a183dd0500627023658c6a57c2412f32af1db6fae91a361a4992d84e7dfbadb7eb4a98b8a1
-DIST pypy2.7-v7.3.12-src.tar.bz2 19904555 BLAKE2B be8677c0632ef331db285938ad6ffbcb1aa70f44422a1ce5ed09b5a557e68d9185a11d1c20a4a3c6cf32ab41e623a2bc7b3ab7485bf270a9a604fb8a5769bf3f SHA512 35ec35376f1e7c1a5dea9dc5bce6819a94c2df2645806c83185487587470b47ab529c25ecb8ca200505319f40789859a2919c61902b693421e2001313b46e5f4
+DIST pypy2.7-gentoo-patches-7.3.15.tar.xz 5324 BLAKE2B 395b1292b59cc9b2147fd488726d7cb2c18e7240d604d0bb19f172654c87b453a27f33f29bd2c1cb230d35b660457a317247c3b2eb73e8f3247c7d01fd35aa6a SHA512 698a58b30f5a4785e2d94c38cb0e7ce2666b6b621ee0ae4e9fd51862efce13449342afe6408edc9f4ba68497f2138d653617fa4a31cd925a51a048dd79467913
 DIST pypy2.7-v7.3.13-src.tar.bz2 19907651 BLAKE2B ce80db193afadbc721e781cbfe3d72bfe420eef3ede408f23213ab5d87a9a42c025d3c31c742dcb55a039b618930ebc4899d704f060d294f2e492d4d754effba SHA512 deeca234abbe526102cec637dc88399f462f64ae66c38782e6f3372b484d25fa4e88b906f783ba515bed17d2e82626d1c94fd6ee9b8b64e393f9bc0f5ee2b07b
+DIST pypy2.7-v7.3.15-src.tar.bz2 19834343 BLAKE2B 4e1145cac007223de0616029dfe763a8d2b3e25a6d867c98da0e8e0431d775c6aa7e50834c761e19f96b96309dbb415a39d7811c68b1b3a26c16cd222911205d SHA512 40448c7c94878bcb88402de8719a4a6a4ffe3f68d7e70500f04fe77a460b1605c83dace360988d2dae70fa2c9bb31a20c22003f70a3a2fde988f6d60507edefe
diff --git a/dev-python/pypy/pypy-7.3.12.ebuild b/dev-python/pypy/pypy-7.3.15.ebuild
index ee22302c0b50..562ab13ce73c 100644
--- a/dev-python/pypy/pypy-7.3.12.ebuild
+++ b/dev-python/pypy/pypy-7.3.15.ebuild
@@ -1,15 +1,18 @@
-# Copyright 2021-2023 Liguros Authors
+# Copyright 2021-2024 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
-inherit pax-utils python-utils-r1
+inherit pax-utils
 
 PYPY_PV=${PV%_p*}
 MY_P=pypy2.7-v${PYPY_PV/_}
 PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://github.com/pypy/pypy/
+"
 SRC_URI="
 	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
@@ -19,9 +22,9 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 full-stdlib gdbm +jit libressl ncurses sqlite tk"
-RESTRICT="!full-stdlib? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	|| (
@@ -36,7 +39,6 @@ RDEPEND="
 		dev-lang/tk:0=
 		dev-tcltk/tix:0=
 	)
-	!<dev-python/pypy-bin-7.3.0:0
 "
 DEPEND="
 	${RDEPEND}
@@ -109,7 +111,7 @@ src_compile() {
 		done
 
 		# Verify that CFFI module list is up-to-date
-		local expected_cksum=2d3acf18
+		local expected_cksum=-7df4eab0
 		local local_cksum=$(
 			../pypy-c - <<-EOF
 				import binascii
@@ -302,13 +304,14 @@ src_install() {
 	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
-	local -x EPYTHON=pypy
 	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
 	# temporarily copy to build tree to facilitate module builds
 	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
 
 	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
+	"${PYTHON}" -m compileall \
+		-x 'bad_coding|badsyntax|make_ssl_data|lib2to3/tests/data' \
+		-q -f -d "${dest}" "${ED}/${dest}" || die
 
 	# remove to avoid collisions
 	rm "${PYTHON}" || die
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 ddacf464280b..feae9e08eb9a 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
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 94d4aea4032a..adc020909dc2 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,4 +1,2 @@
-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
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 423158bfdea5..adc020909dc2 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,4 +1,2 @@
-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
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 c6f26aa2a384..4f56a7eaa2ca 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
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 01463537cdc5..3e201830e36d 100644
--- a/dev-python/pypy3_9-exe/Manifest
+++ b/dev-python/pypy3_9-exe/Manifest
@@ -1,6 +1,2 @@
-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
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 755616050e96..3e201830e36d 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,4 +1,2 @@
-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
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-check/Manifest b/dev-python/pytest-check/Manifest
index 918916cfdfc4..70bfe4e5dd87 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,2 +1 @@
-DIST pytest_check-2.2.4.tar.gz 27197 BLAKE2B 48bc72055d439d91e6609253b778932222fdedd20a834a45636ed1d1ff98648853122780cdbe11c3c784aa98a0a67d443aa17e1d2ef1d5fe3d82dc617f20e093 SHA512 d527040900a4c0e779fe1a970d15b70c80978a5c4848e9bbf4dd5de9e3c338c5facaf70a7ed5362da5bdfaab75fc1129665e351c373fa013060f794d23a0e36f
 DIST pytest_check-2.3.1.tar.gz 28674 BLAKE2B 732538aec690d121132a0594a49b77658eb8be79d6e59bacae1d13ea38e59dd3e4b55c62fc07741e08621dda271d7d2284f825770a2acef7d5b0c80c80e79beb SHA512 b4a2805b7dc3dfe9f56db6f27a9e4927de070d57bf3906f303c611021081d7b638d9ee58de744491005e10541f527f1bfddaf51be64f2def8a1190cfd1abd43a
diff --git a/dev-python/pytest-check/pytest-check-2.2.4.ebuild b/dev-python/pytest-check/pytest-check-2.2.4.ebuild
deleted file mode 100644
index 3098c7688cb1..000000000000
--- a/dev-python/pytest-check/pytest-check-2.2.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-2.3.1.ebuild b/dev-python/pytest-check/pytest-check-2.3.1.ebuild
index 6e50cc45546c..3098c7688cb1 100644
--- a/dev-python/pytest-check/pytest-check-2.3.1.ebuild
+++ b/dev-python/pytest-check/pytest-check-2.3.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
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 be1825a0aa81..2843f6edf07c 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/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 072e6b3b08d0..b0de4fc340b0 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/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 f4c4fc90a218..e4777ed2671e 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>
  
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
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 06857e680b55..0b42920112f0 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 764eb87253b0..ed08a1d002e1 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,2 +1 @@
-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
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 d165b568ec6e..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=( python3_{8,9,10,11,12} pypy3 )
-
-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/python-memcached/python-memcached-1.62.ebuild b/dev-python/python-memcached/python-memcached-1.62.ebuild
index 07ed2589418f..d165b568ec6e 100644
--- a/dev-python/python-memcached/python-memcached-1.62.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.62.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/service-identity/Manifest b/dev-python/service-identity/Manifest
index 616acdde5baf..be167bf89186 100644
--- a/dev-python/service-identity/Manifest
+++ b/dev-python/service-identity/Manifest
@@ -1,2 +1 @@
-DIST service_identity-23.1.0.tar.gz 39840 BLAKE2B d4445cce42e9dba3ae192b05b3f66daab72cefe521c299837a73af84ff2705060580e3a052af01ba9abad820d3d252804050d8e3b2220dad48252832db8a90fa SHA512 bc53f563050811a2b40dbfcf1e0a1b1b5677e2b48ed4e94e37d29735baea49ed7a7099d656444c0054fa2c23ae96026e67919cf24b01a3ae6b3549fd25dfe4d1
 DIST service_identity-24.1.0.tar.gz 40183 BLAKE2B d597f4bfced6e766e1b256f43d134537a44e048bf4c704dbec1c16e6a29a42d60c2392c679e810b2ecc2f8ea3f681ddbe59bc0bfbd2d2c145bcc648f803b0964 SHA512 86cf2754bf8564d828d8cae4dec25dae04537ae59f5e2ee8450594f473cbd27f4c96313f743bad6842f9344a53a76a9d22064d8143e9d2d41a83376627d309fd
diff --git a/dev-python/service-identity/service-identity-23.1.0.ebuild b/dev-python/service-identity/service-identity-23.1.0.ebuild
deleted file mode 100644
index bbe9ee3801ea..000000000000
--- a/dev-python/service-identity/service-identity-23.1.0.ebuild
+++ /dev/null
@@ -1,35 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="
-	https://github.com/pyca/service-identity/
-	https://pypi.org/project/service-identity/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/service-identity/service-identity-24.1.0.ebuild b/dev-python/service-identity/service-identity-24.1.0.ebuild
index cea43f4428cd..1451e9b65e95 100644
--- a/dev-python/service-identity/service-identity-24.1.0.ebuild
+++ b/dev-python/service-identity/service-identity-24.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-celery/Manifest b/dev-python/sphinx-celery/Manifest
index 3ebbe2aad2fc..a8441f0403bd 100644
--- a/dev-python/sphinx-celery/Manifest
+++ b/dev-python/sphinx-celery/Manifest
@@ -1,4 +1 @@
-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
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 a471ed95f558..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_{8,9,10,11,12} )
-
-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 392b1263ad6a..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_{8,9,10,11,12} )
-
-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 392b1263ad6a..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_{8,9,10,11,12} )
-
-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.3.ebuild b/dev-python/sphinx-celery/sphinx-celery-2.1.3.ebuild
index 38f790ec3eaf..525fcb1cb4ae 100644
--- a/dev-python/sphinx-celery/sphinx-celery-2.1.3.ebuild
+++ b/dev-python/sphinx-celery/sphinx-celery-2.1.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 363165e3713b..9c1277b422b4 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,2 +1 @@
-DIST sphinx-issues-3.0.1.gh.tar.gz 12320 BLAKE2B 770aa19a443bacd489157244f087fdb99740d5eae2f45246ab0fd0596260f249dcf7fb0642acf0a925d1a1def08f6d944a2ec67017334843b636623b05df8327 SHA512 dd64e1611eb58fc455bedb1658473fd71e4deab1371d8a42e6fa7fe3b128a991251add12e463b9a5826fd4eb5aa12e9a117dcf953feeb8df980a7951e43d8baa
 DIST sphinx_issues-4.0.0.tar.gz 13945 BLAKE2B 43994155a5040b63f34f48b2ddf8f39cf36bd97fc464619f1adb55a2c9b433fb5c1c65f8cd5b2f7928afbd5ebbbbad67c69490ae67aaf220c0a5cf8c44876b69 SHA512 77e249c9ccd9dec96e64ba898e8cf2d1922c6190ad67e9d4d823a4d08d3c07bae217a8bf51c193fc5331c289e53ce6f93ae3d685ac9a618d41f565930557dabb
diff --git a/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild b/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
deleted file mode 100644
index 5e7db497a898..000000000000
--- a/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension for linking to your project's issue tracker"
-HOMEPAGE="
-	https://github.com/sloria/sphinx-issues/
-	https://pypi.org/project/sphinx-issues/
-"
-SRC_URI="
-	https://github.com/sloria/sphinx-issues/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# doesn't work in our pep517 install
-	tests/test_sphinx_issues.py::test_sphinx_build_integration
-)
diff --git a/dev-python/sphinx-issues/sphinx-issues-4.0.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-4.0.0.ebuild
index bf3f0f9b3765..d479248ed12a 100644
--- a/dev-python/sphinx-issues/sphinx-issues-4.0.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-4.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild
index 95defc4b899f..307332b3ca68 100644
--- a/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.3.1.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
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/stripe/stripe-7.13.0.ebuild b/dev-python/stripe/stripe-7.13.0.ebuild
index f95e50daee78..2784056dc898 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/tox/Manifest b/dev-python/tox/Manifest
index 4ee05e31d91e..da022d39f3e3 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,4 +1,2 @@
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
-DIST tox-4.11.4.tar.gz 176168 BLAKE2B 03cf6337450494772a85787f2a34eaebfd1db159689fa4c26128efacb968b6aaac995c13a70ffaf1a7dde89107c9bb1975366ff1cc47a46979c7a1cfbd6c3402 SHA512 4b6149ec5945d67d3f5afd309a71a7845fe3ca2ca1291cb08327bda2177d2623ca49d52548fabf7856416dd90973c82566559a738946038963e7aada544ddc30
-DIST tox-4.12.0.tar.gz 176784 BLAKE2B 726bf83a041fde29e28a30309cb5a6d07ae4569f665cf36eb2f8b8463159fb4464d7795c7fa8e132d186ae5eb8df398706a0a99f72f4d6eb4ac431713e866f3c SHA512 51ca9c6819e3b8ee1b7146ec451676492e34b2f2f415db5781c7ab3d0d343dbaa15d6cc4060ea62179d121fe01af162ae973ab6d0a0841824f9d98ddcb5147a4
 DIST tox-4.12.1.tar.gz 176858 BLAKE2B 805764e507ba2894e46dad6b82eb928b4f184d20b2ceb0e7c2ff15f553121158f7f84515a5922d095893a1d6a73030777300163dfdd60964ffe6c41cf2047c14 SHA512 217fbc2933999fcc5d080d97521cd01b7d9a35d4f1542cc58bcc2ff86d07884caa43fd42b09e5064cbad1334e4df9cd717c48c70041c9cf856b0beb22e1ea8a7
diff --git a/dev-python/tox/tox-4.11.4.ebuild b/dev-python/tox/tox-4.11.4.ebuild
deleted file mode 100644
index 1c22475c91eb..000000000000
--- a/dev-python/tox/tox-4.11.4.ebuild
+++ /dev/null
@@ -1,86 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.12.0.ebuild b/dev-python/tox/tox-4.12.0.ebuild
deleted file mode 100644
index 383832e92fad..000000000000
--- a/dev-python/tox/tox-4.12.0.ebuild
+++ /dev/null
@@ -1,86 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.12.1.ebuild b/dev-python/tox/tox-4.12.1.ebuild
index 60ee4e5af69b..8af62dc4823b 100644
--- a/dev-python/tox/tox-4.12.1.ebuild
+++ b/dev-python/tox/tox-4.12.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index d478e7d2dba1..95cc3e2a0514 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,3 +2,4 @@ DIST trimesh-4.0.10.gh.tar.gz 13435507 BLAKE2B 9e60ac72af4020997b606738dba044b23
 DIST trimesh-4.0.8.gh.tar.gz 13434746 BLAKE2B 858ad7daf9cff3bbedef3ea124d6af1be96233b09a2bd9abd0d2cc43b6f981f844300a36dfef751caf1abf721dd0481a189e0d80ddba8a3fcacbe87183c3d26e SHA512 77472e954b9defdf39fac7813aad892f56f02da475801effdac7de28b6e28f6ca5a7c99fa51013e44435a2143f01a5a2be1e8419c1c81c0c02dca237b8e21dd3
 DIST trimesh-4.0.9.gh.tar.gz 13435804 BLAKE2B 7e07ad04f7c08b01763ce0d4f50ad7a00fa4888f43abab92bbce495cb0c1dc8815e0c346e326f19c811fbe8d9d2657b45390016f1508e1d994ee529af182b2c1 SHA512 8d6d48a7889693536a54355efac5dc35eb2a8babeb5c93d71127e65935e7750d7330bd9b96b31b37dded7a5fd50151d39b6c38a29e0075374ee29ca975e5ed9d
 DIST trimesh-4.1.0.gh.tar.gz 13437739 BLAKE2B 4a5c54bd17506fa391404f825c2be47e34c3757b6380bb8af43b27b3b1f30f6518dc997f0ce6a20d87c7c8ced4c5f54092a58d6d03f5d73e4fe6cc8bbc62342e SHA512 77729d3b14f90d106fd79d1bddd0261cc1e6aeb3f3af7fcad9c9dacbd8fecea4f996944d5af232f2af46e274b14b657e0ad90700cd194afa9fb2a40dc3763c44
+DIST trimesh-4.1.3.gh.tar.gz 13438037 BLAKE2B 1aaa2ad9fc974bc335710e12381f63fc7d6c6db47b6d88e9590dba92c126dee374ebe8282df02bdd4405558b391ce836c861b0672be847c627238c9c4c6c2285 SHA512 5f9b81c9e59760ec023e0a2ceeb62fdd4308f69ebc0cb495bcb0d7b58244a6754d4016c87110509f01696b291c03838b7896f9f470fe95f99d8755781b82051a
diff --git a/dev-python/trimesh/trimesh-4.1.3.ebuild b/dev-python/trimesh/trimesh-4.1.3.ebuild
new file mode 100644
index 000000000000..b621d3cf0967
--- /dev/null
+++ b/dev-python/trimesh/trimesh-4.1.3.ebuild
@@ -0,0 +1,68 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimesh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=900
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
+}
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index 4e872b140b56..cddd2df95e8c 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,3 +1 @@
-DIST types-setuptools-69.0.0.20240106.tar.gz 33210 BLAKE2B 9bc899b61de4bca93459c88c8f615b4669f9082b1294b1336b5ce83607c4ff074799d809f867b8c9316b78afe535cc1cd9b54903b78e4c5c58353de670d9cf9e SHA512 5c66be446b8e02952139ce7f68e84ae066444a1a576645f1cc623a4c2ea4945b6471ff432bf8193e5a1439b6ed5b88ad446a0cd50df27d2ecac1d799e51c9a9a
-DIST types-setuptools-69.0.0.20240115.tar.gz 33254 BLAKE2B 384e9a604f9ebd5ed6fd5c30c70cddbdfe12b616641b943e33f594cd15d43f4555a27cdc11b4ef09840880f830fbc1d5123ace77abc6d420f94e4b2ca6084c8b SHA512 fe60efa5ae55ad8427c8c641784193bee3c9bddea0c19e45660c3b16d0f7b492eb58a4e594ce23b0c64db8939e1e7e3a764efb84b30436b252f911e0cb50baa5
 DIST types-setuptools-69.0.0.20240125.tar.gz 33291 BLAKE2B c5b987f4ef5a67d8f09c2b3a96df17ef38e58e0d3d353dad34d34eb5d509f241edc2ed0a9bcf517331168d747d56c62c1a5cdf0cc315ec43cbac8815283e3e05 SHA512 9bf3865a7d49814939f8ba3cb553cd5c3d2623c8b029ac5da7a5c264049e09d6ab2d61e184ce1a4c3ed321bfb8fee0428742770b2e5398594172aff53503af91
diff --git a/dev-python/types-setuptools/types-setuptools-69.0.0.20240106.ebuild b/dev-python/types-setuptools/types-setuptools-69.0.0.20240106.ebuild
deleted file mode 100644
index 83c285890380..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.0.0.20240106.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.0.0.20240115.ebuild b/dev-python/types-setuptools/types-setuptools-69.0.0.20240115.ebuild
deleted file mode 100644
index c755b6e96b17..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.0.0.20240115.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.0.0.20240125.ebuild b/dev-python/types-setuptools/types-setuptools-69.0.0.20240125.ebuild
index c755b6e96b17..83c285890380 100644
--- a/dev-python/types-setuptools/types-setuptools-69.0.0.20240125.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-69.0.0.20240125.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index db3685c79b14..6545dabda214 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1,2 @@
-DIST uvicorn-0.25.0.gh.tar.gz 717386 BLAKE2B f0a472676a732d7807137f157c95574584d882bf9ae8531c4e2c1164ebe9eec2172da62f72f07032ada422b7932f221457686aa22ab6fbceac57685ad91920b8 SHA512 19c1e6438c40ab1b1d30c9c9c84d65f2dc661197adcc6be3d7825223d933d4554ec388323e16452ef0409476766af1ae18bb3252a391099bd2e2bfe2b6c4abb2
 DIST uvicorn-0.26.0.gh.tar.gz 717758 BLAKE2B 1ac4d28a6351a8e9fc9d4e0481237dd8b3265afcfd2c554093299bb6d03570809edf44a1c6278441c1a8611d380aacbfa99986ebac99b19e65d055c78c28e494 SHA512 3b561f3b5335bd52093d5aab2ab9db101a2a36f06179fe02a177a5de4dc336f2aaf700b45ceb7c0952d0b3e5e2a3bdf0387b978ac46af96def409e189bacfa23
 DIST uvicorn-0.27.0.gh.tar.gz 718371 BLAKE2B a8e5504f673add3e0babb2fefa9d045adc34062b7746c1149c1a7a467073495f07d26b23f0d81678698f41d7887eb28aeaffe29f29706c84be39d5b8f3d85b1b SHA512 2337223e30dcc89a32babfce6b381f53225df3ea319e13ae8b758b4a1801ec49a1e8c2caa148757fe715504b75934a6a75156c6e7146fb21335905f1425f89fa
diff --git a/dev-python/uvicorn/files/uvicorn-0.25.0-test.patch b/dev-python/uvicorn/files/uvicorn-0.25.0-test.patch
deleted file mode 100644
index 8cd1cc7bb8c4..000000000000
--- a/dev-python/uvicorn/files/uvicorn-0.25.0-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 64013e8729afc93880a749974491ab5a90b29deb Mon Sep 17 00:00:00 2001
-From: Marcelo Trylesinski <marcelotryle@gmail.com>
-Date: Tue, 26 Dec 2023 10:28:55 +0100
-Subject: [PATCH] Allow test suite to run without httptools installed
-
----
- tests/protocols/test_http.py | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/tests/protocols/test_http.py b/tests/protocols/test_http.py
-index fde4cc70b..ca06b33a6 100644
---- a/tests/protocols/test_http.py
-+++ b/tests/protocols/test_http.py
-@@ -994,25 +994,20 @@ async def test_huge_headers_h11_max_incomplete():
- 
- 
- @pytest.mark.anyio
--@pytest.mark.parametrize(
--    "protocol_cls,close_header",
--    (
--        pytest.param(
--            HttpToolsProtocol, b"connection: close", marks=skip_if_no_httptools
--        ),
--        (H11Protocol, b"Connection: close"),
--    ),
--)
--async def test_return_close_header(protocol_cls, close_header: bytes):
-+async def test_return_close_header(
-+    http_protocol_cls: "Type[HttpToolsProtocol | H11Protocol]"
-+):
-     app = Response("Hello, world", media_type="text/plain")
- 
--    protocol = get_connected_protocol(app, protocol_cls)
-+    protocol = get_connected_protocol(app, http_protocol_cls)
-     protocol.data_received(CONNECTION_CLOSE_REQUEST)
-     await protocol.loop.run_one()
-     assert b"HTTP/1.1 200 OK" in protocol.transport.buffer
-     assert b"content-type: text/plain" in protocol.transport.buffer
-     assert b"content-length: 12" in protocol.transport.buffer
--    assert close_header in protocol.transport.buffer
-+    # NOTE: We need to use `.lower()` because H11 implementation doesn't allow Uvicorn
-+    # to lowercase them. See: https://github.com/python-hyper/h11/issues/156
-+    assert b"connection: close" in protocol.transport.buffer.lower()
- 
- 
- @pytest.mark.anyio
diff --git a/dev-python/uvicorn/uvicorn-0.25.0.ebuild b/dev-python/uvicorn/uvicorn-0.25.0.ebuild
deleted file mode 100644
index 8993d2bd2b95..000000000000
--- a/dev-python/uvicorn/uvicorn-0.25.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.21.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/encode/uvicorn/pull/2198
-	"${FILESDIR}/${P}-test.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-	)
-	case ${EPYTHON} in
-		pypy3)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.26.0.ebuild b/dev-python/uvicorn/uvicorn-0.26.0.ebuild
index 5235af9d6598..1fdd4fd7aecf 100644
--- a/dev-python/uvicorn/uvicorn-0.26.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.26.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 7517baacd68c..acbf2b3b71b3 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,2 +1 @@
-DIST werkzeug-2.3.8.gh.tar.gz 834470 BLAKE2B fb1badc73699cd0a4027b706db7c29d44bd9cfdd306bec4c97dc1348b398f3268acb9be59530b5fb9e45d31a759e6dd1ae0348f62d4df9e6e74d8e72af9feb86 SHA512 56cf12071ca7aa99897ea3c23af699a32db6da00ce0963228c965e3f84060ea83c7365054e2ad53d7930d7472eaca6821e610815871a24a4257eaa18f19a5423
 DIST werkzeug-3.0.1.gh.tar.gz 817317 BLAKE2B 670460cf48c8d06196cd34f117758508512d310b740bd188d8ba87779abd62f514c9909e5700b34c37e382925eabe3ffd722b753b76b498aff0dc8ebe1025c8b SHA512 125a5c7680cba726149198802efa90d06c6586daeafcd0960feda637b765356f602df83af7b14996994303c52d32bc6fa044b774f42f0b8991008d1396675033
diff --git a/dev-python/werkzeug/werkzeug-2.3.8.ebuild b/dev-python/werkzeug/werkzeug-2.3.8.ebuild
deleted file mode 100644
index 8a4b2a4ddffd..000000000000
--- a/dev-python/werkzeug/werkzeug-2.3.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{10..11})
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/xarray/xarray-2024.1.0.ebuild b/dev-python/xarray/xarray-2024.1.0.ebuild
index b02149f51f48..e3aa596937ee 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="