Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-11-25 18:33:43 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-11-25 18:33:43 +0000
commit: ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5 (patch)
tree: a2a08f53c54c7fad4ae80451e00faac327ab47ac /dev-python
parent: 5e3f5cbdaa0b307a5bbed30104624a723ac81025 (diff)
download: baldeagleos-repo-ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5.tar.gz
baldeagleos-repo-ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5.tar.xz
baldeagleos-repo-ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5.zip
158 files changed, 394 insertions, 4092 deletions
diff --git a/dev-python/black/black-23.11.0.ebuild b/dev-python/black/black-23.11.0.ebuild
index 70fb000091e4..707f6fbcfc3e 100644
--- a/dev-python/black/black-23.11.0.ebuild
+++ b/dev-python/black/black-23.11.0.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e9a8a4d5a4ab..bdeaf0383fdb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,10 +1,3 @@
-DIST boto3-1.28.78.gh.tar.gz 724185 BLAKE2B 5089a7d1eab11c23bd65699c41c3c6687f0666f10ebcc7fc4813f96225ceee5a10a008ae6969cd7927f43f09e0988178ea40386bcd91c473ac5fba1dedeeeef1 SHA512 e74f7348d369580e8d26f7c1f084276ec339d4bdd3ee628bdbe56cc6e4b1c0b22a759bb4ffe1075f0cb0d6f1692864db85a73d3cb884358dc97d6428f3fd9b0a
 DIST boto3-1.28.84.gh.tar.gz 728124 BLAKE2B 2fcc553a4a109b0bc92cdf0b08fe77fcef54792ee606b6b9ed7cde1ae92accabb9f9ce005d9ccd391601efac31eec407345471542c5b7298689ab1037ed8f41f SHA512 1b7f1fe951a9f3655a71bd51e9328f4474f9b320df82914b9ad0d64a32043aacf16fc5df1989304fd4d35430ddf6f58d0676fdb3985944d955c169a0ec58ce7b
-DIST boto3-1.28.85.gh.tar.gz 728751 BLAKE2B bfbc9b26b45e034949f13492987fdd43476d428d84da8b15e1ac67647acb410823bcc5e8710126a062a40779357ea49b5b4e1038831d38239515a793c6601dd4 SHA512 96165e6e5bd5673a364be445ab21916115e4f58c9e499f58bf0098d37fb7ba6ef28d5a6046f452e26618a305eb9713f5b5e5f10fd0c22868c499a9870fea4bef
-DIST boto3-1.29.0.gh.tar.gz 730038 BLAKE2B 3f6f853eaa18d66ffef1e159fb641e6e3d069b1cb8ca9df457a714b1682a210ccf52aca4900172812b195309a4cd1a179c4ff2dff2f0a3c519e73c1eb9380908 SHA512 d826bda41fcab62b9e868ad96e405d538f1af1b7bc31c96349330fce493c8efef282c1da1c47a45a4a0e0e3051c0ddb0847af1efc9e7e9a87419f3995db2a5ca
-DIST boto3-1.29.1.gh.tar.gz 731491 BLAKE2B 15d7aa771369afac957d1c0fac1c0cca9fb4322a7643d9dc2cb688908ab80c9f3815b92e9645266be0547d45959b6f2f20891ced2da0ab33df2de966dcfa510b SHA512 c07fb0bc3daab7aa6c21cec278b246b4df20f9e665b379f8005d2239a1d0bb637304d7308f1479b772ee314b99559bdb7f5c37503d6a9ef6801999270637cf87
-DIST boto3-1.29.2.gh.tar.gz 734398 BLAKE2B bc2816fd37130d4957873964b4020ec90f106fef5d034c4b47e9485610d577cdcac3106b66dcf20175335fcc49773dadcdabab9de65fb85caeddf5bea0845184 SHA512 dc5faf76f2949506db24888780cc07c792903707e54853258182a016b4b1b4f91ae79467e5f140ba0ce822d99e4fc570a16168211b10296bd9820eb245d9cbc5
 DIST boto3-1.29.3.gh.tar.gz 737012 BLAKE2B 4282de0bbe03b61cf6884b08cf0a16e93c1e27a0323d2eee93277f8ac62f5ef440612292ebc245f13de0bbac9c156cae0cd5c76e8ae5b7d018a125cd49a682df SHA512 e42064e2c825376dfe2a5aa0c92715d06d6d29c3cf8b194d8742c688a4743e216ba32111bba080d88505907e48ff26086106eaef62fa5048f34fcbf08355ab60
-DIST boto3-1.29.4.gh.tar.gz 737422 BLAKE2B afc98796b95bc82ca80e6fc20be8d3dd1ee786a23647628ff20822cb676bb520facd370828df1340d7515771fe879acbfde2d381109d0bb76c8fd430b1af9085 SHA512 a6b3d1aebc2594e0389acf090602276bea8ef1590f2beea285bb4dd9a8f5a81cf141a6f566c64fce5ab474830b84721f7d2833b80f06f0a531d6f64ac8c905c4
-DIST boto3-1.29.5.gh.tar.gz 738396 BLAKE2B d64d3529ec215e1ae01b13a3620125fe16f87c6e0b52a8b7b8974c06b0ee1fd540f36c6e718028055f1c6f3b6f5a9c7b863ebd267102d4616c1e677840476e70 SHA512 a199d28e817bcfec435f206d96a85e94b7b171ddc508cac29915efc532a1c73d4f1ba2288efe2677752e7a3ad29e73e25f9c369eb35c4c57de4281df8dce1030
 DIST boto3-1.29.6.gh.tar.gz 738684 BLAKE2B a42245ddc7a0f31329057016f47739fc4071a030dca1ced347b447860e9397e3c8bae8c70ca86629a4b6b3f403ed845887340e6aeb08fe33c006dea9cd3f6317 SHA512 551a3568f3ceb1f37c7d209e7aa011dbd87d01e02f7559f15563bbd06da6d7a1ff79a1a5ed8150cfbc183cd1c56041a1e36753939142962f056348362665c118
diff --git a/dev-python/boto3/boto3-1.28.78.ebuild b/dev-python/boto3/boto3-1.28.78.ebuild
deleted file mode 100644
index f63c002a6083..000000000000
--- a/dev-python/boto3/boto3-1.28.78.ebuild
+++ /dev/null
@@ -1,68 +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 multiprocessing
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/boto3/boto3-1.28.84.ebuild b/dev-python/boto3/boto3-1.28.84.ebuild
index 09d8c6679458..8aa2cc24ed94 100644
--- a/dev-python/boto3/boto3-1.28.84.ebuild
+++ b/dev-python/boto3/boto3-1.28.84.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"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.28.85.ebuild b/dev-python/boto3/boto3-1.28.85.ebuild
deleted file mode 100644
index 09d8c6679458..000000000000
--- a/dev-python/boto3/boto3-1.28.85.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.0.ebuild b/dev-python/boto3/boto3-1.29.0.ebuild
deleted file mode 100644
index 09d8c6679458..000000000000
--- a/dev-python/boto3/boto3-1.29.0.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.1.ebuild b/dev-python/boto3/boto3-1.29.1.ebuild
deleted file mode 100644
index 09d8c6679458..000000000000
--- a/dev-python/boto3/boto3-1.29.1.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.2.ebuild b/dev-python/boto3/boto3-1.29.2.ebuild
deleted file mode 100644
index 09d8c6679458..000000000000
--- a/dev-python/boto3/boto3-1.29.2.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.4.ebuild b/dev-python/boto3/boto3-1.29.4.ebuild
deleted file mode 100644
index 09d8c6679458..000000000000
--- a/dev-python/boto3/boto3-1.29.4.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.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.29.5.ebuild b/dev-python/boto3/boto3-1.29.5.ebuild
deleted file mode 100644
index 09d8c6679458..000000000000
--- a/dev-python/boto3/boto3-1.29.5.ebuild
+++ /dev/null
@@ -1,67 +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
-
-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"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index e015b1f56a70..89262b7a9e7c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,10 +1,3 @@
-DIST botocore-1.31.78.gh.tar.gz 12035206 BLAKE2B 0dd1109d34a8cf99af76f1f615095776e75c0042717a573da3714d1e20efce5cf67bf38d5421c3c5558112821adb4307f7ca0791efc8e62c9ea2e9ba8c2ddc7a SHA512 68c0f68b699ff0c0276cc70f4d4843259a953511c9c2813a3101d7dc43c36a0a3bda68df66a7ab2c206977a96ce0d933830b4004898f03febf478c710beb5261
 DIST botocore-1.31.84.gh.tar.gz 12065719 BLAKE2B 2098241de47aa1f59c45287c2be66fa3562c2e549da081b1cd86626f1df5f3f175eebea1197396f39045aaebda241d37b1d47ebb378a0fb17e43c16215f89680 SHA512 097a25b4450513cf9c2722d7582cdfb969da8c083c05603f6a28eb65d1d69920106c745cb4f5e5b3bee1989eee64c89fe69c379f01df938edf2a92946c614cdf
-DIST botocore-1.31.85.gh.tar.gz 12070341 BLAKE2B b4867e351d209511db263654873f5a804f941c44d10af563eec656b041830c8543f2ec1f8d831a0aec2cce4d9b7dfc80bd3e73fd5fc456cf5e3ca00ab193b11d SHA512 0e26b6ad06e1075ec90f04d653873592fcc2ae4bdbec5bbbe4b38e368824bf000724551ac2598938b827ce81e3b327ffa9d5d23da0ccb915686a70e0f37ba161
-DIST botocore-1.32.0.gh.tar.gz 12086167 BLAKE2B 54e580c4d034b437d1e2e7748f1dd4785354db87459116565bc15d60bd73fe5d46cade212fd44fabd243614f3be55d9eeaef575ea6d6312ad83c0b6c1e741515 SHA512 9aba3cc3f823ba47ee7964517189d1227e5934c63ecdf1631ade59524594fb7cc20b9cfc7060dd8a69648d48e2d1ede0a377f204124d06ef843dd98a4cd1b11f
-DIST botocore-1.32.1.gh.tar.gz 12098630 BLAKE2B 3a2501da4bd2ec8d29f032a2df4d7946840682df426b4496f60bab487b0eb47580314b4c3029dded6a589463a8636c362c560fd4c2da02c113647ee10ebf079d SHA512 4ec58dcf896ef46f27f3c4af7c6e58efad62e5c2e3fb9aa8de9a90ee390d65b036116d9d8ba7c766b95b03e6e85e909cc620b838511152004dbcfb67968525b4
-DIST botocore-1.32.2.gh.tar.gz 12148168 BLAKE2B 29a70ed37526b8b5e3439a183b194d350505dd4ad0ac1e5d2ff729be29813b4b99b2b0806ca2f20a776efdcefc2b46295432af281e026ecf014fe45d5317c528 SHA512 775c5076e691605d6efe392e5565b84314ed7c93300ea394e5598ee34f4bb9e708a2c8479fbd646fdb619d36e0122fd4f6854e9ed40430c069677345bd76e335
 DIST botocore-1.32.3.gh.tar.gz 12176739 BLAKE2B b119a54fb4770757c8f2c75b7404e009be1c7b35598d8a97e892aa644bbcc301b5f6bb44fa0f37bc8f4523af5ca9771daeda877937e640dd557038c8283967e1 SHA512 398127e140edc33750553f33a14cdc140048f5ee03c162705c6681b9bf08d871c9ba29f824ba2b6f1b11592260c6f0614ab4c06464cdda98172e8ca81bce73e9
-DIST botocore-1.32.4.gh.tar.gz 12176332 BLAKE2B 0b0c2b1b481f88b23dad830f22dee4a79e947705a7b975cfda8f33e0154554eda930bf6e9f2d8e96b639706ae62c7b3b880e210d61e480afcd66f24375a4e754 SHA512 b3f8202a9144be2b7fa3d4030816d87a88959cb0d8340d100038e2d5c115071d272337d1570f1ff19d372bdd70a8d2643fb2e86f286e9a1d466cf0c8d84f9a1f
-DIST botocore-1.32.5.gh.tar.gz 12199009 BLAKE2B 6d48adf8f75089e366a775dd678c07c87d92eefe0194ce5b04e02333563325adf08b0dfb0c7e66a063dd43ad5d70f4aac7f2d91a3e5fee8a8a94e75b058ce560 SHA512 f55548b3473f8f9894b1d6404c66eafe8fd53952ab21ef56b8f243cbd16cabfa52460d63bec2981036c6f8e1d1c7ae5ab85e0ac629b29b6198925aed330fb6e1
 DIST botocore-1.32.6.gh.tar.gz 12201067 BLAKE2B 434581b5047aca3909b586c49b01085ed1cbad972b63156521f675c09f3934e04f6583bf543bfd772127afa6fb59ad993229306456ac10e8dc86dd3bb7c430bb SHA512 e175e23452d6956b995ff93a16ffc992cebcfae76e5a7671f60d719e3e8a2692d873f0e8d8830780ddc11f45ebea7a555d0917da5b33ff8249936dce106c7fed
diff --git a/dev-python/botocore/botocore-1.31.78.ebuild b/dev-python/botocore/botocore-1.31.78.ebuild
deleted file mode 100644
index 93c55a006738..000000000000
--- a/dev-python/botocore/botocore-1.31.78.ebuild
+++ /dev/null
@@ -1,68 +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 multiprocessing
-
-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}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.31.84.ebuild b/dev-python/botocore/botocore-1.31.84.ebuild
index 9a0240c45f2a..0f7a9150ba7a 100644
--- a/dev-python/botocore/botocore-1.31.84.ebuild
+++ b/dev-python/botocore/botocore-1.31.84.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.31.85.ebuild b/dev-python/botocore/botocore-1.31.85.ebuild
deleted file mode 100644
index 9a0240c45f2a..000000000000
--- a/dev-python/botocore/botocore-1.31.85.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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.32.0.ebuild b/dev-python/botocore/botocore-1.32.0.ebuild
deleted file mode 100644
index 9a0240c45f2a..000000000000
--- a/dev-python/botocore/botocore-1.32.0.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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.32.1.ebuild b/dev-python/botocore/botocore-1.32.1.ebuild
deleted file mode 100644
index 9a0240c45f2a..000000000000
--- a/dev-python/botocore/botocore-1.32.1.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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.32.2.ebuild b/dev-python/botocore/botocore-1.32.2.ebuild
deleted file mode 100644
index 9a0240c45f2a..000000000000
--- a/dev-python/botocore/botocore-1.32.2.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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.32.4.ebuild b/dev-python/botocore/botocore-1.32.4.ebuild
deleted file mode 100644
index 9a0240c45f2a..000000000000
--- a/dev-python/botocore/botocore-1.32.4.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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.32.5.ebuild b/dev-python/botocore/botocore-1.32.5.ebuild
deleted file mode 100644
index 9a0240c45f2a..000000000000
--- a/dev-python/botocore/botocore-1.32.5.ebuild
+++ /dev/null
@@ -1,68 +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
-
-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/cachetools/Manifest b/dev-python/cachetools/Manifest
index 526fd7ee783c..d9166f0c9297 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,2 +1 @@
-DIST cachetools-5.3.1.tar.gz 27985 BLAKE2B f8fa7c4e0f18d23c319b121fd951c7929277a6e3177687c7151bcc2028b0f1dd1bda18ee996f4f3a24f7ff56527ad3e80a8f90cf15a7d943e251170fedabbda3 SHA512 7e5d92b580660c1a768a65f9dc8343bc9e57c5df5c44a30137558d08a270a2ec7b652d10c1a78c240218a865527a49fa4b6d545c0bc62fe1f79b5d74da1b58cb
 DIST cachetools-5.3.2.tar.gz 26510 BLAKE2B c3cf15b69d7d6950c3a78d6ef4dbff317206bf08aa504081a545523244cfee8ca4013b0227bf7525ad7b82022b55e5f67633587d006e21e6b6b8ca9af151bf6c SHA512 1a6e32acefdd6165b3348dc32df300c5d3cd5bcff23c5f8eae5d7b6bc40a9aab7b5d6dee4bf23ebb49dea9a434570e854e24325028680a581f2b359d16e5d836
diff --git a/dev-python/cachetools/cachetools-5.3.1.ebuild b/dev-python/cachetools/cachetools-5.3.1.ebuild
deleted file mode 100644
index 68aa8a952516..000000000000
--- a/dev-python/cachetools/cachetools-5.3.1.ebuild
+++ /dev/null
@@ -1,21 +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="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.3.2.ebuild b/dev-python/cachetools/cachetools-5.3.2.ebuild
index d1d25406196d..68aa8a952516 100644
--- a/dev-python/cachetools/cachetools-5.3.2.ebuild
+++ b/dev-python/cachetools/cachetools-5.3.2.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index a1ddcbd2429b..12ada98c6c6b 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,10 +4,6 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
diff --git a/dev-python/clang-python/clang-python-17.0.4.ebuild b/dev-python/clang-python/clang-python-17.0.4.ebuild
deleted file mode 100644
index 6e97c422c39e..000000000000
--- a/dev-python/clang-python/clang-python-17.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 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"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-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/clang-python/clang-python-18.0.0_pre20231104.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20231104.ebuild
deleted file mode 100644
index e99a4396b062..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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/clang-python/clang-python-18.0.0_pre20231111.ebuild b/dev-python/clang-python/clang-python-18.0.0_pre20231111.ebuild
deleted file mode 100644
index e99a4396b062..000000000000
--- a/dev-python/clang-python/clang-python-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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/debugpy/debugpy-1.8.0.ebuild b/dev-python/debugpy/debugpy-1.8.0.ebuild
index 4d2f9403c4d7..22b495c02535 100644
--- a/dev-python/debugpy/debugpy-1.8.0.ebuild
+++ b/dev-python/debugpy/debugpy-1.8.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/pydevd[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index f92fea2795f4..92c4bb6040e9 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,3 +1 @@
-DIST pip-23.2.1-py3-none-any.whl 2086091 BLAKE2B 0a35bf4ba589f07e3c800d8f835e4bcdcd433976db83f91c86e12a2316b0b1c7de7120b248d70fe8b5587c28bb3c6e7bc633c64cdfb65a1f18f87a9e7a423181 SHA512 016a8cbd09384f1a9a44cb0e8274df75a8bcb2f3966bb5d708c62145289efaa5db98f75256c97e4f8046735ce2e529fbb076f284a46cdb716e89a75660200ad9
-DIST pip-23.3-py3-none-any.whl 2106643 BLAKE2B bc5d93e71dadba670ef19f8331dd8d9e7fd5f0f70f90de39a3437b25521bb61c97690793d67d4306a98c728fd9eb5fb5848f1abec853d7878b4bab792a51f6a7 SHA512 2ac3e66eb86b90e8bafd1825e84288af81d09ddb60f68b631838d14479b953ad0c6bdc933d754b5f02520401908828a0a8c518f04b0060c82b666e0d01e87ea6
 DIST pip-23.3.1-py3-none-any.whl 2107242 BLAKE2B d5ea7ead01468f1f6a5c60811de9410d260e820638c0073f70e480dd3678e7413ae612913c01456779d391a6108ce939eced95392696eb5b1cc26b3a7a04a99d SHA512 1a60d153982c1c5997d3826f4084b39ec4054228376093ee15c1f4be0781e78c4b1e5219b5f05cdc464588dec379f9f2cc21f075aa0a11a148d3545a547b9889
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
deleted file mode 100644
index 4e55e335b00a..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.3.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.3.1.ebuild
index 474a502c1273..4e55e335b00a 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.3.1.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-23.3.1.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 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"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild
deleted file mode 100644
index 474a502c1273..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/executing/executing-2.0.1.ebuild b/dev-python/executing/executing-2.0.1.ebuild
index e410c843e145..6efa4fef6e23 100644
--- a/dev-python/executing/executing-2.0.1.ebuild
+++ b/dev-python/executing/executing-2.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/flask/flask-3.0.0.ebuild b/dev-python/flask/flask-3.0.0.ebuild
index 4ed0981bf8a0..81128e7ab1b5 100644
--- a/dev-python/flask/flask-3.0.0.ebuild
+++ b/dev-python/flask/flask-3.0.0.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/hcloud/Manifest b/dev-python/hcloud/Manifest
index 7cb000461067..900357ff51db 100644
--- a/dev-python/hcloud/Manifest
+++ b/dev-python/hcloud/Manifest
@@ -1,3 +1 @@
-DIST hcloud-python-1.30.0.gh.tar.gz 108965 BLAKE2B b078310dcab67b37744ab285fe3c3207956f778de9c85fb64cbf4777250b3852a7bb19a6e2498a19bc1027a7b5edebc3aa0011192edf057ce1a1591e610387ef SHA512 459fdeff833a86c9c6869e06eac5b96250d2f0c9d1ebf55053c278ae8417af04611d4bb7bd89a757f75e5bc7303e13e235ba57496efcc59f63c38cf48fb87d82
-DIST hcloud-python-1.31.0.gh.tar.gz 109239 BLAKE2B 26a58fe75386f98403afd6f13c55768fa676d130243c9c8ef70c0c6310e2ec76235eadc50122b2ce203f190244e0d36f4d7b05e07c2e8fbe5707120634e1ef6c SHA512 be3d3e643e970390faae6d3da9e75b754d167398a7a6d04f06a4dea1bc79c160a39184365019ed1f8c7242a85f5deb9d43d8923cc1907861d38089fe8835ed62
 DIST hcloud-python-1.32.0.gh.tar.gz 109858 BLAKE2B 7e242a92c81278facd7f9d2042d2d36787153215a72e97da7616f7d6b6ca6c06fadfd6b33bdab3699a8d8ac6ec1d7327b78a224a3f674a13a7d06791e91d4658 SHA512 013cd3a7e54b12348e4ec87e489b461c41822a85cd9fafc4421a8bb404ecf1fa079d99217db5f770e893ab9bb7223b588e4429968b8339b4d23654610dfa80c3
diff --git a/dev-python/hcloud/hcloud-1.30.0.ebuild b/dev-python/hcloud/hcloud-1.30.0.ebuild
deleted file mode 100644
index f788a178cb7f..000000000000
--- a/dev-python/hcloud/hcloud-1.30.0.ebuild
+++ /dev/null
@@ -1,49 +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=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud/hcloud-1.31.0.ebuild b/dev-python/hcloud/hcloud-1.31.0.ebuild
deleted file mode 100644
index d1cbad81b34f..000000000000
--- a/dev-python/hcloud/hcloud-1.31.0.ebuild
+++ /dev/null
@@ -1,49 +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=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud/hcloud-1.32.0.ebuild b/dev-python/hcloud/hcloud-1.32.0.ebuild
index d1cbad81b34f..f788a178cb7f 100644
--- a/dev-python/hcloud/hcloud-1.32.0.ebuild
+++ b/dev-python/hcloud/hcloud-1.32.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 35fb56f3169a..2cca1ab373ed 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1 +1,2 @@
 DIST idna-3.4.tar.gz 183077 BLAKE2B dd6c94104e17b441a7a63aec4e28f1969278996964c402865da8ad1040878539f798956e26532281cc44934544fd6fa33407949caf4a34fa2b48d7aafbb8fb5e SHA512 4060a9304c9bac04efdd0b97ec8f5aeb7e17417e767bf51c5dfc26605edad25ab67456cf6f6a3c5a9f32b8247e46f6343edfd8a6ffbcd6d1075c71e66d089d6a
+DIST idna-3.5.gh.tar.gz 184973 BLAKE2B 68b39c00850663f5966ed1ee8c287a0026c441ed052b52aa6243cd595f6cd6fe62a7fe61b9b855c4ee851144fae2e88eda7bbd8405c66e37a9ad42ddc87cf361 SHA512 a806e4f96f2f1034dd634f3c86e80c6e7929a80c0773e4b2749466b691d38b94b6ea64994613cb5f8764754c1c9813eade4b74105f64233671b8eeaca7125bdc
diff --git a/dev-python/idna/idna-3.5.ebuild b/dev-python/idna/idna-3.5.ebuild
new file mode 100644
index 000000000000..38acb8743f8c
--- /dev/null
+++ b/dev-python/idna/idna-3.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="
+	https://github.com/kjd/idna/
+	https://pypi.org/project/idna/
+"
+SRC_URI="
+	https://github.com/kjd/idna/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+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"
+
+distutils_enable_tests unittest
diff --git a/dev-python/immutabledict/Manifest b/dev-python/immutabledict/Manifest
index d6c828824449..b0a013aca266 100644
--- a/dev-python/immutabledict/Manifest
+++ b/dev-python/immutabledict/Manifest
@@ -1 +1,2 @@
 DIST immutabledict-3.0.0.tar.gz 4478 BLAKE2B 7b5344f5153d28914da7124c3ca95e9b5c6422788259170de9f301de0a145324157635ca3543be824e9a0ebf93efe99a30dc1c8882bf926927023f2d06e318ad SHA512 90170703c1226e06d6726285005689cf66804ed2b3fda08c0350d9eeca6ec7427bd4004d42168e2f5ae7302acf1d16274a16d0e132bd81fbc8d470d75ec064a5
+DIST immutabledict-4.0.0.tar.gz 5696 BLAKE2B 409b0d130c70fbc03bb261e9a6352bc155f26f9f2ad77d1bc171fb16e1e8f54671b8421b685804d9e6da1b7bb37ec0bc2c5625e3d5aa2e926e65e69436f3843f SHA512 36378a4b5de7c2dd79ccc478972c66769822044948863444380360c22f45031d5de247050fc4f6dac1b8cdb481827e70fbbb74ea410d1481334ab72387d8afd4
diff --git a/dev-python/immutabledict/immutabledict-4.0.0.ebuild b/dev-python/immutabledict/immutabledict-4.0.0.ebuild
new file mode 100644
index 000000000000..d30306b92cc3
--- /dev/null
+++ b/dev-python/immutabledict/immutabledict-4.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="An immutable wrapper around dictionaries"
+HOMEPAGE="
+	https://github.com/corenting/immutabledict/
+	https://pypi.org/project/immutabledict/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 76a995c358de..b52a49ba0198 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,2 +1 @@
-DIST ini2toml-0.12.tar.gz 101098 BLAKE2B 8e44600718318ce9c2ebaa5205864c1ca6ce87852a59496801578f32e223b9283d2f724acf004136743f87c8a081e58fd1176abe85288f8c463fc2520f708633 SHA512 c324a65fa20af880f2731b740dbf041ef7673d7ab817a9ee1947bf781d39bc000fcd8a725a546fc6af0dbecd0ec0534b2f9b83f3d8ab4afc0239d94acca06df5
 DIST ini2toml-0.13.tar.gz 102729 BLAKE2B 27094e0f329ce5d0da3ca1793b5b92e97eba5068225c55fcc9e0c61ead607967b8718976bfa13f76638c1b2bd8ee2a532b8eaf2023895f2ffdeacacd072fff9c SHA512 9700affeeb0434699e708fbeffb34e68f54882d7c5ada25cbdcdf47fed70bf8b5e8ff46503c19aa135079bc8770bdc48e991212b07b6409adf57d197a5ed998e
diff --git a/dev-python/ini2toml/ini2toml-0.12.ebuild b/dev-python/ini2toml/ini2toml-0.12.ebuild
deleted file mode 100644
index 4f835c02dcaf..000000000000
--- a/dev-python/ini2toml/ini2toml-0.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-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="Automatically conversion of .ini/.cfg files to TOML equivalents"
-HOMEPAGE="
-	https://pypi.org/project/ini2toml/
-	https://github.com/abravalheri/ini2toml/
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/configupdater[${PYTHON_USEDEP}]
-		>=dev-python/pyproject-fmt-0.4.0[${PYTHON_USEDEP}]
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# validate_pyproject is not packaged
-	tests/test_examples.py
-)
-
-src_prepare() {
-	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ini2toml/ini2toml-0.13.ebuild b/dev-python/ini2toml/ini2toml-0.13.ebuild
index d166e68ad52b..12f08048f2b8 100644
--- a/dev-python/ini2toml/ini2toml-0.13.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.13.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 3b61773cf485..2d49d1985033 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,2 @@
-DIST ipykernel-6.25.2.tar.gz 156247 BLAKE2B 796ed40dd5ef11dbe8a0bb330aafd1e51e40b1fa5a0b55bdb1a1aff4d89187b3c6b3831f3d44b131f5e8158d6035697f788877a8e682c4c0355da74825ee2200 SHA512 a6f5089cff8c297379ae840b49ad705d23db46aa04030c7a2598031d118b5c0dd64e091de4d66adfd876e8ef45abfcb6bc963c3311dd8e50f4e83236bfc4cfa3
 DIST ipykernel-6.26.0.tar.gz 157526 BLAKE2B 8ba5cf820cf03d7735a4dbcb613925b9f9f83d949e065d61f546f3b8ded17accdfdcb4d72718fa644f2233f0397afe8f77437fed1d219710ecac6c9db523e08e SHA512 8199f59ac0147e3b21a07f28d64bf73311ccbf6b48b060979a520ac798a058496e659d08a7b41b1321b4be7092e09fe793d80fb061fc2706b46aa17e93e142f8
 DIST ipykernel-6.27.0.tar.gz 157721 BLAKE2B ea34d02f57f67d720fb744f8bd7fd9a191ec2c104aafca2741eb50b4a28519e609efc465e73dbd2aad5ce1c0e383ea33115f13171deee70825d734a42f38c852 SHA512 13c9c1c2083def67b3fa5e93b03d77a40b14d2505a07386554e03f896e9ca961c54ab6b7d51fbe05bd684f1acf651196a2b0f804ded23461eac5b6500b829c45
diff --git a/dev-python/ipykernel/ipykernel-6.25.2.ebuild b/dev-python/ipykernel/ipykernel-6.25.2.ebuild
deleted file mode 100644
index 5f0996eb2969..000000000000
--- a/dev-python/ipykernel/ipykernel-6.25.2.ebuild
+++ /dev/null
@@ -1,79 +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} )
-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="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? ( >=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}] )
-	>=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-20[${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
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-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
-		ipykernel/tests/test_debugger.py::test_attach_debug
-		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_set_breakpoints
-		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-		ipykernel/tests/test_debugger.py::test_copy_to_globals
-		# hangs?
-		ipykernel/tests/test_eventloop.py::test_tk_loop
-		# doesn't like pyside2?
-		ipykernel/tests/test_eventloop.py::test_qt_enable_gui
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.26.0.ebuild b/dev-python/ipykernel/ipykernel-6.26.0.ebuild
index 7ed231f3ccae..83e75008a1ea 100644
--- a/dev-python/ipykernel/ipykernel-6.26.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.26.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/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 0f747fe59cfb..12cff85e52ae 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,2 +1 @@
-DIST jaraco.envs-2.4.0.tar.gz 7101 BLAKE2B 0858732706a71ac359b97c0a841c5370f35011968ee76364a06aa67231992bd04e200362d245c3fe8d035b7018be15bdc4117a76e86ac35bb0fff8958af9a0f6 SHA512 d4da2a3f8ec9add63a0b2f754523da5b6593d869537e38c33ea86e59105c4be0cea15546897d70b869cf81be709d9b3fa2cfa35bbefcb9ab32a373ea620553aa
 DIST jaraco.envs-2.6.0.tar.gz 8028 BLAKE2B af9eb47e4f0856a3c3d7ae028e6cebbfc74a6502a5442aa9518b7ab0f927dbc0dcd5e68240dc43868ccb505b0d75c7e9e0162d54620765559f5643f13019a0ba SHA512 8c1d4717f45b805ae3afa1308a60c0f6f03af2a0976f2fb52329d05114282c2f33085865c93e34065bfd978e52ed8bd65f9903ed8e3c7d8b23bf6a050a32bd08
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
deleted file mode 100644
index b26d4821f592..000000000000
--- a/dev-python/jaraco-envs/jaraco-envs-2.4.0.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
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Classes for orchestrating Python (virtual) environments"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.envs/
-	https://pypi.org/project/jaraco.envs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-# there are no actual tests, just flake8 etc
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/path[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# optional runtime dep, not used by anything in ::gentoo
-	sed -i -e '/tox/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild
index efa3f8855940..f08c2288c0fd 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/path[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild b/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
index a867b0dd0779..10c2bd442973 100644
--- a/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
+++ b/dev-python/jsonschema-path/jsonschema-path-0.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index c251e7a3f2c4..ae0ef217cb91 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,3 +1,2 @@
-DIST jupyterlab_server-2.25.0.tar.gz 72251 BLAKE2B aac9191493833aea1dbd2b2b85365bab2bfbf06576c853668cc94d62b03b8cabaabc2df8c76ae57c8d76d55ddf646bdf51de00f682cc5b4b27252d5bd409bc61 SHA512 b97a1e5da8f30e83971be152a39c5a6553e6a589000f4848feb7777561b018b310f445853825215cfdb823666d73d4b117ed8914138c8a319035dac893f85951
 DIST jupyterlab_server-2.25.1.tar.gz 73845 BLAKE2B a2eb8ac0d6ffe76cf8e2bc2464c9466ed098acb03ad8fd50bfcf87b461366d0a877d3e3311382c1c1f0e4046a42b8adb58ffd21ef5a58611115e5a5986f20316 SHA512 179c3fc0f09c2456b5be8ae2d35e809df63766dd3e5b740eb9e9d5630152aa8bef6f1ad08602e0bda5860cdad0d681d771cd22eac4ea8b6fc07ad8609e83e810
 DIST jupyterlab_server-2.25.2.tar.gz 74028 BLAKE2B 6dffdea7c002fee946a8af728592ea2404f4568bdfaae1727da5c3725edb284a7ad8594efdf71a4671249a4164878288bcb4aa588a59f45fa83fbda0656db89b SHA512 6270505170e7586fae8c4f7fcabaed6e2ef2068ec35bc5eb630e1b5177aab24d8e8be4755ad6dd3f97c5e3a1aa6c770f554efe92a2db5a5bfe99bf420e2b5a34
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild
deleted file mode 100644
index 1673c960eadc..000000000000
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.25.0.ebuild
+++ /dev/null
@@ -1,66 +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="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab_server/
-	https://pypi.org/project/jupyterlab-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.31[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter-server[${PYTHON_USEDEP}]
-		<dev-python/openapi-core-0.19[${PYTHON_USEDEP}]
-		>=dev-python/openapi-core-0.18[${PYTHON_USEDEP}]
-		<dev-python/openapi-spec-validator-0.7[${PYTHON_USEDEP}]
-		>=dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst-parser
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_translation_api.py
-	)
-
-	EPYTEST_DESELECT=(
-		# Fails if terminal not available
-		tests/test_labapp.py::test_page_config
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild
index 619021d169f4..784df6be797a 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.25.1.ebuild
@@ -17,7 +17,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/Babel-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 2400f079a7f8..d9fe64fa94ab 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,4 +1 @@
-DIST jupyterlab-4.0.6.tar.gz 18236816 BLAKE2B e39e7cb6fbdecfee0b5e592091f989fe94907369d057457130f8bc2f391ca4c83cc09542bc9da766413821eb4c4e9eaaca3adfeccf26b0b2f61ab5e65dac9e45 SHA512 fc4acde65f2bb24adbf95e5cde17e0225390a0c8aca10e04b7c9cf5b2bcebe529608b53ce259f081508b86216b94c71fb260c857b9fe3a2bef16cb4e7af3dcda
-DIST jupyterlab-4.0.7.tar.gz 18316994 BLAKE2B 9965a2bcb0b926af17626e9aef7b37e62144685e4e6cb17b029f3b760d4d4ba583c772683078c3f7cf7fbb09d31e5214193757116873e4457596d7522ddbbf04 SHA512 2f65f8aba9db17574d5caa030437c57ca98808561645f0b30b9fd4fe2cc49f6234776a36db474051cdfeebf1d9e7f3b874189110c955edecb89506580d8917e3
-DIST jupyterlab-4.0.8.tar.gz 18345373 BLAKE2B f6d3b1f53e23f5107775c442b4c69b435091035a9369423e7f474d6a6b77c163ba49b766cc4368b1764d08beea89b881389699920e9f076ad02c8266809bfee9 SHA512 991d17b1338cd172364f812698c989b1d9f853a24d97ce3eb0f89f1ebbe78bc740ab2eafb37e929ac623ac8c06188ed0dcc7ec85ab8d3d9103019c33b45fcf6b
 DIST jupyterlab-4.0.9.tar.gz 18347162 BLAKE2B b4a62088dd8b3b646af1ea02a57c915d659f31e716e6db27c076c945340a53c742cff49518e5b13ada32a9b00f83f143e5504ae897a7abf454a7c997f72e00e6 SHA512 c87451821afa28e7016acdcff315cc48578ea1735b74c2732ed2570c326901acc38fa333344e89ba1c15799ac6bf3f9332c67cdd0ce8ac38713e0be6973d1c1a
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
deleted file mode 100644
index 0ce19bd23e06..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=hatchling
-
-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.7.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild
deleted file mode 100644
index 5eb97854b550..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.7.ebuild
+++ /dev/null
@@ -1,77 +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 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.8.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.8.ebuild
deleted file mode 100644
index 5eb97854b550..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.0.8.ebuild
+++ /dev/null
@@ -1,77 +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 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.9.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.9.ebuild
index db53f3e9869e..6e2a76d27002 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.9.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.9.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/lark/Manifest b/dev-python/lark/Manifest
index 847026a224b4..97f0f458e754 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,2 +1 @@
-DIST lark-1.1.7.tar.gz 251290 BLAKE2B c6f19eadf29c75257e0b49231e621bffd27ff6c569a07159e9f4934d0bf74abb6df9425fdd971392b415fc19d12421abc67186d844f2ef1c294205a25f4e263a SHA512 59e5567ebff173a25caa2ea4db3ff3f284bd580ce68a6a3ca27ceff34158a9b56fc404ebf3016e2bbb074fd19286a0d511ffaadf2f157185f45b10305c3c8474
 DIST lark-1.1.8.tar.gz 255316 BLAKE2B 40f0590ee313e5da57e593fe1cd311dfe1222cea1be83c5d1686d9a74983c8abc4f4f913f456993c51df4ce79eced10412ff9bf3dfafbeaa30f11e1301c84f60 SHA512 e51ecb38d9e7c25cca2845c56cd3cce1b1b3940ec8f0e135373726ffb23bda46f750b03f0f0b8edc750794c2b2aab9c327ff9f381faaabd53f09e76760548957
diff --git a/dev-python/lark/lark-1.1.7.ebuild b/dev-python/lark/lark-1.1.7.ebuild
deleted file mode 100644
index 9e11177930b9..000000000000
--- a/dev-python/lark/lark-1.1.7.ebuild
+++ /dev/null
@@ -1,44 +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="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	if has "${EPYTHON}" pypy3 python3.{8,9}; then
-		EPYTEST_IGNORE+=(
-			# test using Python 3.10+ syntax
-			tests/test_pattern_matching.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/lark/lark-1.1.8.ebuild b/dev-python/lark/lark-1.1.8.ebuild
index bda0fecdfbf3..9e11177930b9 100644
--- a/dev-python/lark/lark-1.1.8.ebuild
+++ b/dev-python/lark/lark-1.1.8.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 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a1ddcbd2429b..12ada98c6c6b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,10 +4,6 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-167b598648dfcee2f23426bfa972e53f8ac16722.tar.gz 201158314 BLAKE2B 908d42b0148f04eeab8d05d46736c570ffdea7d66273aa428375f944deaaf1c0ca885ef0fbe04588d838e4f831ff9823365f9df700f9e9de08c700f0135f2e59 SHA512 7da16df850245ba70e4ddf318a0e7322ed68b076337325c3d3702bb428358d11137b6254051cc6a34d047789f107fd96065cd169c9b2684f78b3a54c4f566a78
-DIST llvm-project-17.0.4.src.tar.xz 127828636 BLAKE2B bd91ef7f07e085b935500b056f75ab792d13e7f33825df36e85e7988f313a4f3fbb1b4c854615a5e437a97ad552838eb1be5098194f281ba1279330156dd6a38 SHA512 6703eede8013e7e5733fbd7b527757166d5698f52e239522fb320717430c88696309038501d22fe384b016b330bd92126a2c0ba88b0258c3f092801e3800b7a3
-DIST llvm-project-17.0.4.src.tar.xz.sig 438 BLAKE2B e417c14d0af8c2f13eccec7a42d0e4d5a6a834d7a3d31061b9f56f7e880cd982c2b1e84322bcf8f6a3d3167519c31f16c7acb8fc725ab5b453f467a196ca2688 SHA512 4e79bb1d2b41289c092d4ec2759d7cfd4f12df8d107f9510aa9e2354691e7f878e3929b2b50e29fd6c65bd5a3aa13baf6b791847c1cd99817adbf59700cf2bdd
 DIST llvm-project-17.0.5.src.tar.xz 127842560 BLAKE2B 2d657ff14ad2dc932a5cdc6605ad30cba8e22ed8f4adb5ed53bfd9b5b654496023df9eb895f9691e98bba6b6a341b81d8a17361daf81ce4c3cd6a2b3602cd90e SHA512 793b63aa875b6d02e3a2803815cc9361b76c9ab1506967e18630fc3d6811bf51c73f53c51d148a5fc72e87e35dc2b88cb18b48419939c436451fe65c5a326022
 DIST llvm-project-17.0.5.src.tar.xz.sig 438 BLAKE2B d65bfe2816c49a4b3dda2c70fe5ca6a6b7e922338219e7a62b2f33082d88b700781e184f2b3b0758c1d46825cf369ddd6f8824f3be8d8f3a70a88cfbc06bba45 SHA512 509a61434471463459d3ec837e3f3cce662650d4e72ffc7d28fbeb0d5cfe92d5b1dc4fa568e40f48757b1e708de793bc157de7225ac15a00221191e6c1e660d9
 DIST llvm-project-5237193b87721134541f228e28edfd544a9c8ac8.tar.gz 201404340 BLAKE2B f028b8b100721202007e3106d8ee91bcf2ac90588f9268ec835dc4ea3941363d4b796338146c65d1a9e88957d18738030f713b3fed770616c79cb40043e706db SHA512 40a4d4f99f1a690a0f8737261aeeaa61af6124eeadcb6bab5c3828e88b36b8cce42a8caee6d3f01e675047c59b62210de017d207e341f680eff97758f798ad45
-DIST llvm-project-83888a5404d46667647fe36d6fa510d075ed57ea.tar.gz 200867834 BLAKE2B 20f5afa071089852abfdcc316e5db77681afe0fdb189a515d7724a0abaf1c545f37ba4b946414c7b8afca62636107bd4e1c7c99d8ba6a514bb413b13f5f634b0 SHA512 4cd7680a227388382076d5735a97a379546f5bdde33272a5a3d317d98c2847e34917dd38a3cfb3f1f677f6d9a9b2163b29f89dd9c4b92506f5be34a3072e0509
diff --git a/dev-python/lit/lit-17.0.4.ebuild b/dev-python/lit/lit-17.0.4.ebuild
deleted file mode 100644
index 0bbb706f82de..000000000000
--- a/dev-python/lit/lit-17.0.4.ebuild
+++ /dev/null
@@ -1,42 +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 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"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-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() {
-	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/lit/lit-18.0.0_pre20231104.ebuild b/dev-python/lit/lit-18.0.0_pre20231104.ebuild
deleted file mode 100644
index f3ba04d07c7f..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20231104.ebuild
+++ /dev/null
@@ -1,41 +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 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() {
-	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/lit/lit-18.0.0_pre20231111.ebuild b/dev-python/lit/lit-18.0.0_pre20231111.ebuild
deleted file mode 100644
index 6680285a5660..000000000000
--- a/dev-python/lit/lit-18.0.0_pre20231111.ebuild
+++ /dev/null
@@ -1,45 +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 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/mediafile/mediafile-0.12.0.ebuild b/dev-python/mediafile/mediafile-0.12.0.ebuild
index 37aa25bc6c06..ede24c31def1 100644
--- a/dev-python/mediafile/mediafile-0.12.0.ebuild
+++ b/dev-python/mediafile/mediafile-0.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
index 84d92fc52ab8..823a604b5946 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index ff1873350aa9..e8108c3a76e8 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,3 +1,4 @@
+DIST moto-4.2.10.tar.gz 4784297 BLAKE2B ece1bc4f67c427890bb6f2e029d3bca44045ce5cf522944f9770b1ab61ad21ba3ee485a74e99eb92d1de4552c670bcd36e74ee83bfc90676b6d53cfc06fc4025 SHA512 69b3a3e9231844e728b068d5e4a3e5bc690237d68708c90e10198467ffcd6b5339f8f3b24029102ea0b0d3fcacef4b1a509be1b097d93b9f5456c8d6fcc8df95
 DIST moto-4.2.6.tar.gz 4745145 BLAKE2B 76610aafe3ea4106454aadbc8cf853ff5d4617202a62ae92e6cbe46c75a17d1dd8e63e8188c0c17a88af080bfe6c3466ed420378cee27d0287fe617d3412807e SHA512 0bef11a2600d48349735e7d118f6f28b02fb85e2b5e7310aaa0651444740ad4657470a59c59dab75084cb4250c6b5b725eda5e996b9acbc927529850cabc4c1c
 DIST moto-4.2.7.tar.gz 4756973 BLAKE2B 2ab27952abd6faaa2bbe7b6565f5d5403ea4e2c5c87e262b9b8fce9efbd7bb6972e295476426026f4ab7c000da33dfed2d401c04514b1c87bb15a1ae36c4c9cb SHA512 b23272d125b8fcc57cc72243d559cd985f7b96b3e38df31cc83792dc2b830e17a0cf4e44eaec81473b567a2203014d3cfa1f2bfb77f994ca46fb3013d47da704
 DIST moto-4.2.8.tar.gz 4769361 BLAKE2B 2e7d6a7cac04655aa9f05af463e57689c0fc2b67cec27644fdf7fd658d988d33f311e43323599a0f91325f7b4e61630a3066d3fda2a15b0c0ca50e6a7cf34e22 SHA512 5a40d44ad46083b6e7c8753e8986316a5beb5b352e7e7b0eefe2b3f3ed2d760f0745f835b6e7d6b2d7b039db0b6f2fad095f047795d2d08093257fa68db1ceee
diff --git a/dev-python/moto/moto-4.2.10.ebuild b/dev-python/moto/moto-4.2.10.ebuild
new file mode 100644
index 000000000000..773b2632ddfa
--- /dev/null
+++ b/dev-python/moto/moto-4.2.10.ebuild
@@ -0,0 +1,129 @@
+# 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="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5.0[${PYTHON_USEDEP}]
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/sshpubkeys[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch/test_batch_jobs.py::test_submit_job_array_size
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_terminate_nonexisting_job
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_core/test_docker.py::test_docker_is_running_and_available
+		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests
+		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# require py_partiql_parser
+		tests/test_s3/test_s3_select.py
+		tests/test_dynamodb/test_dynamodb_statements.py
+		# broken by new urllib3
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests
+		tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url
+		tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+
+	local serial_tests=(
+		# these tests set up credentials that are needed by the tests below
+		tests/test_core/test_importorder.py
+		# these tests apparently rely on some other test setting credentials
+		# up for them, so they need to be run separately, after the above
+		tests/test_dynamodb/exceptions/test_dynamodb_exceptions.py
+		tests/test_lakeformation/test_resource_tags_integration.py
+		tests/test_redshiftdata
+		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
+		tests/test_s3/test_s3.py::test_delete_bucket_cors
+		tests/test_s3/test_s3.py::test_delete_objects_percent_encoded
+		tests/test_s3/test_s3.py::test_delete_versioned_bucket_returns_metadata
+		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
+		tests/test_s3control/test_s3control_access_points.py::test_delete_access_point
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
+	)
+
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	EPYTEST_DESELECT+=( "${serial_tests[@]}" )
+	epytest -m 'not network'
+}
diff --git a/dev-python/mypy/mypy-1.6.0.ebuild b/dev-python/mypy/mypy-1.6.0.ebuild
index d1959d228a27..7b470d6901d8 100644
--- a/dev-python/mypy/mypy-1.6.0.ebuild
+++ b/dev-python/mypy/mypy-1.6.0.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	native-extensions? (
+		${RDEPEND}
 		dev-python/types-psutil[${PYTHON_USEDEP}]
 		dev-python/types-setuptools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/mypy/mypy-1.6.1.ebuild b/dev-python/mypy/mypy-1.6.1.ebuild
index 53646cf3e0e3..1986d26ec17f 100644
--- a/dev-python/mypy/mypy-1.6.1.ebuild
+++ b/dev-python/mypy/mypy-1.6.1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	native-extensions? (
+		${RDEPEND}
 		dev-python/types-psutil[${PYTHON_USEDEP}]
 		dev-python/types-setuptools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/mypy/mypy-1.7.0.ebuild b/dev-python/mypy/mypy-1.7.0.ebuild
index 79ee8273d097..1521a7940db5 100644
--- a/dev-python/mypy/mypy-1.7.0.ebuild
+++ b/dev-python/mypy/mypy-1.7.0.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	native-extensions? (
+		${RDEPEND}
 		dev-python/types-psutil[${PYTHON_USEDEP}]
 		dev-python/types-setuptools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/mypy/mypy-1.7.1.ebuild b/dev-python/mypy/mypy-1.7.1.ebuild
index 90f0bc3c94ca..74a1e22780bb 100644
--- a/dev-python/mypy/mypy-1.7.1.ebuild
+++ b/dev-python/mypy/mypy-1.7.1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	native-extensions? (
+		${RDEPEND}
 		dev-python/types-psutil[${PYTHON_USEDEP}]
 		dev-python/types-setuptools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/networkx/networkx-3.2.1.ebuild b/dev-python/networkx/networkx-3.2.1.ebuild
index 6e40d171e511..4c616fce3ade 100644
--- a/dev-python/networkx/networkx-3.2.1.ebuild
+++ b/dev-python/networkx/networkx-3.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/octave_kernel/octave_kernel-0.35.1.ebuild b/dev-python/octave_kernel/octave_kernel-0.35.1.ebuild
index cb3ca5a9e09e..502399fe1291 100644
--- a/dev-python/octave_kernel/octave_kernel-0.35.1.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.35.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index d091f24af892..650cc1660608 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1 @@
-DIST openapi_core-0.18.1.tar.gz 84070 BLAKE2B 523b620106493aac11135025791440cbc4e7dc415a10344a74e2de3500834bda6158aa286f167e629ae90e1eefd568527832fb86557c16eace162d2bac98e30b SHA512 ae59c0ca948ebfcf01b63db8a463869bbb748336f32c917b2ed22bd94934c91b6fe280bf94bf82a24df9fb29979e6a1b5ce665d12b6bb6480405e9586a9fc8d5
 DIST openapi_core-0.18.2.tar.gz 84444 BLAKE2B bb05ba86eff3c70c780f1919a29b93f2137983318834c51204d7ad1094fc645d2dbcef93d92d03096826688fdfe1811c551eee68995fd46739314c2e4bc77cfc SHA512 552109c095c840a46759a54e247a3ac2d8cc36707ba89815740eef4b7fb421bd489929543892341fd89a578bff4043c8c81302fddaa1efe125238e050f152c27
diff --git a/dev-python/openapi-core/openapi-core-0.18.1.ebuild b/dev-python/openapi-core/openapi-core-0.18.1.ebuild
deleted file mode 100644
index 883db9a0361f..000000000000
--- a/dev-python/openapi-core/openapi-core-0.18.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-spec-0.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.2.3[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.6.0[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.18.2.ebuild b/dev-python/openapi-core/openapi-core-0.18.2.ebuild
index 5bb0c3c0ba3f..eb571f8620f6 100644
--- a/dev-python/openapi-core/openapi-core-0.18.2.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.18.2.ebuild
@@ -16,7 +16,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/asgiref-4[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 9a2409e5989d..333cd068b6cc 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,2 +1 @@
-DIST openapi_spec_validator-0.6.0.tar.gz 33646 BLAKE2B cf8d397602b147872e86c0f236731ec477e20775aa63a61162e66deb7d4b81ef91bd86b67d2dfddf5d6b160c37b7eab4ddb1d10975ada8dc13aebdc088e4483a SHA512 71434f131f34902210237940d75f07f250b296c3e1814e03f0eaae436321ca11ac63d0014c85ad571852e66b2e11545c9d0cf21d771c0c67210a60c1f9094cc2
 DIST openapi_spec_validator-0.7.1.tar.gz 37985 BLAKE2B e4e6995bba18ea9fb65be28b2156c73afd3c5074a3fbd5b83e03534a1bb5fdde2e5a586aa161e0f9fc64985d83ae995f46ff2704a4010a708f9e0cf18f97a8a8 SHA512 c2a4be4a945058a4e77857bf0d6dabf2bef27c25fbe72947db3ac011c5a60d2d0159ef0d1d44571152c5ffdc650f7d3d6c54f82834e499e9506fb474b7c9b270
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.6.0.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.6.0.ebuild
deleted file mode 100644
index 0fefa2686425..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
index a878b791635c..d3d0d46cfddf 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.1.ebuild
@@ -16,7 +16,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/jsonschema-4.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-2.1.3.ebuild b/dev-python/pandas/pandas-2.1.3.ebuild
index 1828538ed3ea..ddb26877e0d2 100644
--- a/dev-python/pandas/pandas-2.1.3.ebuild
+++ b/dev-python/pandas/pandas-2.1.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index f12276b073ab..77481561e6f2 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,3 +1 @@
-DIST pdm-2.10.1.tar.gz 2588192 BLAKE2B ce285679d727e4f8dfe0acb9503306871d36e7a358f38dec30db24f9ce69bc0e5089546ae3140757d68d36b698252d97434d18e51377469308e4059671569e06 SHA512 9f4f47586c1452feeb79f45b127ee799206564795ca238f0e69abff5d14e096af5583eb3749cc2635dfc15e883353c885e796f614195efdf58e08f77637b42f2
-DIST pdm-2.10.3.tar.gz 2588935 BLAKE2B 9c66f5928f6cd9cdacc5dec9490e0e96221ad8c4884c6b21e8b9d658f4e5c650dd2e9e415788ec3097403a0301c7baa8a7316dd0f3f0070708489dd394ed80bc SHA512 09a08a6f225a346d841ebadd394ac4d86313369de6482f4caf15cc401b7deb5b928bf5894178d1334596c430f3f14b87f8e29d15ec5d73e1f7d40be717211ddc
 DIST pdm-2.10.4.tar.gz 2589461 BLAKE2B 83366412f8b222067b33386a1a8fb0759945d22814da96b4c20e3a9bc459d6ad37f51e87720032249090c13e333becc33f4da482338c494af5fa49a578d4c308 SHA512 7e165f497a1cf1993554277ccf347410893f7635748d8d5a43dba1bc6156ea7655045c6ac865b96ff2e44d736b963fde5921a4710628201dd88c20d4fa7014f2
diff --git a/dev-python/pdm/pdm-2.10.1.ebuild b/dev-python/pdm/pdm-2.10.1.ebuild
deleted file mode 100644
index bdf8464d0071..000000000000
--- a/dev-python/pdm/pdm-2.10.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/truststore[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.12.1[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.4.0[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/cachecontrol[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' pypy3 python3_10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pdm/pdm-2.10.3.ebuild b/dev-python/pdm/pdm-2.10.3.ebuild
deleted file mode 100644
index d1d25bc1c50e..000000000000
--- a/dev-python/pdm/pdm-2.10.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/truststore[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.12.1[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.4.0[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/cachecontrol[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' pypy3 python3_10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pikepdf/pikepdf-8.6.0.ebuild b/dev-python/pikepdf/pikepdf-8.6.0.ebuild
index 0a5b47fab69b..bb7a1216927f 100644
--- a/dev-python/pikepdf/pikepdf-8.6.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
 # https://qpdf.readthedocs.io/en/stable/release-notes.html.
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index ba2689a79625..56a506fce22b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,3 +1 @@
-DIST pip-23.2.1.gh.tar.gz 9370625 BLAKE2B 9e7855aae371a773a070c24b50f985dac6ff7c2412d51e268368b911b92d0d0b52a839f9d761d5f6aaff33f1e7570d5f930e5063e8af98aa99f50d2f1c1b5ed2 SHA512 a6c629976c332cffe5dff0ec1e201d694c7a42fa8def202ebf1db251a6dbd90091eaac89c36a354a0cf0c60cdb267b4e0ec9ff6a88b0ac61cfaafdf159e34fc8
 DIST pip-23.3.1.gh.tar.gz 9397023 BLAKE2B f5085bf1faaca93954abb2dfb99f5a365b7bff385ad9f0f692fb41bbf0586617f0a3d7f36df5e3475f150819fdbf7f79fc6bf8b2425fe06dc570cd0ec98fed6e SHA512 eddca29e8c3727d1d8d793ab0b05f069781cac06df805fcf7a363da738d39498135ccbbb6d2d442604a7bf78ba6c3d101ec2043431ac1832a3f2710db7cc5e56
-DIST pip-23.3.gh.tar.gz 9394878 BLAKE2B 6ef608b204a4cb796585c5ff130ee642bce0e7a464099b7eaf9c9199203fc28ff0a1b260a731f9ba462a9b82e6f68be12fc622ed809ad41a1ab92adaa4993cbd SHA512 1afef5374410387bd1056a9ada21893f1fbb81e7a2d0ab2c9f4b500c99d25b98b55254e0dc36c4e4e408ad84b7be0e24709d25447168b076ce7723d35462d055
diff --git a/dev-python/pip/files/pip-23.3.1-no-color.patch b/dev-python/pip/files/pip-23.3.1-no-color.patch
new file mode 100644
index 000000000000..528e2c6cf465
--- /dev/null
+++ b/dev-python/pip/files/pip-23.3.1-no-color.patch
@@ -0,0 +1,35 @@
+From ad01e9c2a965d395c5902c8ad70c970c7631316b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 25 Nov 2023 07:36:59 +0100
+Subject: [PATCH] Fix tests when NO_COLOR is set in the calling environment
+
+Add `FORCE_COLOR` and `NO_COLOR` variables to the `isolate()` fixture
+to ensure that these two variables do not affect internal test output.
+This fixes the following two test failures when pytest is called with
+`NO_COLOR` set:
+
+```
+FAILED tests/unit/test_exceptions.py::TestDiagnosticPipErrorPresentation_ASCII::test_complete_color - AssertionError: assert '\x1b[1merror...ing harder.\n' == '\x1b[1;31mer...ing harder.\n'
+FAILED tests/unit/test_exceptions.py::TestDiagnosticPipErrorPresentation_Unicode::test_complete_color - AssertionError: assert '\x1b[1merror...ing harder.\n' == '\x1b[1;31mer...ing harder.\n'
+```
+---
+ news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst | 0
+ tests/conftest.py                                     | 4 ++++
+ 2 files changed, 4 insertions(+)
+ create mode 100644 news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index c5bf4bb9567..8d9eb029c79 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -318,6 +318,10 @@ def isolate(tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+     # Make sure tests don't share a requirements tracker.
+     monkeypatch.delenv("PIP_BUILD_TRACKER", False)
+ 
++    # Make sure color control variables don't affect internal output.
++    monkeypatch.delenv("FORCE_COLOR", False)
++    monkeypatch.delenv("NO_COLOR", False)
++
+     # FIXME: Windows...
+     os.makedirs(os.path.join(home_dir, ".config", "git"))
+     with open(os.path.join(home_dir, ".config", "git", "config"), "wb") as fp:
diff --git a/dev-python/pip/pip-23.2.1.ebuild b/dev-python/pip/pip-23.2.1.ebuild
deleted file mode 100644
index 19ffcef21fc9..000000000000
--- a/dev-python/pip/pip-23.2.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-		# wants to install keyring from Internet, sigh
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# probably a too strict assert
-		# https://github.com/pypa/pip/issues/12152
-		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-23.3.1.ebuild b/dev-python/pip/pip-23.3.1.ebuild
index b71ec60ec219..50d2aff5c82f 100644
--- a/dev-python/pip/pip-23.3.1.ebuild
+++ b/dev-python/pip/pip-23.3.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="test-rust"
 
@@ -58,6 +58,7 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/pip-23.1-no-coverage.patch"
+		"${FILESDIR}/${P}-no-color.patch"
 	)
 
 	distutils-r1_python_prepare_all
diff --git a/dev-python/pip/pip-23.3.ebuild b/dev-python/pip/pip-23.3.ebuild
deleted file mode 100644
index b71ec60ec219..000000000000
--- a/dev-python/pip/pip-23.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-		# wants to install keyring from Internet, sigh
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# probably a too strict assert
-		# https://github.com/pypa/pip/issues/12152
-		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 0ca84327182d..ba9ca6c998d5 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,2 +1 @@
-DIST pyclipper-1.3.0.post4.gh.tar.gz 51136 BLAKE2B 983f6003aaafefc4efeecd621094532b44414d8a2c4fc3d11272e3823ce5a78575576e4e3ced018d32bbca5e86afbe6305e3d43d09f66520cc1d95e3c5a988bf SHA512 cfcf195c2d7aca018adf1f59f6bd53ac08f8fca50738767c0d0f3fadf22da61a1cca4bd20b1147b4ffdd06bdd4624f0b63c05e650105660bb0a476ff2b1746d8
 DIST pyclipper-1.3.0.post5.gh.tar.gz 51150 BLAKE2B 2751dbc2ca6c8ad664a1185f00c644b084e13bbb4bb54895003799988b8d56542dd4d4b793bfa33391aece59097e1ca9ee159631b844f41ade862ed187ed5dae SHA512 24dd783449fdefb035627289680959ca4a74f737573518d14fe899ec015a7f8781b391df861e1f8986d6e71c8295743ef5fa048f5da22dd493f5940e25a7f185
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
deleted file mode 100644
index 9eb1fcb7117f..000000000000
--- a/dev-python/pyclipper/pyclipper-1.3.0_p4.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
-HOMEPAGE="
-	https://github.com/fonttools/pyclipper/
-	https://pypi.org/project/pyclipper/
-"
-SRC_URI="
-	https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-# <cython-3: https://bugs.gentoo.org/898698
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
index 44d6eb2777b6..d7cc27d28c1d 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p5.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/pycurl/pycurl-7.45.2.ebuild b/dev-python/pycurl/pycurl-7.45.2-r1.ebuild
index 90e842a05c23..ecba8bcffa7c 100644
--- a/dev-python/pycurl/pycurl-7.45.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.2-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
+IUSE="curl_ssl_gnutls +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
 # libcurl must not be using an ssl backend we do not support.
@@ -30,7 +30,7 @@ IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 DEPEND="
 	>=net-misc/curl-7.25.0-r1:=[ssl=]
 	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
 		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
 		curl_ssl_openssl? ( dev-libs/openssl:= )
 	)
@@ -43,7 +43,7 @@ BDEPEND="
 	test? (
 		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
 	)
 "
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 54b6a48bb215..acc9e9cc17d3 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,6 +1,2 @@
-DIST pydata-sphinx-theme-0.14.1.gh.tar.gz 2413022 BLAKE2B b4e707e1407839ba796a19f5aea73056a6520f1f39d7e17adb3442e03942a457082ce74fd3f4ab64af15b30254c6f7c80f522f0b4bcc9aa77db01bee287c4fdd SHA512 515fa2e0e301a092cd414472302b1ad2571983bc69a7cc4e617122a64f7b7f53c8b80a4328da13529840cbb1ab7cf3fb2c2ee99688a8deb87f19529c6c64067d
-DIST pydata-sphinx-theme-0.14.2.gh.tar.gz 2417334 BLAKE2B 2b4af7aa307ef46f268c11e7131218b4d7994e33d676cfa346c053f13da44fe770ed77526c4e4606fbbe7c1e6eb77decec4e57179831de00738b92a200658a83 SHA512 fd8a95c3a40c41343a90ddb6fdfaf1e247034ad629fa687824b55fd580b5bfcfc913701cf35223704bda5b3385a122d6e8653ec80d71c68bffedb194cc67ff5a
 DIST pydata-sphinx-theme-0.14.3.gh.tar.gz 2403167 BLAKE2B 272023dd877c2d61dfdd77564f1ea4c59d2db0fe81156440ff90b5b50352823db3836c4ac0b560c03950b69c1e8bdb868d1f42d96dc1eddbb35c060691201a64 SHA512 c4fbdf8efe327fb22812da0bb601c205ef0988f18e122db8fd1acba8fcde4c01519a7423a09df51f0a9d136f8b4ddde30427f04084724484a416658ee5c54878
-DIST pydata_sphinx_theme-0.14.1-py3-none-any.whl 3780482 BLAKE2B 58ebe2d3d176295bc335a176eeccd95859862e085f570c8ef6e80ade320d624fd6b2a94b6a2fab08211e520939bc651cd454bfe5037bc16104de2ecf295871e6 SHA512 7e9f76e2dfd7bd9049ae007b5af1ad65d61aa44f0c7370794856b664aa1a735dce65a1f0368fae0bb6049ee767e3ca0c4ca4f1ea6615858626c03e3a4ce81856
-DIST pydata_sphinx_theme-0.14.2-py3-none-any.whl 4680576 BLAKE2B a4bd57c90468ed2f073e581cce48e89011c21e328f4fab066f6ba4fe8fb31d3f8d161b9ecf372c3c4b9a2a9caf41dc38d35f36a02e0da072377c2f14cf7084d1 SHA512 f97e4cd650a2f42216900a22bb0fb699f6a2809b4277863979dc29906c707cfcc49b89add82211407bd5d3b1740526a27d3ca9f7141c02715dc2fcb03b692a04
 DIST pydata_sphinx_theme-0.14.3-py3-none-any.whl 4681432 BLAKE2B 21cfcebefaffedd1189fcc966e31bb6860dfb1d80e0eb4dc37dd47f55545c52c856545a439061524bbb3bbff638531b1b196bd11a9ecb2ac41202f086c82a0d8 SHA512 5844a39944442771b4744df075ab0155e8ef2d9f0a9f621be6ae4025c0f12b6462f9664674f05499a5f342dce1bacc530c5c916656ba3e6a9517770d3383be62
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.1.ebuild
deleted file mode 100644
index b411e7d2eca9..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 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} )
-
-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="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}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.2.ebuild
deleted file mode 100644
index 5305e2f85ace..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 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} )
-
-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="~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}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.3.ebuild
index 479603dd7ccf..53a2f146aca4 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.14.3.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/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 7d008402cb23..187310993d85 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,2 +1 @@
-DIST pyftpdlib-1.5.8.tar.gz 201963 BLAKE2B 5a957c207dcdc7c8d66d6ed4176cd12db019cf3d5247233db057b5c266a4fbda5e6e1c0b8ccdf33b4c154400d5d7a5e9a62ab9244f7c74c03c2f912a2ac0eb2f SHA512 2d4c4beb40d604d41eeed51f690b805377e84e594bdbb5d67135f50e5696824ba24aa9ae53aecced9f6c1b7eb3ec7727d31b883f9bbb0d2c43802277b2ef2aa6
 DIST pyftpdlib-1.5.9.tar.gz 204755 BLAKE2B f96e670a37023489a3f70f28d7e489633031f4c8dd34e6ece04a13a36a5de60f216dc267a80650c3f315a6a83081b1afc1b470c75ca18af5a80729a7ac363b98 SHA512 3efa07f5522cee89d2bf60c93b1315dfb149da622f34e043aca0ac1c4336c0a0885d7238123068401afa6988da9cbde6adfac78f08918d3a14e84c17ebb8b32f
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild
deleted file mode 100644
index cb729da53c79..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.8.ebuild
+++ /dev/null
@@ -1,61 +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} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="
-	https://github.com/giampaolo/pyftpdlib/
-	https://pypi.org/project/pyftpdlib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs pyftpdlib
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.9.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.9.ebuild
index bdb6be983eed..cb729da53c79 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.9.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pygccxml/pygccxml-2.4.0.ebuild b/dev-python/pygccxml/pygccxml-2.4.0.ebuild
index 1eeef48d7973..b87b428f685b 100644
--- a/dev-python/pygccxml/pygccxml-2.4.0.ebuild
+++ b/dev-python/pygccxml/pygccxml-2.4.0.ebuild
@@ -24,7 +24,6 @@ DEPEND="${RDEPEND}"
 distutils_enable_tests unittest
 distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 
-
 python_prepare_all() {
 	eapply -p0 "${FILESDIR}/${PN}-2.4.0-pyproject.patch"
 	eapply_user
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index d9ab93703370..e950e0a69346 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,2 +1 @@
-DIST pyopencl-2023.1.2.tar.gz 473684 BLAKE2B 3912885395df515f3e935149c0bac618c371b75791ac670d1a2cd25ffe5e3ff1c4d0e82d8a475e26d3280aaa659d900ed7df66b3f6952f54266d3cd2ad3b44c2 SHA512 3414b011f0bd0420df4725904b715d54bad0ae77cb4b8619d8d769cd25b56d44a8d34788c23de80b5da5ae757f38231db980f3abcb2544117b7be7627592bf0e
 DIST pyopencl-2023.1.4.tar.gz 473899 BLAKE2B 7d836d77b14f89b6dbf0dd2a189f3cb9442f224ff5c9c9db902aa93dc582278450b3d47576885bbe3738ee25f979a260d5c6f906366279adc30be7d3cc3545e1 SHA512 2508d21856d9b846bce14bcd11d007eedddc1cc5c1ce9f8d2ac18743ab9aa5d673c85792b535779b2f414caf47e39ed53c07d7ee8a061bcfa020a15f59463861
diff --git a/dev-python/pyopencl/files/pyopencl-2023.1.2_numpy-include-dir.patch b/dev-python/pyopencl/files/pyopencl-2023.1.2_numpy-include-dir.patch
deleted file mode 100644
index 7a5ce5f52bdc..000000000000
--- a/dev-python/pyopencl/files/pyopencl-2023.1.2_numpy-include-dir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/aksetup_helper.py
-+++ b/aksetup_helper.py
-@@ -43,11 +43,8 @@
- 
- 
- def get_numpy_incpath():
--    from imp import find_module
--    # avoid actually importing numpy, it screws up distutils
--    file, pathname, descr = find_module("numpy")
--    from os.path import join
--    return join(pathname, "core", "include")
-+    import numpy as np
-+    return np.get_include()
- 
- 
- class NumpyExtension(Extension):
diff --git a/dev-python/pyopencl/pyopencl-2023.1.2.ebuild b/dev-python/pyopencl/pyopencl-2023.1.2.ebuild
deleted file mode 100644
index 74e24d0e3cef..000000000000
--- a/dev-python/pyopencl/pyopencl-2023.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="
-	https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
-IUSE="examples opengl"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-COMMON=">=virtual/opencl-2"
-# libglvnd is only needed for the headers
-DEPEND="${COMMON}
-	opengl? ( media-libs/libglvnd )"
-RDEPEND="${COMMON}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	test? ( dev-libs/pocl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2023.1.2_numpy-include-dir.patch
-)
-
-distutils_enable_tests pytest
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_test() {
-	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
-	local -x PYOPENCL_TEST="portable:pthread"
-	# Set the number of threads to match MAKEOPTS
-	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
-	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
-	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
-	pushd test >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2023.1.4.ebuild b/dev-python/pyopencl/pyopencl-2023.1.4.ebuild
index ef7510513a89..ea1c99bba1c6 100644
--- a/dev-python/pyopencl/pyopencl-2023.1.4.ebuild
+++ b/dev-python/pyopencl/pyopencl-2023.1.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index ee6338d230b2..d126bfae49c6 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,5 +1,2 @@
-DIST pypdf-3.16.4.gh.tar.gz 7970008 BLAKE2B 86f622cf1ff6632a4645d564336fd8948970579f6bae241437701f333c2f336feab55f7e32a35b4f480577fe609958f492e73c1c9c5f1471af08e34c157f06b0 SHA512 7e7eb9759dfb3984b384a721e7d90ab5c666630bd3c56d936260e5ad93cfdc9a2d6fff8a7354764125923ab8f029ac5366a2750cc1151676fb40be1eba1bb2a4
-DIST pypdf-3.17.0.gh.tar.gz 7974585 BLAKE2B e09840119845cf6b14887081f367b2a7ff9a88e4713cd1a940276ca0f83b6497ee07336ff02e7c43571cb39782e72f4f0b206fb3f692476e98d5c291b0193a25 SHA512 31b0298c26c117764494906ef940cb8f111d5b57b91849fbffb6a63682089e5bc0c59a4c068c90810f5d21ce67c8d71fb0c42d996f441bc287ad73e0c4710d97
 DIST pypdf-3.17.1.gh.tar.gz 7975263 BLAKE2B 27b413dd5f127e22cc0116baeee62115f4b02b2ff39f27b8a7884af2389423c332114cfa826a090683c2ab6583b1a549ee1de775869eaaa0a09237aa52a65ebd SHA512 c23294a67bee6ef4e673c02b045c9ec2d3471f93bfc8530959a02289f94b0aa47e79b24bddd0603731c39ddc5197fc6fc10e668bbd1077a32ecdfc1d33740397
 DIST pypdf-sample-files-964fb47b0fbfa89864680582640ae4eedf143890.gh.tar.gz 11668924 BLAKE2B 0c7d8e7cfb2f9d06d7633d57b691ba473d33cfcb58d2f1f83661cef9d755340d05db8767771a385d0ba88aa904f84b8bc7eafdb5d4f614b7a21a2d138572316f SHA512 28070b575273b6fee3173e797ed5bac618f8e8aca16d0122dcf3b4b16cedbcad69b84a9bc4be65037695597bcc1fa7898cdf766c37915c49f880a0c6ca057e68
-DIST pypdf-sample-files-d87c33efc0f98225132dfe9c47980208b8130aa4.gh.tar.gz 11645535 BLAKE2B 3f96adaf4abc50a4390d9432878571a0ef9dd43dd34f307bb4bb6fd110d5ecdde988578860f110a6c8578cef96eac5410ded3204989fd20e6a6f1a84fac2fe83 SHA512 cb68a2eb06ef6738bef979f3b20c66fb925fbcb029cb22dfa5ea9b23b71ba07cb8e364e14eca34ebeb3b11e367c94738e32c9067b56b4da505bf77ab402abd06
diff --git a/dev-python/pypdf/pypdf-3.16.4.ebuild b/dev-python/pypdf/pypdf-3.16.4.ebuild
deleted file mode 100644
index 35a323de249c..000000000000
--- a/dev-python/pypdf/pypdf-3.16.4.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} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=d87c33efc0f98225132dfe9c47980208b8130aa4
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-	# TODO: requires fpdf
-	tests/test_page.py::test_compression
-	tests/test_writer.py::test_merging_many_temporary_files
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.17.0.ebuild b/dev-python/pypdf/pypdf-3.17.0.ebuild
deleted file mode 100644
index f3f1f074893f..000000000000
--- a/dev-python/pypdf/pypdf-3.17.0.ebuild
+++ /dev/null
@@ -1,59 +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} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=d87c33efc0f98225132dfe9c47980208b8130aa4
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-	tests/test_writer.py::test_remove_image_per_type
-	# TODO: requires fpdf
-	tests/test_page.py::test_compression
-	tests/test_writer.py::test_merging_many_temporary_files
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.17.1.ebuild b/dev-python/pypdf/pypdf-3.17.1.ebuild
index 5e613f48ddd5..35de9416f02e 100644
--- a/dev-python/pypdf/pypdf-3.17.1.ebuild
+++ b/dev-python/pypdf/pypdf-3.17.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
index 6b9b61b9ff97..400cf7a542e2 100644
--- a/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	<dev-python/pytest-8[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index edef33a078cb..3cfa6215a130 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1 @@
-DIST pytest_env-1.0.1.tar.gz 7565 BLAKE2B 26aa1c6a5d44bbe40266bbb62ca62c687dd1d85aed821c271f301ff27a97fdc753d2cdf5feba8b223b33b5b05bf39c55c3df0f1f8f7aae77335f2052a65df6c0 SHA512 422aaa78e25fad7b447f06358b772cacf22d5441ae0aaac22863877424f44703c1329813b068d901d4f2fb9df21bb08a5e4082504b76102d02dd15087d527a01
-DIST pytest_env-1.1.0.tar.gz 8640 BLAKE2B 384b438c6a5da2ddeac0be1a601b74eca77abbe5b5100322f9f161f5e68119980370aa1c8f8160ca9db53628209742afabd981678784e2c42a1f527344c39558 SHA512 12fb8d1093f9d9e89a2bb543428086cba04a322a4d443960d3ab33f270a3aa8f98585c334091d90febe3a5f4d4d66111dd5a8a5a7322185af10cae3eae14bfde
 DIST pytest_env-1.1.1.tar.gz 8625 BLAKE2B e455f4183a7c423895f69e8a598c2fd312594501855b650008960cd94757aed4e2cf96302974bd68777a4a75e4363e3facc77ac9ac8a79f11f709f172852d105 SHA512 dffe17d1e7a2f0a8d26fd13ebc5f87ee834f03cbcf9870899952c306bdefafd9b3bc8f6120142c22d82cace28ee6b681e40b8eb71cd3c77781bf56c269c28feb
diff --git a/dev-python/pytest-env/pytest-env-1.0.1.ebuild b/dev-python/pytest-env/pytest-env-1.0.1.ebuild
deleted file mode 100644
index a2e9d1290ddf..000000000000
--- a/dev-python/pytest-env/pytest-env-1.0.1.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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows you to add environment variables"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-env/
-	https://pypi.org/project/pytest-env/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pytest-env/pytest-env-1.1.0.ebuild b/dev-python/pytest-env/pytest-env-1.1.0.ebuild
deleted file mode 100644
index 051ff6dd53b2..000000000000
--- a/dev-python/pytest-env/pytest-env-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +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="pytest plugin that allows you to add environment variables"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-env/
-	https://pypi.org/project/pytest-env/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pytest-env/pytest-env-1.1.1.ebuild b/dev-python/pytest-env/pytest-env-1.1.1.ebuild
index 051ff6dd53b2..9cbae993334d 100644
--- a/dev-python/pytest-env/pytest-env-1.1.1.ebuild
+++ b/dev-python/pytest-env/pytest-env-1.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild
index 740f72b88fd5..b8c8387015ed 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-3.0.0.ebuild
@@ -7,22 +7,29 @@ DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYTHON_REQ_USE="tk"
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="Pytest plugin to run Xvfb for tests"
-HOMEPAGE="https://pypi.org/project/pytest-xvfb/"
+HOMEPAGE="
+	https://github.com/The-Compiler/pytest-xvfb/
+	https://pypi.org/project/pytest-xvfb/
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb]"
+	x11-base/xorg-server[xvfb]
+"
 
 distutils_enable_tests pytest
 
 python_test() {
-	epytest -p xvfb --runpytest=subprocess
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_xvfb
+	epytest --runpytest=subprocess
 }
diff --git a/dev-python/pytest/files/pytest-7.4.3-no-color.patch b/dev-python/pytest/files/pytest-7.4.3-no-color.patch
new file mode 100644
index 000000000000..a6fa02472252
--- /dev/null
+++ b/dev-python/pytest/files/pytest-7.4.3-no-color.patch
@@ -0,0 +1,37 @@
+From ce93a8ad7a11d1e9be76ce6af0d510f935622c1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 25 Nov 2023 12:09:32 +0100
+Subject: [PATCH] Reset color-related envvars for testing
+
+Reset color-related environment variables in a fixture to prevent them
+from affecting test results.  Otherwise, some of the tests fail
+e.g. if NO_COLOR is set in the calling environment.
+---
+ testing/conftest.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/testing/conftest.py b/testing/conftest.py
+index 2a3ce5203..612777304 100644
+--- a/testing/conftest.py
++++ b/testing/conftest.py
+@@ -30,6 +30,17 @@ def set_column_width(monkeypatch: pytest.MonkeyPatch) -> None:
+     monkeypatch.setenv("COLUMNS", "80")
+ 
+ 
++@pytest.fixture(autouse=True)
++def reset_colors(monkeypatch: pytest.MonkeyPatch) -> None:
++    """
++    Reset all color-related variables to prevent them from affecting internal pytest output
++    in tests that depend on it.
++    """
++    monkeypatch.delenv("PY_COLORS", raising=False)
++    monkeypatch.delenv("NO_COLOR", raising=False)
++    monkeypatch.delenv("FORCE_COLOR", raising=False)
++
++
+ @pytest.hookimpl(hookwrapper=True, tryfirst=True)
+ def pytest_collection_modifyitems(items):
+     """Prefer faster tests.
+-- 
+2.43.0
+
diff --git a/dev-python/pytest/pytest-7.4.3.ebuild b/dev-python/pytest/pytest-7.4.3.ebuild
index 85cf5375cd37..400496236c05 100644
--- a/dev-python/pytest/pytest-7.4.3.ebuild
+++ b/dev-python/pytest/pytest-7.4.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -49,6 +49,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# https://github.com/pytest-dev/pytest/pull/11638
+	"${FILESDIR}/${P}-no-color.patch"
+)
+
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
diff --git a/dev-python/python-magic/files/python-magic-0.4.27-fix-gzip-test.patch b/dev-python/python-magic/files/python-magic-0.4.27-fix-gzip-test.patch
deleted file mode 100644
index 9a978146f32d..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.27-fix-gzip-test.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457
-
-From 4ffcd59113fa26d7c2e9d5897b1eef919fd4b457 Mon Sep 17 00:00:00 2001
-From: Adam Hupp <adam@hupp.org>
-Date: Mon, 9 Jan 2023 12:55:15 -0800
-Subject: [PATCH] update test for upstream added gzip extensions
-
---- a/test/python_magic_test.py
-+++ b/test/python_magic_test.py
-@@ -134,7 +134,7 @@ def test_extension(self):
-             self.assert_values(m, {
-                 # some versions return '' for the extensions of a gz file,
-                 # including w/ the command line.  Who knows...
--                'test.gz': ('gz/tgz/tpz/zabw/svgz', '', '???'),
-+                'test.gz': ('gz/tgz/tpz/zabw/svgz/adz/kmy/xcfgz', 'gz/tgz/tpz/zabw/svgz', '', '???'),
-                 'name_use.jpg': 'jpeg/jpg/jpe/jfif',
-             })
-         except NotImplementedError:
-@@ -227,6 +227,5 @@ def test_pathlike(self):
-         m = magic.Magic(mime=True)
-         self.assertEqual('application/pdf', m.from_file(path))
- 
--
- if __name__ == '__main__':
-     unittest.main()
-
diff --git a/dev-python/python-magic/files/python-magic-0.4.27-test.patch b/dev-python/python-magic/files/python-magic-0.4.27-test.patch
new file mode 100644
index 000000000000..a4e94251fe9f
--- /dev/null
+++ b/dev-python/python-magic/files/python-magic-0.4.27-test.patch
@@ -0,0 +1,69 @@
+https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457
+
+From 4ffcd59113fa26d7c2e9d5897b1eef919fd4b457 Mon Sep 17 00:00:00 2001
+From: Adam Hupp <adam@hupp.org>
+Date: Mon, 9 Jan 2023 12:55:15 -0800
+Subject: [PATCH] update test for upstream added gzip extensions
+
+--- a/test/python_magic_test.py
++++ b/test/python_magic_test.py
+@@ -134,7 +134,7 @@ def test_extension(self):
+             self.assert_values(m, {
+                 # some versions return '' for the extensions of a gz file,
+                 # including w/ the command line.  Who knows...
+-                'test.gz': ('gz/tgz/tpz/zabw/svgz', '', '???'),
++                'test.gz': ('gz/tgz/tpz/zabw/svgz/adz/kmy/xcfgz', 'gz/tgz/tpz/zabw/svgz', '', '???'),
+                 'name_use.jpg': 'jpeg/jpg/jpe/jfif',
+             })
+         except NotImplementedError:
+@@ -227,6 +227,5 @@ def test_pathlike(self):
+         m = magic.Magic(mime=True)
+         self.assertEqual('application/pdf', m.from_file(path))
+ 
+-
+ if __name__ == '__main__':
+     unittest.main()
+
+From b434c88c9c8e901adf5b3779e3aac65f10d90aab Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Wed, 2 Aug 2023 11:29:47 +0200
+Subject: [PATCH 1/2] Fix test suite with file 5.45
+
+[   12s] test/python_magic_test.py:53: in assert_values
+[   12s]     self.assertIn(value, expected_value)
+[   12s] E   AssertionError: 'PDF document, version 1.2, 2 page(s)' not found in ('PDF document, version 1.2', 'PDF document, version 1.2, 2 pages')
+---
+ test/libmagic_test.py     | 2 +-
+ test/python_magic_test.py | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/test/libmagic_test.py b/test/libmagic_test.py
+index 5719a58..7b4665b 100644
+--- a/test/libmagic_test.py
++++ b/test/libmagic_test.py
+@@ -15,7 +15,7 @@ class MagicTestCase(unittest.TestCase):
+     filename = os.path.join(TESTDATA_DIR, 'test.pdf')
+     expected_mime_type = 'application/pdf'
+     expected_encoding = 'us-ascii'
+-    expected_name = ('PDF document, version 1.2', 'PDF document, version 1.2, 2 pages')
++    expected_name = ('PDF document, version 1.2', 'PDF document, version 1.2, 2 pages', 'PDF document, version 1.2, 2 page(s)')
+ 
+     def assert_result(self, result):
+         self.assertEqual(result.mime_type, self.expected_mime_type)
+diff --git a/test/python_magic_test.py b/test/python_magic_test.py
+index 624a443..78f63a3 100755
+--- a/test/python_magic_test.py
++++ b/test/python_magic_test.py
+@@ -108,7 +108,8 @@ class MagicTest(unittest.TestCase):
+             self.assert_values(m, {
+                 'magic._pyc_': 'python 2.4 byte-compiled',
+                 'test.pdf': ('PDF document, version 1.2',
+-                             'PDF document, version 1.2, 2 pages'),
++                             'PDF document, version 1.2, 2 pages',
++                             'PDF document, version 1.2, 2 page(s)'),
+                 'test.gz':
+                     ('gzip compressed data, was "test", from Unix, last '
+                      'modified: Sun Jun 29 01:32:52 2008',
+-- 
+2.43.0
+
diff --git a/dev-python/python-magic/python-magic-0.4.27.ebuild b/dev-python/python-magic/python-magic-0.4.27.ebuild
index 8f286080496f..8213ad8ba1bd 100644
--- a/dev-python/python-magic/python-magic-0.4.27.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.27.ebuild
@@ -32,7 +32,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-gzip-test.patch
+	# upstream git backports
+	"${FILESDIR}"/${P}-test.patch
 )
 
 distutils_enable_tests unittest
diff --git a/dev-python/pythran/pythran-0.14.0.ebuild b/dev-python/pythran/pythran-0.14.0.ebuild
index 2328bc8f855e..b7b4f42cb2b2 100644
--- a/dev-python/pythran/pythran-0.14.0.ebuild
+++ b/dev-python/pythran/pythran-0.14.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.4.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.4.0.ebuild
index f129e3823cde..ca1ed26a02ab 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.4.0.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.4.0.ebuild
@@ -18,7 +18,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"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rpds-py/rpds-py-0.10.6.ebuild b/dev-python/rpds-py/rpds-py-0.10.6.ebuild
index e5a8ff1ea3e3..7617a40bca35 100644
--- a/dev-python/rpds-py/rpds-py-0.10.6.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.10.6.ebuild
@@ -63,7 +63,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
diff --git a/dev-python/scipy/scipy-1.11.3-r1.ebuild b/dev-python/scipy/scipy-1.11.3-r1.ebuild
index 273c26126483..ead92c4437ea 100644
--- a/dev-python/scipy/scipy-1.11.3-r1.ebuild
+++ b/dev-python/scipy/scipy-1.11.3-r1.ebuild
@@ -38,7 +38,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 	fi
 fi
 
diff --git a/dev-python/scipy/scipy-1.11.4.ebuild b/dev-python/scipy/scipy-1.11.4.ebuild
index 32cf4857bc4d..e6eae3c007d9 100644
--- a/dev-python/scipy/scipy-1.11.4.ebuild
+++ b/dev-python/scipy/scipy-1.11.4.ebuild
@@ -38,7 +38,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/dev-python/selenium/selenium-4.14.0.ebuild b/dev-python/selenium/selenium-4.14.0.ebuild
index 32c35d017e5a..b01f59e96707 100644
--- a/dev-python/selenium/selenium-4.14.0.ebuild
+++ b/dev-python/selenium/selenium-4.14.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index fa962c62ce15..9336fa484571 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,3 @@
-DIST sentry-python-1.31.0.gh.tar.gz 399341 BLAKE2B e5162a619335bd7e089ed01c938d29233b5a19315f11e414a1e51d4539ea3a371a3dd743ad0dafedaff7bf8ca801855e016ea62d38a02fcab8702c8fbf879e0b SHA512 29504e3f94d994512e52c18df7dc156fcf86a67e68c2f11f0be007577b61e4a3b606cf7b58ef0488c3b764fa9193d8f7672e2c9515c0099a9a44574fd8c5c07e
-DIST sentry-python-1.32.0.gh.tar.gz 422326 BLAKE2B f2753d958599462a3b6134872072ccfbca0e2dbeedffeffb2c430c46c3ea19cdbd9add0789cd77b0971444edcc1d87f2082f33b5bd8798c81ca226ac92d565c6 SHA512 ff29adb1b0fdec3864c2291ddea533e4aa5b8cd1d5ba7381954cd4d3f873a47c58fd7b6997479552e43e229a5e282d61c926185b79266801f731a3c4289c83c0
-DIST sentry-python-1.33.1.gh.tar.gz 431232 BLAKE2B 8f08e2ae58fa7d55384be9102a6f2f70eea550c6b53794013ff7326a0dd32358782db1e0c15b9837c688a85dae36f16538bc2d7c1516c1de4e75aa5c1ee35d55 SHA512 e86d20f1d8736175340bfd850560055342fd234709d1c4c5f931274e2e0d31b6bc0bb559593aff2ec4aaf508aefb0d8e1025d8eedc1dbb2d13c41b019721ce9f
-DIST sentry-python-1.34.0.gh.tar.gz 432143 BLAKE2B d5a1376e88b4377ee0f416229364586cd69d76a72a31f1d7a5128c5aba6988d5cbfaf405afa39d52926ba64c0b29b48577d8e102427aec08dead41356a3dbbf5 SHA512 b4d6d4751bde829aca7cec418d46fb5ac44d59bcfd71e4b6e3057b70ea38e96dc3eeaa3b8ce61f9d7d0ccc9845ba741c9aacdc58e6fea56c1f33b5c39118c35f
 DIST sentry-python-1.35.0.gh.tar.gz 438978 BLAKE2B 84d016fd24895eab240d97d99c5ac11f332f72c487b82205680513103d5a684ad25b4dbb6fe7863d681c965239079f1208b660a48bc21e508b57db04466e91b7 SHA512 fb136cb0542a9ca7db7e5bbcfe6178cdee90b80c634c9f1f54ad769b403fbe48ab9f23f66e33c1b7cc0f22d53811c0b1ae767604df5f2209c3568eebdc643b6a
-DIST sentry-python-1.36.0.gh.tar.gz 441169 BLAKE2B c338de881abf5bce90ec72e48c5378d269a258a07ca6dc30327590c98fb15a6a8b7cb57db055ef73df7b2cb35bc429f5dbb43fe42fb91f0c1c9b720f4d456cb7 SHA512 4ec1886875156877fed18618d6997e46850e9548f82706dbcc76989779b5d94054e588032b0f2b1a7fbc6370dd1c93169b77d8ed05a875854a858f7e63d8514c
 DIST sentry-python-1.37.0.gh.tar.gz 447094 BLAKE2B 74299d4efb1842965facbb9d6a957f21c42909eac26545d2b4838be83641049cb277d6525052209e9c7d4d3801b99f75d7350c29b18c2e3909e16e7246056967 SHA512 6dd5be6561075646967c1b7b1fd9eeaf07fe45cd71a64898265d49b3a89a5ffcc3a0ceea8698e389b9e57f0dbe42073c6d3df947dc8bfd46cc3e269330dbe3a4
+DIST sentry-python-1.37.1.gh.tar.gz 447142 BLAKE2B 16e495a69e4757520e4fa9854248f7fdd31056489b016d86a0f087b7a709fa70a1f9cf655c4e319e8a69cdedd138c34864d03907a7423be329dbd00f66a2c568 SHA512 193d20949ce87dc530bbc97a522fd0c8566ccd2d2f14287c8e903dd39bb8a19af7aa59de0bcb90f06375353c79cbc19af704a17844b2073860bc879d2b551542
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild
deleted file mode 100644
index bbde2b4b34a0..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.31.0.ebuild
+++ /dev/null
@@ -1,123 +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=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/stdlib/test_httplib.py
-		tests/integrations/flask/test_flask.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-		# fastapi is not packaged
-		tests/integrations/asgi/test_fastapi.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: causes breakage in other tests
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-		tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-		# TODO
-		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-		tests/test_profiler.py::test_sample_buffer
-		tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-		tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-		tests/test_profiler.py::test_thread_scheduler_single_background_thread
-		# broken with py3.11, *shrug*
-		tests/test_profiler.py::test_extract_stack_with_max_depth
-		# TODO
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-		tests/test_scrubber.py::test_span_data_scrubbing
-		# this is not even funny
-		tests/integrations/modules/test_modules.py::test_installed_modules
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.32.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.32.0.ebuild
deleted file mode 100644
index 78425523d4e7..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.32.0.ebuild
+++ /dev/null
@@ -1,123 +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=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/stdlib/test_httplib.py
-		tests/integrations/flask/test_flask.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-		# fastapi is not packaged
-		tests/integrations/asgi/test_fastapi.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: causes breakage in other tests
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-		tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-		# TODO
-		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-		tests/test_profiler.py::test_sample_buffer
-		tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-		tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-		tests/test_profiler.py::test_thread_scheduler_single_background_thread
-		# broken with py3.11, *shrug*
-		tests/test_profiler.py::test_extract_stack_with_max_depth
-		# TODO
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-		tests/test_scrubber.py::test_span_data_scrubbing
-		# this is not even funny
-		tests/integrations/modules/test_modules.py::test_installed_modules
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.33.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.33.1.ebuild
deleted file mode 100644
index 1f658bce93ec..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.33.1.ebuild
+++ /dev/null
@@ -1,125 +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=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/stdlib/test_httplib.py
-		tests/integrations/flask/test_flask.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-		# fastapi is not packaged
-		tests/integrations/asgi/test_fastapi.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: causes breakage in other tests
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-		# requires AWS access
-		tests/integrations/aws_lambda
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-		tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-		# TODO
-		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-		tests/test_profiler.py::test_sample_buffer
-		tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-		tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-		tests/test_profiler.py::test_thread_scheduler_single_background_thread
-		# broken with py3.11, *shrug*
-		tests/test_profiler.py::test_extract_stack_with_max_depth
-		# TODO
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-		tests/test_scrubber.py::test_span_data_scrubbing
-		# this is not even funny
-		tests/integrations/modules/test_modules.py::test_installed_modules
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.34.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.34.0.ebuild
deleted file mode 100644
index 1f658bce93ec..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.34.0.ebuild
+++ /dev/null
@@ -1,125 +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=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/stdlib/test_httplib.py
-		tests/integrations/flask/test_flask.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-		# fastapi is not packaged
-		tests/integrations/asgi/test_fastapi.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: causes breakage in other tests
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-		# requires AWS access
-		tests/integrations/aws_lambda
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-		tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-		# TODO
-		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-		tests/test_profiler.py::test_sample_buffer
-		tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-		tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-		tests/test_profiler.py::test_thread_scheduler_single_background_thread
-		# broken with py3.11, *shrug*
-		tests/test_profiler.py::test_extract_stack_with_max_depth
-		# TODO
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-		tests/test_scrubber.py::test_span_data_scrubbing
-		# this is not even funny
-		tests/integrations/modules/test_modules.py::test_installed_modules
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.36.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.37.1.ebuild
index 49a19074e826..b88980e73c5d 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.36.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.37.1.ebuild
@@ -118,7 +118,7 @@ python_test() {
 		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
 		tests/test_scrubber.py::test_span_data_scrubbing
 		# this is not even funny
-		tests/integrations/modules/test_modules.py::test_installed_modules
+		tests/test_utils.py::test_installed_modules
 		# flaky hypothesis stuff
 		tests/test_serializer.py::test_bytes_serialization_repr_many
 		# TODO
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 42b518c7294b..9317da98f9a1 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-doxylink-1.12.2.gh.tar.gz 23556 BLAKE2B 8d71de83ec304bbf2a74f414c46d157367fc950dc52bab7f685fba24520985fb06daf8bf760d49d73d7a2418da346bf6c84a493b24edef4ab53c5c09799f7c2e SHA512 e90594031067eed0eec1c7aad9c7d2ba7d9a4ce2012a905f6631947a7135659483d52a6261b923d3fa21fcde59ae8bf24c168507c8e95296e0539595e9589ed2
 DIST sphinxcontrib-doxylink-1.12.3.gh.tar.gz 23632 BLAKE2B 4a80366f4beeb9715c69c221a8e5247c28179613b59fb7bdadb1f145b69e4afdc0c2c30affd9647ec9e56e892503a95d018fd97eda014980177282299b81d61f SHA512 d25003dab35c6877bc846552db3e663c660bd5cb6ac6d9077bf04eca32afe0f9559118390c5c884901ce8c5297e97d84f6089428e3173123da6e7869a606a05e
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
deleted file mode 100644
index 49e4ba47c617..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild
index c8a07e59eb15..49e4ba47c617 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 6e0d03d61165..cbb82d763777 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,2 +1 @@
-DIST stestr-4.0.1.tar.gz 111695 BLAKE2B e9ced9237f3c889c2eb116b51645a6d8b86d8085e2991b421b8955772225342325eb66276f43e710a57d79392974cc42072e0a05b7022c666181b9ca66d51735 SHA512 a74b9278b1941da62af58a087a10e5a0624901ceb81dcdd25eab3a05f003756773551fe6eec46dfb371f7b726cf296abfe0116444fb32c94fb6811440ee22a58
 DIST stestr-4.1.0.tar.gz 113187 BLAKE2B 6bd423aaad6189c90fe9b43db9390e85a5f458cfa899c33bd34b1340ca7f111d2edd2981d9c664d63ec6b880a904b08a26c09c332548ac5f2ebdabd2bad6a00a SHA512 77287ffdfe59042c4d189aa6c662df4357633d3a134ea60a4533b5b8b1b433ffd6f265a430977da175f242cc1c8e8514f876a486cc900a436cf93ab629fe7b7d
diff --git a/dev-python/stestr/stestr-4.0.1.ebuild b/dev-python/stestr/stestr-4.0.1.ebuild
deleted file mode 100644
index e1f0794b7bf9..000000000000
--- a/dev-python/stestr/stestr-4.0.1.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
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="A parallel Python test runner built around subunit"
-HOMEPAGE="https://github.com/mtreinish/stestr"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	stestr init || die
-	stestr run || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stestr/stestr-4.1.0.ebuild b/dev-python/stestr/stestr-4.1.0.ebuild
index 804bee6e6b50..8a40ff6807fe 100644
--- a/dev-python/stestr/stestr-4.1.0.ebuild
+++ b/dev-python/stestr/stestr-4.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/svg-path/svg-path-6.3.ebuild b/dev-python/svg-path/svg-path-6.3.ebuild
index 9b8fac46da20..945b7b3862ec 100644
--- a/dev-python/svg-path/svg-path-6.3.ebuild
+++ b/dev-python/svg-path/svg-path-6.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/time-machine/time-machine-2.13.0.ebuild b/dev-python/time-machine/time-machine-2.13.0.ebuild
index 0fa8759aac7e..775a1c3c4caa 100644
--- a/dev-python/time-machine/time-machine-2.13.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index ed1a9dcf9629..f5c1183e9ee4 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1 @@
-DIST traitlets-5.11.2.tar.gz 157726 BLAKE2B 80354e3375ca50242222e3074a2e8ea9f836f4a828224b234bc6ecdd648bd3c8d3a526c2a4d1c003991e30bb229cd0e01ac0c0889f789788705cc78fb76a7303 SHA512 2194599110bef3f63f24a31331c4f823c5a31664f670198398519fbed0801904b8353aa1ff9458b2cc097fd0725bcba41135b72a001df2419dc5ab6c39b9685a
-DIST traitlets-5.12.0.tar.gz 158618 BLAKE2B f32a75222cdd0d69944f582c9d64833146905a2e8757651cdd17732463b39733f3639e23685f6d98120fef9d0c0b9f83d478da225772cb20565df5c00a82e05c SHA512 944b509d39246123e76d87b50c43421bed7d293ce3da15d46eb9c9bdd93fecc8b57ec457c11397f346839a79d6434dc381183926975e105a1f657f9e414d3ef0
 DIST traitlets-5.13.0.tar.gz 159818 BLAKE2B d681d293783044a8523512fc82994402ab7892f0adbc9d483ab4548e9b7f3491ace911a74529533a1ae7bcb3639fb50370b48647c96085da6a31a34e46777dbf SHA512 5fc084862e2d99593fadd69711f1bb9403ef92bc1d0e0f944eb1546f107e30763e7164d7be5f83c22e846bae51129376b5d14cb52251d782c50be571f29451b5
diff --git a/dev-python/traitlets/traitlets-5.11.2.ebuild b/dev-python/traitlets/traitlets-5.11.2.ebuild
deleted file mode 100644
index 79183cae0789..000000000000
--- a/dev-python/traitlets/traitlets-5.11.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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="
-	https://github.com/ipython/traitlets/
-	https://pypi.org/project/traitlets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/argcomplete-2.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/traitlets/traitlets-5.12.0.ebuild b/dev-python/traitlets/traitlets-5.12.0.ebuild
deleted file mode 100644
index 92724ed213d0..000000000000
--- a/dev-python/traitlets/traitlets-5.12.0.ebuild
+++ /dev/null
@@ -1,40 +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="A configuration system for Python applications"
-HOMEPAGE="
-	https://github.com/ipython/traitlets/
-	https://pypi.org/project/traitlets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/argcomplete-2.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_typing.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/traitlets/traitlets-5.13.0.ebuild b/dev-python/traitlets/traitlets-5.13.0.ebuild
index 245a8c2e605d..beae36b7d61b 100644
--- a/dev-python/traitlets/traitlets-5.13.0.ebuild
+++ b/dev-python/traitlets/traitlets-5.13.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/twisted/twisted-23.10.0.ebuild b/dev-python/twisted/twisted-23.10.0.ebuild
index ed4e016b7aaf..b362a049736f 100644
--- a/dev-python/twisted/twisted-23.10.0.ebuild
+++ b/dev-python/twisted/twisted-23.10.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index 90599ba7c174..ab589b0de01e 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -1,5 +1 @@
-DIST unearth-0.10.0.tar.gz 270997 BLAKE2B 8b18df4616fc72025492aa187101bc1f338967b1738ef9ec33d16cbd906c1cf91c1b84e391538521b4a9d6ea40301eb0b7ed0926aa4e6c4d6ffc57401f9d78d9 SHA512 98799202939e1206b6fdd46eb61947c9f9f8068a6857f76aace8dd2c67a3fad9dd3b7a5232d7812b0dcd214c39a9e2a6fafbd18cbfeb9aa4c216571b88b3f131
-DIST unearth-0.11.0.tar.gz 271154 BLAKE2B 405c97ef152afb241cb70d9b309fd1ac454be932c96f95b606bb6038ffb2369fbc55c6afabd86f6a15949182de276dcda035fdb17d4810933286a0fa0b567e42 SHA512 70a06a32f6f2ca74c16a55f9613b543d807e437bd99c0ebb02c0d721144cf45208df78940ee41911a8168c9181ec733b9aec2176038b2556d0e2ad5e8c2cc0d4
-DIST unearth-0.11.2.tar.gz 271479 BLAKE2B c3c3f6bfb3f207eb9a7d7667d966efb84e316579ebffc833e94664c089f0c92bc4915f62a07b53b79aa9f43098080231a3644808bf35172df407cd80a7be9096 SHA512 6ec961456640fe3ca8922e0ee83ecadb6b6fa3dd7b5977a228111ad3ad2d79782eb75d76d4a7066c29f53ce023471c2a38d9f587c35f8d04bb0704bdd6406f71
-DIST unearth-0.12.0.tar.gz 280152 BLAKE2B 34890189f34ae6c2fa25c4350f6b5f74da5f77be6c7000fdd15e33759eace10f3e5a269c21d59bb7c21593ff502a2a9142a8665338940da3a28946218a27bc57 SHA512 54cad14382c8218f8d0e69738ca0302cb9102cd5255fb6a90a303030c9f5da8c33b8527bd0e43aa7cc334740de06642e24dca75b2e092c8b85f7adba1f7e2ab8
 DIST unearth-0.12.1.tar.gz 280628 BLAKE2B 2f96c818f5744b228d11d81fac8fb69da4df685b221f3a77424a1eb1d584e154798974ad4548c6f4264faa98f52cddeb94249e1c7e21136c50c08d97446149b6 SHA512 f726562191a3f2b9c189d16223b86307d79f0ca9e251c155e7acbc92160bed834c78064fbc5d745cd90b84ccd6eb2a24c737018fd670474921db0c7d15480576
diff --git a/dev-python/unearth/unearth-0.10.0.ebuild b/dev-python/unearth/unearth-0.10.0.ebuild
deleted file mode 100644
index 998228cf9626..000000000000
--- a/dev-python/unearth/unearth-0.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/unearth/unearth-0.11.0.ebuild b/dev-python/unearth/unearth-0.11.0.ebuild
deleted file mode 100644
index 16c225b5a463..000000000000
--- a/dev-python/unearth/unearth-0.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver
-}
diff --git a/dev-python/unearth/unearth-0.11.2.ebuild b/dev-python/unearth/unearth-0.11.2.ebuild
deleted file mode 100644
index 16c225b5a463..000000000000
--- a/dev-python/unearth/unearth-0.11.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver
-}
diff --git a/dev-python/unearth/unearth-0.12.0.ebuild b/dev-python/unearth/unearth-0.12.0.ebuild
deleted file mode 100644
index 16c225b5a463..000000000000
--- a/dev-python/unearth/unearth-0.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 3f0f487c715d..e158daaf2d66 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1 @@
-DIST virtualenv-20.24.5.tar.gz 7119883 BLAKE2B bc4a0e81feeac8975f259b329f223a286be41af11c9a8f27b68b6a42611668942ba18b691a848195609e47695e3104602d6563cabb930d7fed9f07cc57d2468e SHA512 f77961ed26c3e7314f26c0c18d41ab843572b0a1d157eb7b5e51f955a289da8ecf633d2ad9c936b9292e5b06e4ce9f5b11a100681fbb63dd1fb9fc9bef37f4c4
-DIST virtualenv-20.24.6.tar.gz 7140367 BLAKE2B 7a98219cc7933431720e3105b9e94efe7622ecf769ae7a8a9be45253e6cbd0978a653e341586936428bbe271c25a90aa93aebdc423b0eeafad67dd0394fbea5a SHA512 cd09d05490b22c26220b48566e6df860cc135d142e9a390f85ed920a26f4ca2c0ca129b0b190fb9cb46ed0e2711231aa5966ae73ceabc1e3fa7812b63fc5c53b
 DIST virtualenv-20.24.7.tar.gz 7141024 BLAKE2B 1125960c3a0b84f1350a9b427e6387dacbf2b2c5ef827bd21d61b5b0fd2e0c81c01b452390b1ec96ed139ed42d3f061394c82227c06a873bca9c21bd5a8fcfbc SHA512 fdfa763f026665cf8bd624192f71853c00b22f0b34f4bf4cd629c928a3c666f60d3dd7ee10c3c46b9a8b383cce51015c5fdeb891e9c6033b02563686d5e7790e
diff --git a/dev-python/virtualenv/virtualenv-20.24.5.ebuild b/dev-python/virtualenv/virtualenv-20.24.5.ebuild
deleted file mode 100644
index cdf118998f1e..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.5.ebuild
+++ /dev/null
@@ -1,106 +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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.24.6.ebuild b/dev-python/virtualenv/virtualenv-20.24.6.ebuild
deleted file mode 100644
index 5c6690341529..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.6.ebuild
+++ /dev/null
@@ -1,114 +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 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/virtualenv/virtualenv-20.24.7.ebuild b/dev-python/virtualenv/virtualenv-20.24.7.ebuild
index f19cbe98b01e..6eeaf0911d56 100644
--- a/dev-python/virtualenv/virtualenv-20.24.7.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.24.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/xarray/xarray-2023.11.0.ebuild b/dev-python/xarray/xarray-2023.11.0.ebuild
index 42bd64588396..052f8033ecd8 100644
--- a/dev-python/xarray/xarray-2023.11.0.ebuild
+++ b/dev-python/xarray/xarray-2023.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="big-endian"
 
 RDEPEND="
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-11-25 18:33:43 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-11-25 18:33:43 +0000
commit	ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5 (patch)
tree	a2a08f53c54c7fad4ae80451e00faac327ab47ac /dev-python
parent	5e3f5cbdaa0b307a5bbed30104624a723ac81025 (diff)
download	baldeagleos-repo-ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5.tar.gz baldeagleos-repo-ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5.tar.xz baldeagleos-repo-ea0f4ccc747e37b64ab9dc7ef92a8fabb7c5b0c5.zip