Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-03-25 12:23:53 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-03-25 12:23:53 +0000
commit: e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa (patch)
tree: 5fd8d31889cd922cb12a8ea0f478d38e4955167f /dev-python
parent: 820942d62f75419e6e7bb336ba33cf77910000de (diff)
download: baldeagleos-repo-e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa.tar.gz
baldeagleos-repo-e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa.tar.xz
baldeagleos-repo-e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa.zip
168 files changed, 837 insertions, 3211 deletions
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 05a1fe131dc7..eb771d6a76bb 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1 @@
-DIST PyGithub-1.57.gh.tar.gz 3159952 BLAKE2B e753a72c0fe20f0697ff3246fd2c3445571079ae18bee50abf6543da51d9e889c67cafa0bf36a980223f3423cf880c36d24ce74a6bf245117a080186a209ddcb SHA512 6c8880d21c5134581be6bc5549184c3f13cef8f360a46a459234f22f3dd4fc5f8b573cc3a5d870bba6c6129ff7b670e739d87e42f2e34ddcdf357a3fe2b3cadc
-DIST PyGithub-1.58.0.gh.tar.gz 3172006 BLAKE2B a1d71c11a359d296fbf895a1fc3c9f60490b7c63fd65c92a3a025c2b306ca281a03cf65d49a1dcca5bb0a9c537b130f5ef7bd9ab594f1521a106857f83669f65 SHA512 cbaca0d116be56f6d44084892e52b7073378743178342a480c2b3990542e476bee52947d56f8be950d05d5c06fb8eaeb32acb35285c79e0cbbd8b24239af6cba
 DIST PyGithub-1.58.1.tar.gz 3171074 BLAKE2B e1397db839b2fc194fc67d9ac47adf9faa4a087c9350596e243d8d763a05d50ee1f9b03192bc5b88c0c94893c8d39b798efd07d0c2c8c597072c65306339c03a SHA512 97e316d8bcd47546da2f64afe462b51d183a5385544a57963585a179d844e12865c7b87f08c507c4d3d8c0397a7f98acd84c17f45e9668722459c4c2cc328363
diff --git a/dev-python/PyGithub/PyGithub-1.57.ebuild b/dev-python/PyGithub/PyGithub-1.57.ebuild
deleted file mode 100644
index 1768dcfd92fb..000000000000
--- a/dev-python/PyGithub/PyGithub-1.57.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=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="
-	https://github.com/PyGithub/PyGithub/
-	https://pypi.org/project/PyGithub/
-"
-SRC_URI="
-	https://github.com/PyGithub/PyGithub/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.58.0.ebuild b/dev-python/PyGithub/PyGithub-1.58.0.ebuild
deleted file mode 100644
index 5ad78d5f92e7..000000000000
--- a/dev-python/PyGithub/PyGithub-1.58.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=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="
-	https://github.com/PyGithub/PyGithub/
-	https://pypi.org/project/PyGithub/
-"
-SRC_URI="
-	https://github.com/PyGithub/PyGithub/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.58.1.ebuild b/dev-python/PyGithub/PyGithub-1.58.1.ebuild
index c22ebb71ed44..97685ed6fe03 100644
--- a/dev-python/PyGithub/PyGithub-1.58.1.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.58.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # cryptography via pyjwt[crypto]
 RDEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 96d3f96b9560..92a78a89a879 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,3 @@
-DIST boto3-1.26.84.gh.tar.gz 612921 BLAKE2B cf98272681299aa11454d65a6bf8bc6aa28244803e3d448f01425e62bb5dc01d93e0790ecaf6b2949ea1978130782f5ac282766c8fea94682e33b0cec65e2148 SHA512 d72117cb2f258fccf4a25e201a2dad8e13e8a80a03859edec2f27da01209185cbbb2f02a7924819214a612c6f6d3758ba0aba0047fab1cced3312d1662a7482b
 DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
-DIST boto3-1.26.93.gh.tar.gz 617542 BLAKE2B 08f045cdac7c977d9a575ca7f487314baf6f358e82b13ff3a2063d85ed23aa98c38445d444ce78730b01381fe04eb5bd5909868a5e01a529d2028c065294714b SHA512 9af0dad9189030bbd310b634af80b731799166d89c561d640308ae913c1f81f0ce50e1a0c303bff974006281be03125e454495936cca30db3cf33a4d95d66783
 DIST boto3-1.26.94.gh.tar.gz 617861 BLAKE2B 908b40868735038810cf75c903bbc8bad00a6ea8776b2a5a236683f18f2185971f8a13db5349086b1aef2c4d51361c8ebf30f2d671cea7f4101c9882a59b6acf SHA512 036278668afa33dfdaab9cc2e02c2c3e0596ec1c1b407767f22bc6a4cd87913f883f85430ff6a120c5e0fdd2194b70c911fe7a207bc26ed5fcd415f3754cde35
-DIST boto3-1.26.95.gh.tar.gz 623665 BLAKE2B d1d979210e22d4d39eff7148711be28ceb80b26409567c1d23f67a523667276c3a6b2a79519f89bed6d72c8cd4c8a9e04ad886805de51605c1fefcf45cebd08b SHA512 0147714fc05e5b8cab29ac66d9701fc3f64623f84a800597478133dd20f3637f15471a8cd63fc88820a7229b425843731e00470eb66106cdf525da5ce0ff3091
-DIST boto3-1.26.96.gh.tar.gz 624075 BLAKE2B 6603922e29464733f0e2c59f7df5b5ca9d0092e69ab9d70bb64248ccc6c522a543ec14a480b62aeaaf26b3802867ded3ce054bb5caa37a0bd909e805cce6c422 SHA512 db5740b305d667028c0724555575d7ca21afa4f7ae634159dd5379d3907539964068120eb4011184ab63749302884a8ad4cd80fc0de9d69fd01c6f64ab3ee379
-DIST boto3-1.26.97.gh.tar.gz 624442 BLAKE2B dc9097ae0aa58968d554126d44a6ed9320a62ad53c133bf5c28d44bae8215d6c4b4b0a7740834e22aae229b6103e8f28853b957dac863c6da5638bb37a5ef56e SHA512 b1be47759205ac9e2559d4bfb70a96f55f54ce384e64f8af10d2a63022ef2eae99499059a32f773f994b02a2d5a498436f2619a39eca96067c867941aec4485e
-DIST boto3-1.26.98.gh.tar.gz 625624 BLAKE2B df4222d342acd51785150b5ec96c40e7b730636ec57bc4c825ad7d1b5a3e1daf9fe70accdcba171a0c8d3027ee7d24c44ba8f36c325d275bcdd8bcc1ab04f59d SHA512 2fc1bce20ba0b6300f2dd9836188eac448d26ec07c00064ea5e62dfbe0f90ef39e3732f23242699d447d98982cbcaf5e257a7e6a80b9c0b945256ebedde88c61
+DIST boto3-1.26.99.gh.tar.gz 625932 BLAKE2B 961a640995abdafbf2cd73f83ed5af0e1314cebbc5dc154771204e7c16532ad4a84aed08cbd7789af30de518bf2e8bd5204e9a540a2d3a08e75222c2eeb9a68a SHA512 ff726483a83a11a8c088905998af0a1a791e87503b39422811d82b3122275a24eb955636407422af7552908eee22d4c1369779a7798f09f958a8af5234c0c11d
diff --git a/dev-python/boto3/boto3-1.26.84.ebuild b/dev-python/boto3/boto3-1.26.84.ebuild
deleted file mode 100644
index d6d605bdb0c6..000000000000
--- a/dev-python/boto3/boto3-1.26.84.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_{10..11} )
-
-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.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.89.ebuild b/dev-python/boto3/boto3-1.26.89.ebuild
index 9523f65d5fb9..d6d605bdb0c6 100644
--- a/dev-python/boto3/boto3-1.26.89.ebuild
+++ b/dev-python/boto3/boto3-1.26.89.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.26.95.ebuild b/dev-python/boto3/boto3-1.26.95.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.95.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_{10..11} )
-
-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.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.96.ebuild b/dev-python/boto3/boto3-1.26.96.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.96.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_{10..11} )
-
-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.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.97.ebuild b/dev-python/boto3/boto3-1.26.97.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.97.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_{10..11} )
-
-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.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.98.ebuild b/dev-python/boto3/boto3-1.26.98.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.98.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_{10..11} )
-
-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.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.93.ebuild b/dev-python/boto3/boto3-1.26.99.ebuild
index 9523f65d5fb9..9523f65d5fb9 100644
--- a/dev-python/boto3/boto3-1.26.93.ebuild
+++ b/dev-python/boto3/boto3-1.26.99.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 3a0c4139075e..91328fb0ffc3 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,3 @@
-DIST botocore-1.29.84.gh.tar.gz 11220100 BLAKE2B 588efd08ec38eee7e319ea6e1d41af3f8d96c8e71fa090e5d3e8c836d60be957c47b556a9ce18684d53cb415446a360006714501dfbfc77204b2822247e7bf35 SHA512 cee6066735b324d550b736224ce4a4cff207cb7494d14e599ff9606b7a530d3887636054b3d0457269234d83ec0078950e03f916cd834cf910680e7ca650167b
 DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
-DIST botocore-1.29.93.gh.tar.gz 11239506 BLAKE2B 7a05d5c611cbeda21e62abbbe13ab18cceae2d8b28136fc8669b09e3ebdcad5e5e352b32e807af7f2f038b6d045f82cf1a9cb3ec854f37db1f3204725fd8971e SHA512 df4ba05c28323321eae25412b97eb9f48978563aad5a0c166515bac3193b0404ebe111565be3b1e42ea47439f749e339ce11cc21736d5403ffbbe689f6fd8da8
 DIST botocore-1.29.94.gh.tar.gz 11242930 BLAKE2B d6abdda0ad69bfa635c2cdccefff5c0feaa27fb1a307d5cacb140ded35c246a52ebbe5657a9317bdc1441939d2bd62d5829b2ecce01c05976f56737f92fc3f62 SHA512 23c1fb835d492f414a0a67ac03e50ea31f6343676c7e6e8649067b11e3213f84eb068562fe5bd9a49ead9e37381ab132ac820d98fa4af805b41eaf53b0f9cb1b
-DIST botocore-1.29.95.gh.tar.gz 11252473 BLAKE2B 500dfc60af5127b56d41fc8ffa2742b5a0086614e48517590c795ae51ea55936a621e4a88d27248a9c52dfb4fe99c716ac2b191329071b94c13078facf4b0967 SHA512 2efbff00cc696930bb71713ce18ad61449c2e79c0ede48218347e3c410a9ff9752c44a35dd03f45286c2f6e05b34e85bd8b01c0c9f92d877c9e2d0209b6cafe6
-DIST botocore-1.29.96.gh.tar.gz 11257444 BLAKE2B 28cea7e2909a4c1f5a399633dbaa52b87fedc25f4c9cfc9f7c9a977dc84f86dcb3da9d1109b2c77e815bb5338337c850f260d9c2adc27d1f8bd529f087c2a299 SHA512 a6c414e275d7b31eed94175fd54142a909b8957685ab6779488704c905595f83c0bf376d5d37386266b103a3efde1a46f853ac7b1631056069903c0c57b55da2
-DIST botocore-1.29.97.gh.tar.gz 11258219 BLAKE2B 5bbbe250a80203d993ee2ad36770f839cbe6a086d63446f4b537c7015f686840726e15680762ece85869b676d51385c1302952ecd4a5607b2a07b9db1d0df9cc SHA512 0ef137c6a51546126000f5a7b8ff413d17d9684a36fdc7977b04cca090a757b76f1bd1cea02cd733eb4581c370cdd9214a033f7dc4766e02d2f1b5140c098e2a
-DIST botocore-1.29.98.gh.tar.gz 11284537 BLAKE2B a0ab33b0a02483f54ecb42f6af61710758a2ec8333937910e74169888e4a3b6b72ae7d104f47daf6e47d45e95b94c907967eee9cbd5886463f7b22f46b8babcc SHA512 5d87896314e138f71bce64db23bd69dbdfd55599a3356b161307bff1550264f3f378586ad3aabcf8662476b7c7013337d2015614178e147a6cb56efeed28e159
+DIST botocore-1.29.99.gh.tar.gz 11285143 BLAKE2B ba594544fb219cec77659cfa48fb6e3a8241b92c911d9983450648ce97652cad7654181637fed8373fe49e33524f63920128afd4ca9c00bce45603b1ab917648 SHA512 319d70412843149aa43c8d7faeff04122d96091081d30c2da0962fadb27104a24cc147fac2c95492aa407b2f8a25ebed9e7d149c29d5d38134d836581c801bdd
diff --git a/dev-python/botocore/botocore-1.29.84.ebuild b/dev-python/botocore/botocore-1.29.84.ebuild
deleted file mode 100644
index 5afa7a9459c5..000000000000
--- a/dev-python/botocore/botocore-1.29.84.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.89.ebuild b/dev-python/botocore/botocore-1.29.89.ebuild
index 0f4daaa48e81..5afa7a9459c5 100644
--- a/dev-python/botocore/botocore-1.29.89.ebuild
+++ b/dev-python/botocore/botocore-1.29.89.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.29.95.ebuild b/dev-python/botocore/botocore-1.29.95.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.95.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.96.ebuild b/dev-python/botocore/botocore-1.29.96.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.96.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.97.ebuild b/dev-python/botocore/botocore-1.29.97.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.97.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.98.ebuild b/dev-python/botocore/botocore-1.29.98.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.98.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 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_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.93.ebuild b/dev-python/botocore/botocore-1.29.99.ebuild
index 0f4daaa48e81..0f4daaa48e81 100644
--- a/dev-python/botocore/botocore-1.29.93.ebuild
+++ b/dev-python/botocore/botocore-1.29.99.ebuild
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index feb410e302d1..f3903aaa686c 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,3 +1 @@
-DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
-DIST bottle-0.12.24.tar.gz 74146 BLAKE2B a6bb638a0cba4d5fadbcb3a1a303b66a04f3c4df84e34b87d4a9bb22178de943123403d2851bd28504cf9d91380af95dd108e3b84825a93a6345cbe39fec0c33 SHA512 a3bc4bdc1376aef6c7b5784de18bfaac83e2c0c279fb2c3c3a8322871c68516e858b8c82cfff9291d41a66b906c13099c9d1037184bc48ff6f4ef0783b048f9b
 DIST bottle-0.12.25.tar.gz 74231 BLAKE2B 2856d94e1525f21e272d70ca3101188ea65417179342d7b3e971c5d1a3be77265e4197e5d29764a5739adbd984883ed121524f29e6a5933b8681e2c34b511a57 SHA512 14b8ed1ffd58f9667d451872ccf73a6f4bf8f7ffb9329f55314f90c770630cfe3f9956f786bcc7fd5f67fde22d14961952969af405912ebe71f019ca6599c975
diff --git a/dev-python/bottle/bottle-0.12.23.ebuild b/dev-python/bottle/bottle-0.12.23.ebuild
deleted file mode 100644
index 356f016ab8f4..000000000000
--- a/dev-python/bottle/bottle-0.12.23.ebuild
+++ /dev/null
@@ -1,46 +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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="
-	https://bottlepy.org/
-	https://github.com/bottlepy/bottle/
-	https://pypi.org/project/bottle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e '/scripts/d' -i setup.py || die
-
-	# Remove test file requiring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.24.ebuild b/dev-python/bottle/bottle-0.12.24.ebuild
deleted file mode 100644
index ce7b4b2665a1..000000000000
--- a/dev-python/bottle/bottle-0.12.24.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="
-	https://bottlepy.org/
-	https://github.com/bottlepy/bottle/
-	https://pypi.org/project/bottle/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e '/scripts/d' -i setup.py || die
-
-	# Remove test file requiring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.25.ebuild b/dev-python/bottle/bottle-0.12.25.ebuild
index ce7b4b2665a1..6a463e36b45f 100644
--- a/dev-python/bottle/bottle-0.12.25.ebuild
+++ b/dev-python/bottle/bottle-0.12.25.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 52a376db7b69..46d34e13e8c8 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,3 +1,4 @@
+DIST llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz 181527027 BLAKE2B f2f3b3a33b2a50f3b4f97df16a948e5ed5e642f737de8e852da164aefd3ed9af7bbd0fc1de9f7c9dbee6b9b8ebe11e52af8cc79b8a130cff405fc1238afe217d SHA512 946cd1435a26673c851bdda170864d0c362dfc14d1a7087fbe6303ac79e1821e9c53b72e92d15ad7180b1d6ea3bcc0458e7bec37acc3e8b8bcca8efbb9ff2387
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230325.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230325.ebuild
new file mode 100644
index 000000000000..f37802f5c2d7
--- /dev/null
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230325.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+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=""
+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/cython/cython-3.0.0_beta1-r1.ebuild b/dev-python/cython/cython-3.0.0_beta1-r2.ebuild
index 8c6cf0f02109..7c6c04cf932c 100644
--- a/dev-python/cython/cython-3.0.0_beta1-r1.ebuild
+++ b/dev-python/cython/cython-3.0.0_beta1-r2.ebuild
@@ -25,12 +25,9 @@ S=${WORKDIR}/${MY_P}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
 BDEPEND="
 	${RDEPEND}
 	test? (
@@ -43,10 +40,9 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
 	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch"
 )
 
-SITEFILE=50cython-gentoo.el
-
 distutils_enable_sphinx docs \
 	dev-python/jinja \
 	dev-python/sphinx-issues \
@@ -59,10 +55,6 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
 python_test() {
 	if has "${EPYTHON}" pypy3 python3.11; then
 		einfo "Skipping tests on ${EPYTHON} (xfail)"
@@ -79,17 +71,4 @@ python_test() {
 python_install_all() {
 	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
 	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
 }
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index fbb62a339ed7..86f2f9f3abc9 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,3 +1,4 @@
 DIST dask-2023.2.1.gh.tar.gz 8514054 BLAKE2B 6f94172cf9f921675fc53cf59e9cbbe211f576374190eecf8e17ad9943bbd1ba15fb002e7cf81f0043b4f2450a0cde7bdb6feb42a08160d0fbaee24d4a2f483a SHA512 1af031fd2992377297daff42c4f706e4e5573cce86a9158ea1fa4f09cf0c8a51ff5fb33d7bc551c16eb0a8e5052e76b32a143b2793027becb4e2367572c46219
 DIST dask-2023.3.0.gh.tar.gz 8514069 BLAKE2B 427b975010e08d23bb55606da726c64a08bf17144d50f0b4641469f30620359052434a9108510c08a7d646fd567cbeafb99afe9162a0becc3417fceecf4604d3 SHA512 1834c98edb1fd92fd022d472ec9d05497e7845d712d0e2faae27b6a408faff3678908d3109db5ae50642348a4fa6832af995f2fb67782c7a71933126699577da
 DIST dask-2023.3.1.gh.tar.gz 8520302 BLAKE2B 5b70e355ca02163d42615d504207e8186b2b5887d2c57c517876ffbc8a1bd4a3c56ea755d79696d952f802043134c4be4b0a69ff2eb4ea6da8faa80096bebdca SHA512 e4b8306a900453b27bc19055b5a5bfd0d0ed2dc143be854d8f056ede8b1e4bdc5e91a54c674201b1b1f27cbc0c9ba908e5a82a12f52d337c3cb23cbc2e6ef199
+DIST dask-2023.3.2.gh.tar.gz 8525841 BLAKE2B 660f3687320c0d56abe437bf7edea2f40fe624a3f48761238b00756f61358d73d47a570399ed70f6f1f2188cb03b04fc10e5c9683e2a49c6b73a21c35173e1dc SHA512 ef1a961a50e69a32aea14630e9d19fc92646e9f520fa265937bb923aeba5932397840b2971bfb9a47125672ac2bd9b0b6a017b650708a183b3bf6c0c345e2af2
diff --git a/dev-python/dask/dask-2023.3.2.ebuild b/dev-python/dask/dask-2023.3.2.ebuild
new file mode 100644
index 000000000000..e4882c82fd40
--- /dev/null
+++ b/dev-python/dask/dask-2023.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# more tests relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	dask/array/tests/test_random.py::test_RandomState_only_funcs
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+	# require sqlalchemy<2.0
+	dask/dataframe/io/tests/test_sql.py
+)
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index e78409642661..00979deaa8e8 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,2 +1 @@
-DIST dulwich-0.21.2.tar.gz 436949 BLAKE2B 8c3b42e103146c3641292eaaae29b2e53690a84fe0ba68adcaecc7ed75ce5ee3af64cffcc702b98a5bef18b6edfe888b2db0232430cf0289d1ca14dd49f3fb14 SHA512 edc7ea98f3417bd3f460d3c5fb54ceb1974df79e85fea4b4d324a79f487a5303edbdb256bae0b5c6e83615cf8788a2a921bfbd5031d4d3e4dbdd1c97ea1295e8
 DIST dulwich-0.21.3.tar.gz 437815 BLAKE2B 889bb20800bbf45da6ddd688ed1e8ff2ca76fc3671409bb4bee4ed7604f008610adcd68feda9bf50bdd6432d3ad400e381506369d6411905a8388884093d5540 SHA512 ffe89535bd48709e68bff6b299034ab6ccd28960cc32b3717d9779c84c87548d8366dfadfb0699c99b99f8e599d91284e05dcc3c1f9ae4d7b208500856eb33ac
diff --git a/dev-python/dulwich/dulwich-0.21.2.ebuild b/dev-python/dulwich/dulwich-0.21.2.ebuild
deleted file mode 100644
index a25e18b5c852..000000000000
--- a/dev-python/dulwich/dulwich-0.21.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.21.3.ebuild b/dev-python/dulwich/dulwich-0.21.3.ebuild
index 746d7337a4fe..11bcfa1c9143 100644
--- a/dev-python/dulwich/dulwich-0.21.3.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 74a59014c240..a28503585286 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,6 @@
 DIST filelock-3.10.0.tar.gz 10006 BLAKE2B c9fa59baf698f2bca16e315909b25a85a8f19c22b62c102b5005b9403a7e22819cb1ec4e338b91c47d977cc7af42192fd240fd0bc2f0fe5858f28c947dfd3023 SHA512 ebd1adfe200e8460d876bd7fe0c25d7c3787b07b8c3fc218912db08ccbfbb57c5d72b750cc7f583454efbbea7b13dc89b9e32c67d8874ea1e540d9bba6236d82
 DIST filelock-3.10.2.tar.gz 10259 BLAKE2B 9d36408d7c86347cb985c5dcaaf8640ba30437ce9026c3857f412ae0f68f5d11c009a81541ec3d55a43d7083d04d53d244e39267012d1bc17148f6c1106b7787 SHA512 b92ccabdcfade9daafdc895f16e92f0b1b2b204d9f4b7bc22f79e9b1ae38c56bdf7842536ab2fefca91744c62f6df5e93fb4c410a1f7e78a1158352de60988ce
 DIST filelock-3.10.3.tar.gz 10283 BLAKE2B bbe49a0dcb2947668bbb5392ac4aa79cc1aa5325fc5214866a57f92c91c041ca4a3767d4f81d11d079ee86d71faf91c65b7c297c604618b53eed490281eaaf07 SHA512 9d94ea7800636d28e2861285ca2771430ef60306a64f842bd753d4201d0ab96f51b2b73d15c8fc5b146653fa7a6b9a268d6ddeec182dd0b400e0c18d47e91dca
+DIST filelock-3.10.4.tar.gz 10285 BLAKE2B 7cfd908f2e30e610d635b874611aabbdf6d4d835fc27ad3bf360cb71603ea94eb30e5e98b6802724a617fb4aca57c015e5980400796cfd53d2a251b46e668246 SHA512 7f1c535c13353715efd9d64caca30347ccd5ec18b758c1edacc4a31a2c1cad7dbc43a59c331b88315563e3b2009859a980251492df8058d82240cdd1853f25f9
 DIST filelock-3.9.1.tar.gz 9720 BLAKE2B 4225d718f5c6e7c81e5db5d6ac2af42ce78a6c61b59f85bf8c2aafd71509b4811542e7a7648ffa2b14f3b3e762d975296c095e322e6c6ccf8fa5f1839213531d SHA512 7a240b0014a6570099106c72b376c47b7b23cddc3e70f78e2560ccccfcee31d1078d894c2e3ec6fed2f983859543a84cac03f8834df9e64fcb0a966308f7503e
 DIST py-filelock-3.9.0.gh.tar.gz 205047 BLAKE2B 3995f7ad27bb09ca75310c4ada7645f2dd16c09ddb39663394f315443851037f2f9cf08eecb507eba521479696ad1004978d3fdd300a7128ac3354fce2e57d5f SHA512 1235ae9ebdb4c84b0c30e68be91e01eb1acbfcd15c85202fa54a3b91e4e507f221926f8886e1ec91acd4f71d2d88c08f536529b4cebfd2de4fb90118f5dc242e
diff --git a/dev-python/filelock/filelock-3.10.4.ebuild b/dev-python/filelock/filelock-3.10.4.ebuild
new file mode 100644
index 000000000000..27674ad8872b
--- /dev/null
+++ b/dev-python/filelock/filelock-3.10.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild
index 14ddbac9e6a0..bd625066767b 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-text/cssmin[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
deleted file mode 100644
index bd625066767b..000000000000
--- a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild
+++ /dev/null
@@ -1,33 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P="Flask-HTMLmin-${PV}"
-DESCRIPTION="Minimize your flask rendered html"
-HOMEPAGE="
-	https://github.com/hamidfzm/Flask-HTMLmin/
-	https://pypi.org/project/Flask-HTMLmin/
-"
-SRC_URI="
-	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-text/cssmin[${PYTHON_USEDEP}]
-	app-text/htmlmin[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 70887e90e0f1..988970a89ace 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,2 @@
-DIST google-api-python-client-2.80.0.gh.tar.gz 38885627 BLAKE2B f81943e8c4179130bbd7f3d89cdd3c7c5c828c78b9cbed6a5c011c3a0751a19a223b6e52a5fe8f739a8170b6e0e186b5e6b56b4ac08c88a1bf167cb5652d0e18 SHA512 cabd955f730a2b9bf8e8e3579b28935cbbc16b0ac4534d4b841317ff86cec420dd2a5a7b5b319a6a765cce02258fb43cafd6165ae49a7b99e0e891d9ba86e198
 DIST google-api-python-client-2.81.0.gh.tar.gz 39081445 BLAKE2B 779b22f07b12834d649982a52491b567472af7fd83f49e6b9d4a20a991dd57e5bd11e32fdba05f004449733bf5cb2fd2a5ec4a3f012a558989563c88256c3199 SHA512 72e357d68314cda2cbb6d679ad22ecedf3a1ede87b94067bbaca886bd9a17ef3f881ca6060fc23c3c8848fba96668ff0b7ba9f4b44da625f3f34bed5f537e762
 DIST google-api-python-client-2.82.0.tar.gz 10656632 BLAKE2B c94f96c727f7d0cacf008791b3b480fdda3289cfb4326691de7a26d6aeb28ae11c39ef4c8e0dd06a5025e0f77ef473a87cc329b6a10857bff0ba1c4a76814d8d SHA512 913e46120dd624907f1126a00f80ad378e5a874186e09b62b9a5e31b080e5c35af7aaa28e1527c54b2697d2e1af32f02d22aa1dcaa07d3f271fba77ba654d2aa
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild
deleted file mode 100644
index 880af7996e6d..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.81.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.81.0.ebuild
index 65893f1d07cd..880af7996e6d 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.81.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.81.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4c65b3932d33..5365a7f30bb4 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,4 +1,2 @@
-DIST google-auth-2.16.0.tar.gz 223336 BLAKE2B 9dbd54bdf072dacdf728f6fc34931f153dd409e3e1b92e37ed652a1db39d5380b7e66bd196cb1192f75234b2317518a443f8f515bc9135f553e6c9f1116fc606 SHA512 dbeff00089a410c6702e2bd704968c7392809dc217b3f511b62429a11649e4b0607a41622d2753bed9e511368b1c32086b23df66ec915e07a1dd4f32471e025d
-DIST google-auth-2.16.1.tar.gz 221594 BLAKE2B d220bbd22e560f291566ed533c8f3f8961f611bb65410b2ed56a9d9745f1a269a46df7f9075565958a919266450e1702c808eb4fc12680b74790983f8897713a SHA512 87e648832cd88d789334e59ea05545dd567ff7cf5d65d5dd2c209277716b6a77e92e082e9db91df208f1372a010ef1d6830ff77dbdf77d0fda2b649da39bcdd9
 DIST google-auth-2.16.2.tar.gz 221392 BLAKE2B 858ec2d01b7c8e573ddc310a17d634bd63032f469eb47b0fe5fd3c4bcdb5e3388380fba671958734e1b406ff19c9f8d5b70d8e25587e2e813e1300b27329dab4 SHA512 5686846fbd299e8d331a2132a1f2847febb68f06e460aed987ff12efa3a629c274f6b9dcae53b8b3d9075bb590e5e265eb11b9d6eb3861d4230f91f0bfea84f1
 DIST google-auth-2.16.3.tar.gz 221824 BLAKE2B 759b450936e7675b1c50ef574b8e9877d4b086a9e77b47958d56743fe140790359a79de026bc634752aa0eb631abc8a50da4804151071217af34fba588b72c01 SHA512 4010e19cb079baa32ad93f3ee6e9bc142b6edd331247251a14ee8ef9be166d81032cf10a6e000edc32d59e619021c4c9e500658288e4941a886d1d99e86ab68c
diff --git a/dev-python/google-auth/google-auth-2.16.0.ebuild b/dev-python/google-auth/google-auth-2.16.0.ebuild
deleted file mode 100644
index 2dc5b30afbe8..000000000000
--- a/dev-python/google-auth/google-auth-2.16.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.16.1.ebuild b/dev-python/google-auth/google-auth-2.16.1.ebuild
deleted file mode 100644
index 5faba10d7363..000000000000
--- a/dev-python/google-auth/google-auth-2.16.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.16.2.ebuild b/dev-python/google-auth/google-auth-2.16.2.ebuild
index 5faba10d7363..9fd5395120ab 100644
--- a/dev-python/google-auth/google-auth-2.16.2.ebuild
+++ b/dev-python/google-auth/google-auth-2.16.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index c61a9b49f5d4..01f39379ffeb 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,3 +1 @@
-DIST guessit-3.5.0.tar.gz 158094 BLAKE2B 2091fa8b0066dda70e1a504fd4aa8b7b4f2ba9b3a88f93b22aff0d084511d9a1c93e052558fe6791021e4c44a95e9adc5e7372c937e0e438b419417ff88d2fc0 SHA512 072b6874449679ed34eeb19fe70502abbec3a4284c2ba40e3e69861ce2b9e92f4ff8146840f7fc25079efed62f048c9e25ee3ddf5833b192480c512b9c93905a
-DIST guessit-3.7.0.tar.gz 159451 BLAKE2B 705697ad1721d52b33c5b409992f0d2cc12ffd3c7cf9911b01ba81c4958c19128ab37846dcf7cabf5edd10a19cc1018f2ec25a8f25d9b6307852677fbd049d5c SHA512 dacce2ced2ce647035e2462eab9657e4e73ce2edb92d39a9a20c10abeae09c8a70187121d94503260cdbd933133174c6cb02c6a28daf0bca08a4996fd3e525e2
 DIST guessit-3.7.1.tar.gz 161488 BLAKE2B 66851898aad5386692bd3535e01e74918b31c59d56c2b2a4ead3d126f0ce30c4f7388bcaa0acd06652f3b72bba99aacf29bd7d9d8abbc38d38f2d259a77bbe17 SHA512 4932407ca3a283a756291a69ef4cd4dcd96ea9c37b6d30331f134b2285960afb1f6adecdb299474ef7dfdea4b6e2e029ddab0789998efe7aea13d0e5bb8c54d6
diff --git a/dev-python/guessit/guessit-3.5.0.ebuild b/dev-python/guessit/guessit-3.5.0.ebuild
deleted file mode 100644
index 4aab51d6f512..000000000000
--- a/dev-python/guessit/guessit-3.5.0.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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="
-	https://github.com/guessit-io/guessit/
-	https://pypi.org/project/guessit/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	guessit/test/test_benchmark.py
-)
diff --git a/dev-python/guessit/guessit-3.7.0.ebuild b/dev-python/guessit/guessit-3.7.0.ebuild
deleted file mode 100644
index d9d64364322c..000000000000
--- a/dev-python/guessit/guessit-3.7.0.ebuild
+++ /dev/null
@@ -1,38 +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_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="
-	https://github.com/guessit-io/guessit/
-	https://pypi.org/project/guessit/
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3.2.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	guessit/test/test_benchmark.py
-)
diff --git a/dev-python/guessit/guessit-3.7.1.ebuild b/dev-python/guessit/guessit-3.7.1.ebuild
index d9d64364322c..c2fe17ecd531 100644
--- a/dev-python/guessit/guessit-3.7.1.ebuild
+++ b/dev-python/guessit/guessit-3.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index bf57edadacbf..50eaf136b1a5 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1,3 @@
 DIST identify-2.5.20.gh.tar.gz 101473 BLAKE2B eaf6994d7b2f8e0449b84fcb6eca14210b3a123ad48709cf9e7bc9557b116dc9fbb5103566b60bfda1a19f6428b8432b2ad6099c471b1f86b898d46dc2c0b4f1 SHA512 00905b2937766c3885b9a604cc55e6201ffcea486cfd553217659652d97632ed11cd12512ecbe2ddd3394e836fbab5ec439a55257dcccd6ed3a2f148df5ca92b
 DIST identify-2.5.21.gh.tar.gz 101486 BLAKE2B 9c70c401d37afa8689d39bc4df38ca2006ecb2f78d427c0e213319074c5d0ec8a3865fafcde70ab903e641ada100ef4207196fea78bda9e60f3aa8c9e345c30d SHA512 6760eb53e99e52f51d24499b240450e0f1d8e4faf0190a6c7768246bc2ec527bfd0b081113058be4ad7646212f8b4043479e83edf6021d36d483f3af672a4010
+DIST identify-2.5.22.gh.tar.gz 101517 BLAKE2B 289a26bb570a3a4c369013837783cad8b4503c6bf3732dab5b2e5785e19884fec8a39f31e37833a242ddd852f9b401af5bb71655c5ed3107e2575a960e663035 SHA512 a2133cf8a2dc329af5bf10c8c6186c273ec6d1d2dc6941550b3c9d749f14e31fdbee71b978b26384661f92ac5cf31afb5e4164ed646c5e3a2c2b5962cdddc1e6
diff --git a/dev-python/identify/identify-2.5.22.ebuild b/dev-python/identify/identify-2.5.22.ebuild
new file mode 100644
index 000000000000..718b36c70087
--- /dev/null
+++ b/dev-python/identify/identify-2.5.22.ebuild
@@ -0,0 +1,29 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 4edf621d2e92..5810e75703ae 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,2 +1 @@
-DIST importlib_resources-5.10.2.gh.tar.gz 34882 BLAKE2B df84de4cf9f6f912c034c8a85be1005782ff6ac48df61c251d09990033ebc6bedc0db5913f556b9b2825c19a2dd1962d9481404b7ab85b4156ab685857ae6cb1 SHA512 891db784e030ab3262361165cef8730cb26f6a4526e279c13b8e538bed5d0035cb63ee6f4c62eb9d43ccfabfd97fb5b0effafda688185b89de8718910631b4d4
 DIST importlib_resources-5.12.0.gh.tar.gz 36161 BLAKE2B 1adcf5e2d0292867eb0b96819ee5d808b62d7f479a6fb4254db50b0397814b0f6ffe4d209f4dfcc19147bd060888cfd457391de9d6746b1b85f58b9d0792e29b SHA512 038d44919ace6d92709855eae0d111ae772edfbbf79e82349a34ab143d0ec9ed796a317ff3e1a06a08404d4a58398d130a1a4f425d26511e724bc03946679d19
diff --git a/dev-python/importlib_resources/importlib_resources-5.10.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.10.2.ebuild
deleted file mode 100644
index e0f48b6b6a2e..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.10.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# This is a backport of importlib.resources that's present since py3.9.
-# However, the version in 3.9 is buggy, so matplotlib needs it on 3.9
-# as well.
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_resources/
-	https://pypi.org/project/importlib-resources/
-"
-SRC_URI="
-	https://github.com/python/importlib_resources/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_resources/importlib_resources-5.12.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.12.0.ebuild
index 490b67f72cd2..e0f48b6b6a2e 100644
--- a/dev-python/importlib_resources/importlib_resources-5.12.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.12.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib_resources/metadata.xml
index 8316f4533464..d4420b4c6c1f 100644
--- a/dev-python/importlib_resources/metadata.xml
+++ b/dev-python/importlib_resources/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>sbraz@gentoo.org</email>
-  <name>Louis Sautier</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
index 73932e988d6c..ae154af19be3 100644
--- a/dev-python/ipykernel/ipykernel-6.21.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index c0ba4fe175eb..ce1b87f9b7d9 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,2 +1 @@
-DIST jaraco.functools-3.5.2.tar.gz 14650 BLAKE2B 63db54c5f3dea7b0ce939ad51fc4c4f5831a620a37a47d416079d4c9ad30cb3d401567a8da036178122431cafd8dc18e4a9b59241cd1fc0b8bd1c057dfb8a034 SHA512 3f67d151f4f6553b3e560b0e6ab71cf726d6c8f36ef5e9f69b6325605547797e19a3f9eb1331cf332db498538953ccaeb75820528e6599fd7cf125abdc073e69
 DIST jaraco.functools-3.6.0.tar.gz 16054 BLAKE2B dad26dc73b696dfc62d21f1807a8340e770b35881f3877fdcf6e7e95080f0cd1a81339500c306f4afb2dda896a19ffffcc1715cfc4d37f36594d59af3fd58ac0 SHA512 f249e6cdcbd88e5c89663bcc0467687ea533dc70b7c9260880da8099380b5c925f05933527de6043aa0786709a0ca4d4b183cc18acab69d8e88f63a3360e9efb
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
deleted file mode 100644
index ad7393916e52..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.functools/
-	https://pypi.org/project/jaraco.functools/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.functools"
-		version = "${PV}"
-		description = "Functools like those found in stdlib"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
index 6b1540ee9e73..072a0ffdc337 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild
@@ -19,7 +19,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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index de41d7a7ca00..fac2c631a7dd 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,4 +1 @@
-DIST jupyter_console-6.5.1.tar.gz 35754 BLAKE2B 1b3e189e8a057b0f57e6a1c1409797aff9b6584edd96975c5b91a7c5d55d8601e44a3f9e0218413351d67d7175a7f6c86c3734e14ba881f6ab25ea9f1748576d SHA512 3fbd97b1ab05596ac56ba8f6038af787698197b5148f7e33a79ad5cdcc9a78c80c2534e3e2c298aeb92ce880686731b9ba206d7d0094ad67d7cd4996c02e2327
-DIST jupyter_console-6.6.1.tar.gz 34188 BLAKE2B c502fb86152010906d552a8d7141f52d8aab56e5df0389d93c3e4881acf3cc9b73d80c5d0a8193e7b179079a7310c68ae54ce2205b68a5f7538b9de33d54eb66 SHA512 dc30b9f0fd8c121e17fe9f9352c2ff4945795b11db74a13fe943bf4424bc0ddaa7745ad12477c7a37c51bedc6c1ce29b72803cf2e1bf82b5d8d124fed0a2e4c8
-DIST jupyter_console-6.6.2.tar.gz 34270 BLAKE2B 860d3b8d5f6292c4198aaaeec4e41d4e0764e48b374c9754c06aa45d0da56a60dc74a71a8db2243e5704647fa080dbfc86112bbb5467b414b82fd9168b056ab4 SHA512 4a7508ff9ae4d1c31644588f0a594f86c2183a0799b737d6b892eeebc4892193681e3e2eb54e8a8a5ba496120722602fce87802df78015a49adc76485edb9947
 DIST jupyter_console-6.6.3.tar.gz 34363 BLAKE2B fd5875f608bec0528f7751b7cb146bff3f5c6caeb531a360eb5dd6164c44b3a4a84d1371756f42c256fbada7572176172894a01bc5b7cca835f12a390815ff5a SHA512 fc896dfc783648127690458712e90eced9578629dd55e3bfc9e15319ffa919c118c78d7872f0274455c3996fa9321bccdfa204b94b45a2de733b7703894c9034
diff --git a/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild b/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
deleted file mode 100644
index 96d1fcf2437d..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.5.1.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
-"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.1.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.1.ebuild
deleted file mode 100644
index f3ac25df4987..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.6.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_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
-"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.2.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.2.ebuild
deleted file mode 100644
index f3ac25df4987..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.6.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_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
-"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
index 8364c94edb33..a66bd0d2c4a2 100644
--- a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index 37f7508e1ff9..01ef8c4e4a05 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab_server-2.20.0.tar.gz 70481 BLAKE2B 188b8a9bd2bfc5a27ce6f8488d7768484fd71ae8bb93f28c8a49f63b1aef13551c55d7e18531830df26617883f6b780a491d3522a0dcb3ecddcc433cfb35f97b SHA512 7d9a86f56686344ffc1ad11a9fc7c736a2ac0e6b8c31f8b6d8e35e5fd982454b2362073038dfc2ed3a4f03ef53e2afcaa33fc2c956b63e44c3d1ae6efa1f9251
+DIST jupyterlab_server-2.21.0.tar.gz 70965 BLAKE2B bb959d2c5a507ac6ad2ed719e86a68590c51df51a126f8a44195c48ccb9a295ca0930d0c106cc9f753b3032aca4002d4edadf31f24602d22bf9d3be3eabe2fdb SHA512 c3180983e6db932a4f243e977aaa0d7e7daed34788ba3a51d1414c5b625008ec524e0bf96a559bd85279146f9bd02c31eb2ac3451c40edba1751ed695c7c0791
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
new file mode 100644
index 000000000000..2be148047212
--- /dev/null
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=hatchling
+
+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 ~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-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.28[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter-server[${PYTHON_USEDEP}]
+		<dev-python/openapi-core-0.17[${PYTHON_USEDEP}]
+		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
+		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+		>=dev-python/openapi-spec-validator-0.5.1[${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/krb5/Manifest b/dev-python/krb5/Manifest
index 4840ba5d57df..d89435444abd 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1,2 +1 @@
-DIST krb5-0.4.1.tar.gz 218745 BLAKE2B 8b7e6ab921462ec03c4ca23d83dcfbb8f03b2538edac1a920e68bc3f53c518c942a5f54a96c201a11667e0f4d82882d321808683efa0e5ed1d00df569aa73f2f SHA512 089b3abf3a9402248ed04ab4b47672e0de88c5c73c0c705ac129e499ff53931ffcf7fc6a6bdf9b0f9e03e9010f25dcc61b9a2d33c6b67f5b741a477fb5199265
 DIST krb5-0.5.0.tar.gz 220969 BLAKE2B e492220906afff138a35e0545a9fec4d802e37e17d776fa5448361f1d62a93500063f783e638bbf903165a1998f9d2eaa1444d3bf5ce8446b781c69596c53080 SHA512 a5e8dc16026602373a00aae9188256b586a9f02cee7a413b7bc8ff0525660c416256179b56795cb9a69ca9dab0afff258f803a810220472e086c1c497d044567
diff --git a/dev-python/krb5/krb5-0.4.1.ebuild b/dev-python/krb5/krb5-0.4.1.ebuild
deleted file mode 100644
index b6101b059a80..000000000000
--- a/dev-python/krb5/krb5-0.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kerberos API bindings for Python"
-HOMEPAGE="
-	https://github.com/jborean93/pykrb5/
-	https://pypi.org/project/krb5/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	virtual/krb5
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/k5test[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/krb5/krb5-0.5.0.ebuild b/dev-python/krb5/krb5-0.5.0.ebuild
index 379fe10ed828..e564726b2cf2 100644
--- a/dev-python/krb5/krb5-0.5.0.ebuild
+++ b/dev-python/krb5/krb5-0.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 52a376db7b69..46d34e13e8c8 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,3 +1,4 @@
+DIST llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz 181527027 BLAKE2B f2f3b3a33b2a50f3b4f97df16a948e5ed5e642f737de8e852da164aefd3ed9af7bbd0fc1de9f7c9dbee6b9b8ebe11e52af8cc79b8a130cff405fc1238afe217d SHA512 946cd1435a26673c851bdda170864d0c362dfc14d1a7087fbe6303ac79e1821e9c53b72e92d15ad7180b1d6ea3bcc0458e7bec37acc3e8b8bcca8efbb9ff2387
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
diff --git a/dev-python/lit/lit-17.0.0_pre20230325.ebuild b/dev-python/lit/lit-17.0.0_pre20230325.ebuild
new file mode 100644
index 000000000000..0e39fac626c6
--- /dev/null
+++ b/dev-python/lit/lit-17.0.0_pre20230325.ebuild
@@ -0,0 +1,42 @@
+# 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_{7,8,9,10,11} )
+
+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=""
+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/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 93a6bb4664e4..259bdaa3dd2e 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,3 +1,2 @@
-DIST mdit-py-plugins-0.3.3.gh.tar.gz 57366 BLAKE2B 60b53c6aa404a22296da122b6528491fa7dc52c4b485dea1b0c26c486cd04bf495948e03c40d54ac9d436431ab1154f51af90c84762f96d87984b74718a736a9 SHA512 a32a4a7004368af924c0876106e10a55a2f361a18db127a45080779bc39fb709ca274febbb4c4d5e872357e99bd8161e6c760783793516011da5f963368fa637
 DIST mdit-py-plugins-0.3.4.gh.tar.gz 59538 BLAKE2B 7046c2b8b5b117612a71c1a4894c7e3e49a161b5375fde13ec61c4a00c2bf5824505cb5639b70a3c58d7c9629e68bf794c950b5a28470392487965cd94f3e9a9 SHA512 e36b0ee0aca95d60c27a577e1c4bde9832d633ca84fb740f16a37dd63ece0a77005f8e3d03360ed0c92de57d3f656a8f76ab76642d8da3e5ac1d65384ee18d84
 DIST mdit-py-plugins-0.3.5.gh.tar.gz 59757 BLAKE2B bad78ec811d238bafd83c9d1bbd6e0bcac3b70cd87f52b215966e836d4c2a35715804fa1c7d3671de81713c4e169ad4bb6d9dcdf741f617544772d06f8e3ae56 SHA512 6cb153d8ccff8fa3f94731606ad5dd1c06954d95519ac77b6de477e04b878f84fb059052906bdea5d798be3de49733a909cb553107255a61cde6dd1c6c72d4d2
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.3.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.3.ebuild
deleted file mode 100644
index 5bc6e992cf13..000000000000
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of plugins for markdown-it-py"
-HOMEPAGE="
-	https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins/
-"
-SRC_URI="
-	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild
index 0005de8b30f4..5bc6e992cf13 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/markdown-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 7212b4adda2b..a34d8ec3e8c0 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,2 +1 @@
-DIST meson-python-0.12.0.gh.tar.gz 43801 BLAKE2B fa4f5b73d490fce64da5c9f79c590e32af5b39790c0ffddc694a6b11a9274760a4e92a3d45abdefdbec1e6c5235ae799ee6c3e1b99685028b3bc007d5322683d SHA512 f2e416027bb6fb6cf6ad0fd84c6b65ddc83b497ff96b5a144dfcdd1addee44972eaa7422c8d9a8092431b6df1b052f970e9e7bd7dc57b28fbf42d2ea3a8d9231
 DIST meson-python-0.12.1.gh.tar.gz 43855 BLAKE2B 96b9ff5ef628bb471f7f79ce30ec6f3f851ce0006327e8b3a6003fdcb768f3280c0ee882d1c0c8ea183b0f2319d7c977c3fbb62742e3127bafb73e9732b3a1a9 SHA512 6f8e840da0155f2dd0e7139387f875cfad79eb042abcfa69b3043f51cbae3222fc2986e13798389909a0b4719513c93af381ec00a69fdfedf14bbe4e100b2f08
diff --git a/dev-python/meson-python/meson-python-0.12.0.ebuild b/dev-python/meson-python/meson-python-0.12.0.ebuild
deleted file mode 100644
index 59f542c3d4d3..000000000000
--- a/dev-python/meson-python/meson-python-0.12.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Meson PEP 517 Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/meson-python/
-	https://github.com/mesonbuild/meson-python/
-"
-SRC_URI="
-	https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
-	>=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
-	dev-util/patchelf
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/GitPython[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-defaults.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/sphinx-autodoc-typehints
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires network access
-	tests/test_pep518.py::test_pep518
-)
-
-src_prepare() {
-	# strip dependency on ninja -- we provide ninja via Gentoo package
-	# rather than the Python wheel, so we don't have .dist-info there
-	sed -i -e '/ninja/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires network access
-		tests/test_pep518.py::test_pep518
-	)
-
-	epytest
-
-	rm -rf docs/examples/spam/build/ || die # remove artifacts
-}
diff --git a/dev-python/meson-python/meson-python-0.12.1.ebuild b/dev-python/meson-python/meson-python-0.12.1.ebuild
index fe58c86cd8c4..912189ae43b1 100644
--- a/dev-python/meson-python/meson-python-0.12.1.ebuild
+++ b/dev-python/meson-python/meson-python-0.12.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index f5cfac8f1874..bf4b06a5a4b7 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -3,3 +3,4 @@ DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad344
 DIST mkdocs-material-9.1.1.gh.tar.gz 10874113 BLAKE2B 24da8a9c93b46afaf7d2faf3becc3735c72e831b8ed5f3153f493178feffd9ee720b9a394814d8a151a337343065f664c0978fc8b02d357523d62c94c80a1f52 SHA512 e7c023027c9d970fde94a9bbd20e9b22a4f9666f3778660b759937ad855514720b710d8d32fa71802e3455bb1d3545b0451c055edd428098916acb980f465a7f
 DIST mkdocs-material-9.1.2.gh.tar.gz 10883294 BLAKE2B bc84f9af96fcdd8a6704723d8c004bd3f201e906e7b1a46ab48253f7d7468e5219f14258713183c6e64c43f073cf499e3f1c03a76e6be77bf732acc832fe86ed SHA512 7f711792beaefe87a5843df6f8f67b6f2aaf92de36ac9c9b6d2c05aca3bd5760c5e306b5d6f7c57e1414bd77e2453800970e37af46cd78eb8095c6e2b19072bc
 DIST mkdocs-material-9.1.3.gh.tar.gz 10884530 BLAKE2B 1a7c257a0f1ce6fe9b5fa394cb9a8011f7d9252c5cd0cd7b935acd57aa2eb518cf4c945c164d64eca4c30c50f7e224b5bd6f122fa2cfbcf425ac6d5e59c40db2 SHA512 300410ff503bd4f751dc45aae9e3d88cb3589d0d3343208c6592a0d68f01c2c1ae5a4e0aeb80afabd0e04af3c51886356319ad00a6e8f801dbfe6b500db4eaaf
+DIST mkdocs-material-9.1.4.gh.tar.gz 10870732 BLAKE2B 3936fe1396631ac0aa2857da9b197347719ab8b49cf2afda136f16e706d685e7deaa198c18f99ff599d233ac2ea08bfbba397d2024b1fb164c96e91c19e3512c SHA512 1b62785bb0a30f5e84188cb42ade7f64ba3cab652b2eea13ee64a29767807c05f71db610e4915eadcdf301e6e12259e1905e2a1c23681f16ba63db7be6fe284a
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.4.ebuild
new file mode 100644
index 000000000000..4de43bd469bc
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.4.ebuild
@@ -0,0 +1,53 @@
+# 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_{7,8,9,10,11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/numpy/numpy-1.24.2.ebuild b/dev-python/numpy/numpy-1.24.2.ebuild
index 5342cf63f3be..e0f09ea1599c 100644
--- a/dev-python/numpy/numpy-1.24.2.ebuild
+++ b/dev-python/numpy/numpy-1.24.2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lapack"
 
 RDEPEND="
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 0f33025c233a..524e59d199d8 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,2 +1 @@
-DIST oslo.concurrency-5.1.0.tar.gz 59835 BLAKE2B feda58a724e835c060667edf7c126ac0a26c62dace84db5e0909abbecc3dd5649aca791e084e218bd39d2463ed4fe878a4a16018483191cf3668df8eb7761859 SHA512 a4fac20c32cff9c30cd464631cc4d390626ea4a52bfd5c132808983e682d32fe61cf7a735b01b85c4be806c6f473efc1ed89bfa42211a7ff59215d35cd607c77
 DIST oslo.concurrency-5.1.1.tar.gz 59787 BLAKE2B 630e5bef3a4a49d0f7b8b7f79643ef5f737248ec45de0e801107142b898a252fe7c67be6e0f6db4b968e5a163a47d63bc5f756c592d4f729f62c24aa9aeca172 SHA512 2eac13529f1635d39b5866d20d1f077ddcb2a676e78f4f50abe1df13c2fbf9f85aea1b360fde01e983459dcdc4958783477a87eb8fad106362e81e0f77b36561
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.1.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.1.0.ebuild
deleted file mode 100644
index 5f70330588d6..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Concurrency library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.concurrency/
-	https://github.com/openstack/oslo.concurrency/
-	https://pypi.org/project/oslo.concurrency/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fails, then hangs
-	rm oslo_concurrency/tests/unit/test_lockutils_eventlet.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild
index ba4c43312954..2c7483cfb1c6 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 7a6080285472..90427cc69ef4 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1 @@
-DIST OWSLib-0.28.0.gh.tar.gz 951384 BLAKE2B f3c69f9a2526d54c650fd37dd6e7d55b37b6cbc503d08105a1c7e685ebea76cb7471f6de634947b42a080535fbdbb5262b30771d22e32c977f2a579fe2bdb62c SHA512 4a5002a05c1616ca382aa85561cee950c707488feb37f0f29232758159abcef8545980361cb976240e9026937557ab349764f84c95091f9f3df8698498f47fde
 DIST OWSLib-0.28.1.gh.tar.gz 950453 BLAKE2B 8210efdea8ac2536348659a1bed46b5eb1b4da5a8b77979cc11d23273b1f806bef21d007ddd8a6961c16e241c4f3e18c93054c8abaa89baf8b765c98d74605d0 SHA512 bd62a5e371e64e0e256cc83d2f044294c20965f6b107b0dd9074ac752971620f01af4c7fc9a82e43dc81e71a6a36696b75403012841c28925b017d9c47b2d4a5
-DIST owslib-0.27.2.gh.tar.gz 949148 BLAKE2B 2e12b43de3c3c362b03af15c93fe268e9ad8dd8647a18a8ef978203db896db65dd26cd20d6d58214880248593589604f764887b50c9eb8695d8e51accef3dfe8 SHA512 02c70731ef92783d53b8f0dff2cec7d28d14ac08b0a4b5090183f9eacf156d539c823fcd2ae480c07447e901697de498cdf2aaf27c8b6d46fa4cf8eb3679ceee
diff --git a/dev-python/owslib/owslib-0.27.2.ebuild b/dev-python/owslib/owslib-0.27.2.ebuild
deleted file mode 100644
index 01bdb264cb87..000000000000
--- a/dev-python/owslib/owslib-0.27.2.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="https://geopython.github.io/OWSLib/"
-SRC_URI="
-	https://github.com/geopython/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/OWSLib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-EPYTEST_DESELECT=(
-	tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/owslib/owslib-0.28.0.ebuild b/dev-python/owslib/owslib-0.28.0.ebuild
deleted file mode 100644
index 8cf1880e1f07..000000000000
--- a/dev-python/owslib/owslib-0.28.0.ebuild
+++ /dev/null
@@ -1,47 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=OWSLib-${PV}
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="
-	https://geopython.github.io/OWSLib/
-	https://github.com/geopython/owslib/
-	https://pypi.org/project/OWSLib/
-"
-SRC_URI="
-	https://github.com/geopython/${PN}/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -o addopts=
-}
diff --git a/dev-python/owslib/owslib-0.28.1.ebuild b/dev-python/owslib/owslib-0.28.1.ebuild
index 9e6b46a8339c..8c9d94a38e75 100644
--- a/dev-python/owslib/owslib-0.28.1.ebuild
+++ b/dev-python/owslib/owslib-0.28.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 PROPERTIES="test_network"
 
diff --git a/dev-python/pooch/pooch-1.6.0.ebuild b/dev-python/pooch/pooch-1.6.0.ebuild
index 3bdc445e5d9a..3129515d8897 100644
--- a/dev-python/pooch/pooch-1.6.0.ebuild
+++ b/dev-python/pooch/pooch-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index f3d6bfd71c19..391179a2a78c 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,4 +1,2 @@
-DIST pydantic-1.10.4.gh.tar.gz 898916 BLAKE2B 506a53de6a59f858a7c8fd56cf18f8079d48eb4f6d3ba36d149141a7e2d471819a466bfc1c34c879f5ec90c0de385b2b89d58beb75660da7de282278092e901f SHA512 0566f89518c6f0171c9b49b5fb57e568286ed421d64655dde90a1565d0672bfef6237ed99e4120564ca2562c7e29e08d86db4fcec47e605aaa98d60845688e72
-DIST pydantic-1.10.5.gh.tar.gz 900106 BLAKE2B 6ad75bc0e58b2fea8e0e4c2e23e7b8de39779ec6f1acf05b693201f6ef63e2e6765cac2320ecf694086facdc5d38d9213cead7dc267b53bbec97f11e0f6ff67e SHA512 2f25e5ed3016a64af05674a21dd8dccf3af7e075237b0d078433fa347e58482113e243f9c21ddd55677432d22da692cbb24a682c5af2f09bfdb6fb5cbd53d408
 DIST pydantic-1.10.6.gh.tar.gz 902014 BLAKE2B ba3a3896cdcd2eecc7bd4e6ad979846de377c94d939519889752b36827eba7b3d245943ba192dd80925c2aa09ef02243aaae5e990a6f7b1ab9a8d0b5ba9830c4 SHA512 094fda0158faeb6021632f7ce3ea2570c19ddb288260d4e0f5a4361ab2684a68b0e6212264b37a4a75166746570098d1c4aa0311797d2cf1a22cef2c1e1f0137
 DIST pydantic-1.10.7.gh.tar.gz 903379 BLAKE2B b2dd75a640ca54024a2bf141117a1d738a30a4630bed8f4d0169fc5a6a55ded719727d88c7e78b9a2acc3aec68482e9be8c8bf4776fef668fe4acc3e1fd775df SHA512 948a7935b374719773df50243aed708b3c6789243b9aa0ba239cf1502ddd0e0cec4d701e108f1cc78090c088f3cb1c78b840c39f5e7ad0e61739776f552f284d
diff --git a/dev-python/pydantic/pydantic-1.10.4.ebuild b/dev-python/pydantic/pydantic-1.10.4.ebuild
deleted file mode 100644
index 162f6f730491..000000000000
--- a/dev-python/pydantic/pydantic-1.10.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.5.ebuild b/dev-python/pydantic/pydantic-1.10.5.ebuild
deleted file mode 100644
index 23ac7738dd99..000000000000
--- a/dev-python/pydantic/pydantic-1.10.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.6.ebuild b/dev-python/pydantic/pydantic-1.10.6.ebuild
index 23ac7738dd99..372ff1724f2b 100644
--- a/dev-python/pydantic/pydantic-1.10.6.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index d515591df4bd..0e08cc3cb687 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,4 +1,3 @@
-DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
 DIST pygame-2.3.0.gh.tar.gz 6547956 BLAKE2B 3189dc5dda7e5fc12fe2091af304816d905a24a33f6f43070040b90bd1bac1191fe6fe1a738ccfda49b5d9b472a704962c3b6aa7d8b99bc67e15317a9df06a2b SHA512 ed93cf5f0fac67b8a03f25f514ac71bf9b9a97f4df30efca9e3225396769e7616d3ce1063e6cc6ee3f4e6f1327154a9e0ec4e81b179578118af3a140bb1543bd
diff --git a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch b/dev-python/pygame/files/pygame-2.1.2-cython_only.patch
deleted file mode 100644
index 4fb935dcf668..000000000000
--- a/dev-python/pygame/files/pygame-2.1.2-cython_only.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Backport to ease running cythonize, DISTUTILS_ARGS=(cython) resulted in
-reconfigure attempts that failed without PORTMIDI* being exported.
-
-https://github.com/pygame/pygame/commit/4eeffc049cf
-From: Ankith <46915066+ankith26@users.noreply.github.com>
-Date: Fri, 3 Jun 2022 21:27:57 +0530
-Subject: [PATCH] Add cython_only option to setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -209,7 +209,16 @@ def consume_arg(name):
-     cflags += '-mfpu=neon'
-     os.environ['CFLAGS'] = cflags
- 
-+compile_cython = False
-+cython_only = False
- if consume_arg('cython'):
-+    compile_cython = True
-+
-+if consume_arg('cython_only'):
-+    compile_cython = True
-+    cython_only = True
-+
-+if compile_cython:
-     # compile .pyx files
-     # So you can `setup.py cython` or `setup.py cython install`
-     try:
-@@ -280,6 +289,9 @@ def consume_arg(name):
-     for i, kwargs in enumerate(queue):
-         kwargs['progress'] = f'[{i + 1}/{count}] '
-         cythonize_one(**kwargs)
-+    
-+    if cython_only:
-+        sys.exit(0)
- 
- no_compilation = any(x in ['lint', 'format', 'docs'] for x in sys.argv)
- AUTO_CONFIG = not os.path.isfile('Setup') and not no_compilation
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
index 634337518202..853174b8f2ab 100644
--- a/dev-python/pygame/metadata.xml
+++ b/dev-python/pygame/metadata.xml
@@ -6,8 +6,5 @@
   <name>Python</name>
  </maintainer>
  
- <use>
-  <flag name="midi">Enable midi support using <pkg>media-libs/portmidi</pkg></flag>
- </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pygame/pygame-2.1.2-r1.ebuild b/dev-python/pygame/pygame-2.1.2-r1.ebuild
deleted file mode 100644
index 083a0d4881ab..000000000000
--- a/dev-python/pygame/pygame-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,86 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="https://www.pygame.org/"
-SRC_URI="
-	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples midi opengl test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/libpng:0=
-	>=media-libs/sdl2-image-1.2.2
-	>=media-libs/sdl2-mixer-1.2.4
-	>=media-libs/sdl2-ttf-2.0.6
-	>=media-libs/smpeg2-0.4.4-r1
-	virtual/jpeg
-	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
-	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
-DEPEND="${RDEPEND}
-	test? (
-		media-libs/sdl2-image[gif,jpeg,png,tiff]
-		media-libs/sdl2-mixer[mp3,vorbis,wav]
-	)"
-# fontconfig used for fc-list
-RDEPEND+="
-	media-libs/fontconfig"
-# util-linux provides script
-BDEPEND="
-	test? (
-		media-libs/fontconfig
-		sys-apps/util-linux
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libsdl2-2.26-tests.patch
-)
-
-src_prepare() {
-	if ! use midi; then
-		rm test/midi_test.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH=${BUILD_DIR}/install/lib
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=disk
-	script -eqc "${EPYTHON} -m pygame.tests -v" || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygame/pygame-2.1.2-r2.ebuild b/dev-python/pygame/pygame-2.1.2-r2.ebuild
deleted file mode 100644
index f1f5dadad6de..000000000000
--- a/dev-python/pygame/pygame-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,95 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for SDL multimedia library"
-HOMEPAGE="https://www.pygame.org/"
-SRC_URI="
-	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples midi opengl test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/sdl2-image
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	midi? ( media-libs/portmidi )
-	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
-	!X? ( media-libs/libsdl2[threads] )"
-DEPEND="
-	${RDEPEND}
-	test? (
-		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
-		media-libs/sdl2-mixer[mp3,vorbis,wav]
-	)"
-# fontconfig used for fc-list
-RDEPEND+="
-	media-libs/fontconfig"
-# util-linux provides script
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		media-libs/fontconfig
-		sys-apps/util-linux
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libsdl2-2.26-tests.patch
-	"${FILESDIR}"/${P}-cython_only.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use midi; then
-		rm test/midi_test.py || die
-	fi
-}
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die
-	fi
-}
-
-python_configure_all() {
-	find src_c/cython -name '*.pyx' -exec touch {} + || die
-	"${EPYTHON}" setup.py cython_only || die
-}
-
-python_test() {
-	local -x PYTHONPATH=${BUILD_DIR}/install/lib
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=disk
-	script -eqc "${EPYTHON} -m pygame.tests -v" || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygame/pygame-2.1.3.ebuild b/dev-python/pygame/pygame-2.1.3.ebuild
index 1eed78a1d329..f02ad9490e96 100644
--- a/dev-python/pygame/pygame-2.1.3.ebuild
+++ b/dev-python/pygame/pygame-2.1.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 20d97f05cac0..25fc49c6a2c8 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1 +1,2 @@
 DIST pyghmi-1.5.59.tar.gz 251390 BLAKE2B 0299bf92e6252e21499172e9d4389ecd2a19912ddb9cf9cd8769fc6dd994536526f909711975af58a01169ec2aa20eabba5ca20a5f66ddaaf948be9c1f77060c SHA512 adb64a400a53a17d8837972220807b9bc6f00291316c2f28a45f56d7f9fbaaa8775002e37eeb12e96445636c7a0a25c2829f4ee6c9ffa4c52a83fb35d5391b47
+DIST pyghmi-1.5.60.tar.gz 251748 BLAKE2B 8e860847293db5b747144b3f5e21690c898ebc80c5de8c24dac169b38653893c90b80b0820d3acb5309e95e934cb75e8390b9b5f65e08513a1bd0b62ee62fe9f SHA512 a75528fea803ec68ae12f34befc7d95072baa1bffb8a60d62ebccf41b62f5bdbb510d1b11d9f31ddcc82830ebdc3b31ef6d51b5bca16c89be5dd450cd0a1f82e
diff --git a/dev-python/pyghmi/pyghmi-1.5.60.ebuild b/dev-python/pyghmi/pyghmi-1.5.60.ebuild
new file mode 100644
index 000000000000..50cd1c58a73c
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.60.ebuild
@@ -0,0 +1,38 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pure python implementation of IPMI protocol"
+HOMEPAGE="
+	https://opendev.org/x/pyghmi/
+	https://pypi.org/project/pyghmi/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 44372501a093..b2391b1aa577 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,3 +1,4 @@
 DIST pygobject-3.42.2.tar.xz 558724 BLAKE2B 3e98cf52e818eff42beb8b6120ee8eb4cbe3a6f49670d355e1081b71d411bc93fc701cc37108a321cfcc19698c39b8b61cce5a9369d871da58fd2a2c0455fb96 SHA512 eb604f839e0702e8aeff0f19665e44c05c56cae02ce892e9ab8a95ddb0d5d0216182d0c9a0059fc8e05990c0d5707f2f7456d8924bbfb95ce1d9a42908ac0119
 DIST pygobject-3.43.1.tar.xz 559504 BLAKE2B d8424b34a7945d2ef98bcaff009e5a5555281c187cb8d28cffdcddbec5b16b20619cbb64c3e1ccf23128c4ff4f8187151ca75044977ffb563506085816d886f4 SHA512 e12e53368a94f49daacf24519d9bd65ca11481d6a3059635bebaec43a84d2620fb619c2eac36f7f6b0202a6268b1990f9452355e13b114a4988de18fe30ce66e
 DIST pygobject-3.44.0.tar.xz 559572 BLAKE2B ff94b38879d5955a3ef1845b5a2c65ec61e058ea54e0a696093c95d68eb39ca131601cdfbc165d120df6fd81404d096b7164941775354a43b878fb1d08e5b973 SHA512 d6b54b85a130e0d23ec41d6e3c2d5ef7a141193f5ae8cadcea939ad37389109f43900debd51d66611699b653e5af5ee8e4c500e08cf3ea16dcdac109e819cd2a
+DIST pygobject-3.44.1.tar.xz 559432 BLAKE2B 7edfe91ac1b7301befaf8ef17078b517666467f446bfbe25850336cd365d314153d444d29ecf028ce44a12cef1c94f139d110ac6784c8a2c6077730d4836f6cc SHA512 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327
diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild b/dev-python/pygobject/pygobject-3.42.2.ebuild
index b64798a6d8e3..e1a5ad0998ab 100644
--- a/dev-python/pygobject/pygobject-3.42.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.2.ebuild
@@ -41,10 +41,12 @@ BDEPEND="
 "
 
 python_configure() {
-	meson_src_configure \
-		$(meson_feature cairo pycairo) \
-		$(meson_use test tests) \
+	local emesonargs=(
+		$(meson_feature cairo pycairo)
+		$(meson_use test tests)
 		-Dpython="${EPYTHON}"
+	)
+	meson_src_configure
 }
 
 python_compile() {
diff --git a/dev-python/pygobject/pygobject-3.44.1.ebuild b/dev-python/pygobject/pygobject-3.44.1.ebuild
new file mode 100644
index 000000000000..c104f3c1295a
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.44.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit gnome.org meson virtualx xdg distutils-r1
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/gobject-introspection-1.56:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=app-accessibility/at-spi2-core-2.46.0[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_configure() {
+	local emesonargs=(
+		$(meson_feature cairo pycairo)
+		$(meson_use test tests)
+		-Dpython="${EPYTHON}"
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+	meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
+}
+
+python_install() {
+	meson_src_install
+	python_optimize
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
index d911e42eb6bf..cf9104f80201 100644
--- a/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.6-r2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/PyOpenGL-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index fdfdbedfa7ec..55d7225ab86a 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1 +1,2 @@
 DIST pyOpenSSL-23.0.0.tar.gz 182375 BLAKE2B 8a902ecd7e771dcd281dda184569fef53c7f7d1a801f5cea663ff95014717786ceaaa999b6f67fe710ade253335c856c3964a96705afd6ddb93679856d57d7cd SHA512 68c42de58305461606d9fb932a7711775cfcf1a7c5dbe900b2c7ba18eab546d4c37fcd3dd82ab2c18b15eb07bef126534473b5b29f8af4f46e0147d45ac9e64b
+DIST pyOpenSSL-23.1.0.tar.gz 182977 BLAKE2B 75bb5cf215d17a39d2f11a8948c015766d291ae4c4a9d81f03bc634a0d2abbff78d963d382f858f5609cde3e153fa709ee52c9bcccf0fed35f5f00a18cf4b5e0 SHA512 b46b9a4de7ca584f5711089f1a056c479e65e06b9a0868263aa51b3f724d81342cc89fe06c9eb6e8d44fb87e93c7face9643577145d57608ef6162a5be18127b
diff --git a/dev-python/pyopenssl/pyopenssl-23.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-23.1.0.ebuild
new file mode 100644
index 000000000000..932eb4782032
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-23.1.0.ebuild
@@ -0,0 +1,66 @@
+# 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_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+PYPI_NO_NORMALIZE=1
+PYPI_PN=pyOpenSSL
+
+inherit distutils-r1 toolchain-funcs pypi
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://github.com/pyca/pyopenssl/
+	https://pypi.org/project/pyOpenSSL/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/cryptography-41[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-38.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+		)
+	fi
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
index 3c58c69f56d2..8b3b51cc39f6 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-localserver/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index c66b676127f3..60ac0faef666 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1 @@
-DIST pytest-rerunfailures-11.1.1.tar.gz 17088 BLAKE2B f9906a40e37fe8710cdfcdbf4070cc0196097b63845d971e6bc47d5a80ee204dcaf63510a53de6498366c6b62c537a9ffe55485e146a7d04001141f276cdc126 SHA512 32b498fd1552f934785ac0f668d9c1c5e955dc0ffdb8a187f03d75fb7e1eafc0a322f0e57a6cc932b8ee639166a264b1dd16a34a83d93acae73129ce7e603cff
 DIST pytest-rerunfailures-11.1.2.tar.gz 17234 BLAKE2B c497fee173f09de42d605d092336105e7144aafcdcfe6cdfbe3df65e09c3ab5cf0bc2d42746662f792c832ac25538f3cd81dc97d6e01201b14b480cb0e2d3a46 SHA512 309a0d180a996ddb5d6eb0833e6abd107887bc17ca3003a2b02bbaf5a4cbd63012618ee293a2a80623ca327b46ce7a5cd53bb341de75e5670a62b84e7ce5f0bc
-DIST pytest-rerunfailures-11.1.tar.gz 16681 BLAKE2B aa1e35659411bc9cc777253982d53b39a969fe1448990008e99903ca3bd2a675f07551ab806a0656b9ed329b519458c02e46dc8fa2f1e0f60be8e3b2457e48d1 SHA512 9a572faab4ee1907e829d38979a87c5eb24dc13edfbbd987801b610f67d0a5ce8743f2bdbe883bd247915e6ede6b73fceae9c4994774e74b1b1a192587829e05
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.1.ebuild
deleted file mode 100644
index 396e50eca738..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.1.ebuild
+++ /dev/null
@@ -1,32 +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
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-rerunfailures/
-	https://pypi.org/project/pytest-rerunfailures/
-"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_rerunfailures
-	epytest
-}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild
index 396e50eca738..ee6bbbff76bb 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild
deleted file mode 100644
index ee6bbbff76bb..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild
+++ /dev/null
@@ -1,32 +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
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-rerunfailures/
-	https://pypi.org/project/pytest-rerunfailures/
-"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_rerunfailures
-	epytest
-}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index b198ccd6a879..b7bad194bef5 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,2 +1 @@
-DIST python-cinderclient-9.2.0.tar.gz 235773 BLAKE2B 1b4e1c27dec6d74a2c95e3aadbdfb296bf6105ba5a23599babfcf8fc5c37fb52eecf7897eaa0680277b903b1725de2cb7d9a108942fa1be5067b25dce8ca0c72 SHA512 76032779bfa2dbc6c7aecc6631ab42b80bff21437d5037e6bbc5d78a23ce493a7a185c4ee8c1657b41c0bf376a6c919b027f81577f2826fc4222334d8216fda5
 DIST python-cinderclient-9.3.0.tar.gz 236158 BLAKE2B 7f21485e907597de77ba9998e190c4ea05d3b968fb1886bd980e5f15addf26b35acf096c2c3b28e6d05d95125dbd568362ce500ff8643da27baa45b165f5e105 SHA512 3e8b957517a394f2b72cfb8f3442d8b57d4487be476e10f16c112134c1e5a8548056ce0a0cf75cac55d8a607e34e535593130f25aa413c86adf301465112dbb2
diff --git a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-argparse.patch b/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-argparse.patch
deleted file mode 100644
index 863e4d93b298..000000000000
--- a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-argparse.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://review.opendev.org/c/openstack/python-cinderclient/+/851467
-From: Cyril Roelandt <cyril@redhat.com>
-Date: Thu, 28 Jul 2022 20:48:58 +0200
-Subject: [PATCH] Python3.11: Fix argparse-related test failures
-
-Closes-Bug: #1983054
-Change-Id: I2d4cb81a394f3c10e5f01945d894746a904fb5df
---- a/cinderclient/tests/unit/test_shell.py
-+++ b/cinderclient/tests/unit/test_shell.py
-@@ -376,7 +376,7 @@
-
-         self.mock_completion()
-
--    def test_load_versioned_actions(self):
-+    def test_load_versioned_actions_v3_0(self):
-         parser = cinderclient.shell.CinderClientArgumentParser()
-         subparsers = parser.add_subparsers(metavar='<subcommand>')
-         shell = cinderclient.shell.OpenStackCinderShell()
-@@ -388,6 +388,10 @@
-             "fake_action 3.0 to 3.1",
-             shell.subcommands['fake-action'].get_default('func')())
-
-+    def test_load_versioned_actions_v3_2(self):
-+        parser = cinderclient.shell.CinderClientArgumentParser()
-+        subparsers = parser.add_subparsers(metavar='<subcommand>')
-+        shell = cinderclient.shell.OpenStackCinderShell()
-         shell.subcommands = {}
-         shell._find_actions(subparsers, fake_actions_module,
-                             api_versions.APIVersion("3.2"), False, [])
-@@ -521,7 +525,7 @@
-
-     @mock.patch.object(cinderclient.shell.CinderClientArgumentParser,
-                        'add_argument')
--    def test_load_actions_with_versioned_args(self, mock_add_arg):
-+    def test_load_actions_with_versioned_args_v36(self, mock_add_arg):
-         parser = cinderclient.shell.CinderClientArgumentParser(add_help=False)
-         subparsers = parser.add_subparsers(metavar='<subcommand>')
-         shell = cinderclient.shell.OpenStackCinderShell()
-@@ -533,8 +537,13 @@
-         self.assertNotIn(mock.call('--foo', help="second foo"),
-                          mock_add_arg.call_args_list)
-
--        mock_add_arg.reset_mock()
--
-+    @mock.patch.object(cinderclient.shell.CinderClientArgumentParser,
-+                       'add_argument')
-+    def test_load_actions_with_versioned_args_v39(self, mock_add_arg):
-+        parser = cinderclient.shell.CinderClientArgumentParser(add_help=False)
-+        subparsers = parser.add_subparsers(metavar='<subcommand>')
-+        shell = cinderclient.shell.OpenStackCinderShell()
-+        shell.subcommands = {}
-         shell._find_actions(subparsers, fake_actions_module,
-                             api_versions.APIVersion("3.9"), False, [])
-         self.assertNotIn(mock.call('--foo', help="first foo"),
diff --git a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-crashes.patch b/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-crashes.patch
deleted file mode 100644
index 3f86c3a50ade..000000000000
--- a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-crashes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://review.opendev.org/c/openstack/python-cinderclient/+/851446
-From: Cyril Roelandt <cyril@redhat.com>
-Date: Thu, 28 Jul 2022 20:14:36 +0200
-Subject: [PATCH] Python3.11: fix crashes in ShellTest
-
-Closes-Bug: #1983047
-Change-Id: If20abef109ddd7107c83b5886beb666a6550a640
---- a/cinderclient/tests/unit/test_shell.py
-+++ b/cinderclient/tests/unit/test_shell.py
-@@ -120,9 +120,9 @@
-         # Some expected help output, including microversioned commands
-         required = [
-             r'.*?^usage: ',
--            r'.*?(?m)^\s+create\s+Creates a volume.',
--            r'.*?(?m)^\s+summary\s+Get volumes summary.',
--            r'.*?(?m)^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-+            r'.*?^\s+create\s+Creates a volume.',
-+            r'.*?^\s+summary\s+Get volumes summary.',
-+            r'.*?^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-         ]
-         help_text = self.shell('help')
-         for r in required:
-@@ -132,7 +132,7 @@
-     def test_help_on_subcommand(self):
-         required = [
-             r'.*?^usage: cinder list',
--            r'.*?(?m)^Lists all volumes.',
-+            r'.*?^Lists all volumes.',
-         ]
-         help_text = self.shell('help list')
-         for r in required:
-@@ -142,7 +142,7 @@
-     def test_help_on_subcommand_mv(self):
-         required = [
-             r'.*?^usage: cinder summary',
--            r'.*?(?m)^Get volumes summary.',
-+            r'.*?^Get volumes summary.',
-         ]
-         help_text = self.shell('help summary')
-         for r in required:
-@@ -152,9 +152,9 @@
-     def test_help_arg_no_subcommand(self):
-         required = [
-             r'.*?^usage: ',
--            r'.*?(?m)^\s+create\s+Creates a volume.',
--            r'.*?(?m)^\s+summary\s+Get volumes summary.',
--            r'.*?(?m)^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-+            r'.*?^\s+create\s+Creates a volume.',
-+            r'.*?^\s+summary\s+Get volumes summary.',
-+            r'.*?^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-         ]
-         help_text = self.shell('--os-volume-api-version 3.40')
-         for r in required:
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild
deleted file mode 100644
index dcf886bd7a65..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-# Tests fail with dev-python/prettytable-3.4.0
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		<dev-python/prettytable-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.1.0-fix-py3.11-argparse.patch"
-	"${FILESDIR}/${PN}-9.1.0-fix-py3.11-crashes.patch"
-)
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild
index 1a4d56d25123..0c1c92b9f4ae 100644
--- a/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index f3072f2a6f20..41738274c7c9 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,2 +1 @@
-DIST python-glanceclient-4.2.0.tar.gz 204378 BLAKE2B ee869971f769dd01da2dcf7e1d7ca07e120b5a2ad5a210db7b6cf813a0bb14bb00f8d7f64a4a5c03de61983abfad0448ff3ad9ab4b9acb485a897ae39e4c9409 SHA512 4977db9650ec35ad663fdaa9c576fb1c63efddb9f3df8a92da9e97e530bb5a63016e2492f81239fbb4d01cf260e673c2d489566c10483d2bf6ff9e0653e3bd21
 DIST python-glanceclient-4.3.0.tar.gz 205005 BLAKE2B 63f99858e4fafd041a99a34e3a0a22403f637d2317fe236fd9da55f84f7bc58b410fe4b859af2cf7ccc8cb4f8cf17f80e57afa846a9f33e9a54b1da069f6a6ea SHA512 7f381a6f997b8d1c73c9d2bafa14ecf3d4899640f28d669b7b4762a9c01d8df366b616f0be9bc00c7ea4561f407adceb8d10e721d12d4f5fb5790fd4cdb7362d
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.2.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.2.0.ebuild
deleted file mode 100644
index ef88f1e691fa..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-4.2.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-glanceclient/
-	https://github.com/openstack/python-glanceclient/
-	https://pypi.org/project/python-glanceclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/prettytable[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b glanceclient/tests/unit
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.3.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.3.0.ebuild
index 31cff58797ad..de215af1bddf 100644
--- a/dev-python/python-glanceclient/python-glanceclient-4.3.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-4.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index ffc98dcca717..2036890b0059 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,2 +1 @@
-DIST python-ironicclient-5.0.1.tar.gz 220911 BLAKE2B d80da14f89e4fa890d7b8519dcb8785ff3f33fce17ce6bc2a3a5a7e3e450577f6dbb60e2268bd65245c4807e34eccd22e0793b3246e15b6998a5b89bffbadc39 SHA512 394765b7b50ad7bec5e7517f0114118ba705c06f17bf562d18891011bfc6ad85938813817800d12d7c4f0f0336cfb611e37ba52e1920f48162a59559d5ee09d1
 DIST python-ironicclient-5.1.0.tar.gz 221014 BLAKE2B 32547e612c0f381ccd9543f3d130dc144616cfdef71c37c9b5ac556984bb875dae4cd63ec441db3aaddda8075c7969b22fa063412b50b3f6610fe3de4cd34aba SHA512 9d5f37a9e050c7b05ec827303411da2a98c82ec17d1062f7ded6360a3d0dc1e6f5119ca302716b63cedff9750e1de2de3fe0744e45ddcc63dbfb2544204714fd
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.0.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.0.1.ebuild
deleted file mode 100644
index 12264610fcb6..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-5.0.1.ebuild
+++ /dev/null
@@ -1,46 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild
index 4e99ec4ffec4..fe1ac5570b8c 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 654cde8048b7..2837adb778a1 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,2 +1 @@
-DIST python-neutronclient-8.2.1.tar.gz 305119 BLAKE2B 75c75594a9050f7d78921eb72a85ab216862c2c00ce622c5392cc089b9611aa7ce48650eabfe71ea14a8329c10cc4922b8de982e79f238663d8f315c7b0e99cb SHA512 dc5e0e0a0d16ece56993b316db5fe93c8c5c9c50407229900fb4f21cd049e1d7d7ddd01f04b5a7b2e9d0c4623c94079a7fa8568068b30768ac3e2a51464a20a5
 DIST python-neutronclient-9.0.0.tar.gz 299550 BLAKE2B d7ef2cf96880083271039ecc107838b1c884fbe6774bb6952138a06c13360b543b8804758800b13780caa92afd98dedbb8c68d4f1b9721e8efd8312590469078 SHA512 213a4452a5a6f3ff813539ab67637578faf5aea87eee678fa3d3523c5b0c9623e13f6cb2d3d0537e936c936f41d4af933148a837e5e6e0b64b6dec2fd5a75eef
diff --git a/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild
deleted file mode 100644
index 99d4d3080623..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild
+++ /dev/null
@@ -1,78 +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
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-neutronclient/
-	https://github.com/openstack/python-neutronclient/
-	https://pypi.org/project/python-neutronclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Needs osprofile
-	rm neutronclient/tests/unit/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b neutronclient.tests.unit
-}
-
-python_install() {
-	distutils-r1_python_install
-	# stupid stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.dist-info )
-	[[ -d ${egg[0]} ]] || die "python_quantumclient*.dist-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild
index 414843ace148..99d4d3080623 100644
--- a/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 0c88c1e7147a..7e60e2218445 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,2 +1 @@
-DIST python-novaclient-18.2.0.tar.gz 337940 BLAKE2B 8b019d55089688030696a3407cbc33df09b9857fc63173a4ed4983374a35593612e43e99b0b840e239fccb42b31d97d16502d0284734789acb7b647b001b17a1 SHA512 3321449f143c253a494477296e2b4ccb20ffba877f0257b4f5e39c977946748275018c8b4094b370d2d4727325c9292a5f2c6f3f11478bd13469174de9d19390
 DIST python-novaclient-18.3.0.tar.gz 339238 BLAKE2B b057e3156cb488c7796a9f7cc2a793bfc4dfea41f6b3b7dfe6eaa8113c6d0f84cdd37890358b5ac700aecf872ead4eab509001afc0c91d96ca9ada48e932352b SHA512 7a365a512922daeda034fde3404f9962039a8dc9164b8261a916131955f45a0539302a051871bac5efdbc42bb98f590221729a7cd552cf05116cc5853b77690d
diff --git a/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
deleted file mode 100644
index e507fa024890..000000000000
--- a/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
+++ /dev/null
@@ -1,65 +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
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-novaclient/
-	https://github.com/openstack/python-novaclient/
-	https://pypi.org/project/python-novaclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-# Tests fail with dev-python/prettytable-3.4.0
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		dev-python/python-cinderclient[${PYTHON_USEDEP}]
-		dev-python/python-glanceclient[${PYTHON_USEDEP}]
-		dev-python/python-neutronclient[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/openstacksdk[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		<dev-python/prettytable-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
-	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b novaclient/tests/unit
-}
diff --git a/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild
index c12b0f2fe025..e507fa024890 100644
--- a/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 9dc006f375a6..6ed1b72322b7 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1 @@
-DIST python-openstackclient-6.0.0.tar.gz 838447 BLAKE2B c6b213b022e8c75d3a94752b29cebda4d9ca1d329dc1cb0b470f6e787dd930b379d16bec6c4a0047e63110e01dbf48bee72ed6ccbf54036fa3d1d5de55487e8b SHA512 20bd8da025ee3c69a5e491089edcb42f961c5109563718198ddd22fab8d6928fa08afd6a7db608c70386bd2b61c571c2fadb1c76f84c3d7f1a60c65d4520dfa6
-DIST python-openstackclient-6.1.0.tar.gz 881389 BLAKE2B 6de827c6b85b412034e9444cef656fd748ed1c338c16c22762d3918291090d6ca289a4f7343ee0708e971a693990707fa8cf7a5db1e7e1bdc040a701988258a6 SHA512 6a5363fdd2da5ba3a6ee31f0f0c060b3d2520149a3c22583d5020bea75f93faeccd62946b88fc4d8cc6b0776bedb54d3c88b61761644ad86de973a8a0a1dcc8c
 DIST python-openstackclient-6.2.0.tar.gz 886194 BLAKE2B 23c8dd3f1625ecde66b09168a9c7e01043a67b175d4af3df179b9794933a88d5f8db5a555152df20a5c37d0ab773a1d241e0030f5fbe98f5e946f7b094d2e4c3 SHA512 84a6535839693abe126cf014a94097ee32eba03c3d49973454591cb398c1fc9a9ce9e3765a64d0b1b7e14895de90d42c9e967a7f778b01ff8bac2ee6e7d0f609
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild
deleted file mode 100644
index 59bdb53669e6..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-6.0.0.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="
-	https://opendev.org/openstack/python-openstackclient/
-	https://github.com/openstack/python-openstackclient/
-	https://pypi.org/project/python-openstackclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.56.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on specific runner
-	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild
deleted file mode 100644
index 7c506614bc13..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-6.1.0.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="
-	https://opendev.org/openstack/python-openstackclient/
-	https://github.com/openstack/python-openstackclient/
-	https://pypi.org/project/python-openstackclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.103.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on specific runner
-	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.2.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.2.0.ebuild
index 7c506614bc13..ace5097a0e29 100644
--- a/dev-python/python-openstackclient/python-openstackclient-6.2.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-6.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 658b44ffec2d..364789090756 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,2 +1 @@
-DIST python-swiftclient-4.1.0.tar.gz 201954 BLAKE2B f81368dae2d0e56b178c00c9d4b0989fa9629fd909b8413a262103109a092bd8134679be41f8f8176d638f215d9e03b2e60013deed9f0b72d7ae4be181a1b4e0 SHA512 85b4ff0a49d149e6b42b257d8f815de48a549d377d7db807751f485d8a9636e4d4208c99cbd1cda3d9195c45d416911a4e8b65fc373e93d722cade0968515524
 DIST python-swiftclient-4.2.0.tar.gz 203334 BLAKE2B 5c64c785b8d3db45c5d89d3c09f27d0caa7a7f7a57afd935c2f10b050882734e966eb5b027bc956b450a19e6aa5d6ed2ad955db556b83a1086ac358d1c82025c SHA512 8426f39a5d37281816570c13491da1f459fe03182a8041fbd362733376d0c7edda6b51e4d3bbcb5ceed79ec7746e127760d1f936326b50a1cc7de102590f45d7
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.1.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.1.0.ebuild
deleted file mode 100644
index 08df17cc890e..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-4.1.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	# fix duplicate script/entry point
-	# https://bugs.launchpad.net/python-swiftclient/+bug/1975361
-	sed -i -e '/bin\/swift/d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.2.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.2.0.ebuild
index a39905589df0..ba02857c8999 100644
--- a/dev-python/python-swiftclient/python-swiftclient-4.2.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-4.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/raet/raet-0.6.8-r4.ebuild b/dev-python/raet/raet-0.6.8-r4.ebuild
deleted file mode 100644
index 486bff2711d1..000000000000
--- a/dev-python/raet/raet-0.6.8-r4.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
-HOMEPAGE="https://github.com/RaetProtocol/raet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/ioflo-2.0[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/raet-0.6.8-msgpack-1.0.patch"
-	"${FILESDIR}/raet-0.6.8-py310.patch"
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "/setuptools_git/d" -i setup.py || die
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib || die
-	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
-	popd || die
-}
diff --git a/dev-python/raet/raet-0.6.8-r5.ebuild b/dev-python/raet/raet-0.6.8-r5.ebuild
index 6736cf75d4d0..c17cfbe37739 100644
--- a/dev-python/raet/raet-0.6.8-r5.ebuild
+++ b/dev-python/raet/raet-0.6.8-r5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 2ac8ae77309a..8cefaeb936ce 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,2 +1 @@
-DIST rebulk-3.1.0.gh.tar.gz 252775 BLAKE2B 9624a02f8df950e3efa77c0fe7c3dfa083c255b10c118a571aa4f4fb8ee95f663f7ba45e66e77ec4c3fb801a6a1e8e369b04a6ec1323aeed6c8b13deb286614c SHA512 591bbfeef1d472722d6250cd35f308c0ac9c5f2dee77f4702f1d9fa1e41bb1a16bbf7c4aa634d0b4f43d7f9093bc1e2faa38edb0170212fea2502ff6a284fcab
 DIST rebulk-3.2.0.gh.tar.gz 254923 BLAKE2B ea9501aa70d7842fecab8621ca7c58aed76dba419c46f92e0fc7fa7e300f0ac9d7a457fc3b6bd14d02296449e15c918d63be8060ab1df4a51fe77e383daf6c33 SHA512 17928a0fcf1a78a592289bb9c7c0ea48e8b4d93ccd77793065a51a54258c2af857e9da6955cad552fa53caf76a95ee002a789c35fe248a909971c8afc7b6dfa5
diff --git a/dev-python/rebulk/rebulk-3.1.0-r1.ebuild b/dev-python/rebulk/rebulk-3.1.0-r1.ebuild
deleted file mode 100644
index 8e99175de3d4..000000000000
--- a/dev-python/rebulk/rebulk-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="
-	https://github.com/Toilal/rebulk/
-	https://pypi.org/project/rebulk/
-"
-SRC_URI="
-	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove base64-encoded zip archive with pytest.
-	rm runtests.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/rebulk/rebulk-3.2.0.ebuild b/dev-python/rebulk/rebulk-3.2.0.ebuild
index a48b05f88b8a..9de02947cf6e 100644
--- a/dev-python/rebulk/rebulk-3.2.0.ebuild
+++ b/dev-python/rebulk/rebulk-3.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index c2b4ab0b6a2e..f3cb2060aac1 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,2 +1,3 @@
 DIST requests-cache-0.9.8.gh.tar.gz 1540296 BLAKE2B 8b2ab1227b28c3822cd9111375c8759f5d7099f2724680a6560e4e14cd16558a1dcb8dd98d043fdf2f9a3861d76dd0d2c2f84df059338e9fa28c1257e74e87b9 SHA512 f428a7b498d2ef2b6c23d3715bac2274c320b6f9d6f56017e69ab5fa6b8830242a2f335ed6c3758a741a51f108c6dacae1a447ff8f05ca5686303caf48a1dc59
 DIST requests-cache-1.0.0.gh.tar.gz 2914633 BLAKE2B 5402d3b6bc99bb0b72a484854b83450d8f57fd0aff39661d6f2452c69cc0ca9b140fd2ac7b02110e47bcc0bf2497c58912330d7472b9f1701b8d4e2a54f7cef7 SHA512 92d6e1b9afb158f824a4b20d83c7b30a5988476b741213b0663df6095df1753da2dcd6516372ba383864e19d346850a356e9370b2ae27554effcc3f0b6a078c8
+DIST requests-cache-1.0.1.gh.tar.gz 2914175 BLAKE2B b1c3c544a761e127204172381a66b0175f09e49040a7d0f04760cf03b253846ac7e831b7c15d4b128e47e5bc132ea3493eba2784ac442be4dc0eab262e2251b0 SHA512 ec5788e31f60fd95e575d01af1163f981757972db6557d7a62da2ca0719e84262cf66cdd9b40c73cca540b92d6b7f6beba1aa42bedba528734c61edf5013ec3d
diff --git a/dev-python/requests-cache/requests-cache-1.0.1.ebuild b/dev-python/requests-cache/requests-cache-1.0.1.ebuild
new file mode 100644
index 000000000000..281ddad129f1
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-1.0.1.ebuild
@@ -0,0 +1,72 @@
+# 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_{7,8,9,10,11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 optfeature
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/requests-cache/requests-cache/
+"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/cattrs-22.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/itsdangerous[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/rich-10.0[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+		>=dev-python/ujson-5.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local EPYTEST_DESELECT=(
+		# Requires Internet access
+		tests/integration/test_upgrade.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "redis backend" "dev-python/redis"
+	optfeature "MongoDB backend" "dev-python/pymongo"
+
+	optfeature "JSON serialization" "dev-python/ujson"
+	optfeature "YAML serialization" "dev-python/pyyaml"
+	optfeature "signing serialized data" "dev-python/itsdangerous"
+}
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 6024937a58cb..996dd6e4504f 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1 @@
-DIST rq-1.12.0.gh.tar.gz 611434 BLAKE2B 8e13d7c02a56fe71cb3e492654c124f8b0cdbda298687bfc57b3037ff85a6416d7356125e48ae723225739dd0ef0eab49fbb2ed5b2e424c93d1a177c85f00800 SHA512 32d10a96213bd23f21f3dada53771047f9d66a73590a0f1cc0086981f1f9276e0bc9d51b8fd3ba12a140ea71b004c995a82aa6746e1a793374f8fea762602c18
 DIST rq-1.13.0.gh.tar.gz 616679 BLAKE2B 026914ab01f769797e1f7fabc944b5ccdeb1ce1957c7acc72d067e0bdd113ebb30f0060ea5adbceaac5e69b40e176c09a0b1f216cffb02132772e72151b79986 SHA512 6c3b4bb868cae6ffd07718b3f517350eba2effc1b3ae70ef601984cc525ecfb3f82f8569a2b0f333c5f248d3befbe3d4953f5058f8e9cb2f08ce6dadae963902
diff --git a/dev-python/rq/rq-1.12.0.ebuild b/dev-python/rq/rq-1.12.0.ebuild
deleted file mode 100644
index 71cd68f08136..000000000000
--- a/dev-python/rq/rq-1.12.0.ebuild
+++ /dev/null
@@ -1,60 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-	https://pypi.org/project/rq/
-"
-SRC_URI="
-	https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.13.0.ebuild b/dev-python/rq/rq-1.13.0.ebuild
index d3f8230dcf81..71cd68f08136 100644
--- a/dev-python/rq/rq-1.13.0.ebuild
+++ b/dev-python/rq/rq-1.13.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/scipy/scipy-1.10.1.ebuild b/dev-python/scipy/scipy-1.10.1.ebuild
index ea011dc9dbcb..ba064ef51b2b 100644
--- a/dev-python/scipy/scipy-1.10.1.ebuild
+++ b/dev-python/scipy/scipy-1.10.1.ebuild
@@ -36,7 +36,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="amd64 arm ~arm64 -hppa ppc ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 95842afea95e..675ccc16e0a4 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,3 +1,5 @@
 DIST selenium-4.5.0-py3-none-any.whl 995204 BLAKE2B 214050a4e410a4689255ec8472a1cb35a37596e73d46c48769aa8e184b6f84e281a20e7e5f812b8185edacfcbca6eed77507aa59ffcaeae384f962b4214928a0 SHA512 b22d80d750c85337a2b793799b5a63b11bed45d11b874c1a64c02f53b4adb57263e69bebc79203de3bdfa5b8708203959971723cf0aef7fb68bd1b2a9028e9d9
 DIST selenium-4.8.2.tar.gz 6729347 BLAKE2B b3c4632287a4544bc159122c8a2522463ac9c422f305d9dafb05984bf561f237299a11fd21d508e2b33696f5e24cb6e5bc910866c42aa4700d2a32635c4b6394 SHA512 247dce400860f81cbb4b948a5d0065680f3aeb9b570a15c5c94ba9c3bcbc0e3cfe0b84eafaa83a03b77bfad433df508f3dcd0094b0149b4d3f19d60a60587dcd
+DIST selenium-4.8.3.tar.gz 6332823 BLAKE2B cf874ab56182471055aa3d76d8828529f3c54f04eb9b7bd9342a87eade9c39875eecf00fce4f47019d5453bd65a0e5ace99170770394fc21bec1cf8d7998c579 SHA512 8bcaacb1f809e92ba9c1d14ccc0560979a29d27d61bfcd7d7fa08c3ee877c98699a0c5ffbb361ea37f0cc01a51b44b3d04ed4df025340bea7f842b4376d2715c
 DIST selenium-selenium-4.8.2-python.gh.tar.gz 90628267 BLAKE2B e5d6dd0615cd7410e7328f1551b3ecbf421fb12ae20a602f8d23a6260520eefdc888b4ac210e00366da047ff3f755794e366e4cbaed1e7822b1f0254bf58af53 SHA512 f28b4da43cf95df67b75a44dd1b95a09360e70ad06506b5f617bf94fcc15e086688a282d8c3e4d4e3ddf7dad13aa7e842b36472d916ed5233af0e9dd61fbcd07
+DIST selenium-selenium-4.8.3-python.gh.tar.gz 90236640 BLAKE2B 943497a5015da8a626f210568715c6839b566feb7a04cf28230c2eded44ca3d110d782d9f90730206c0a2135200d81a960d60974662ce63dc1cf2e3cc09a4f0e SHA512 d3182eec2229872860ba370e99b3093fe73a519e839bfdcd01b2c3cc74e28b51c272e7fe176c2123d2af21d6cda1fec99051362c4ee10469359d8a24a8bdc7e8
diff --git a/dev-python/selenium/selenium-4.8.3.ebuild b/dev-python/selenium/selenium-4.8.3.ebuild
new file mode 100644
index 000000000000..4346d4e90835
--- /dev/null
+++ b/dev-python/selenium/selenium-4.8.3.ebuild
@@ -0,0 +1,63 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+# upstream sometimes tags it as ${P}, sometimes as ${P}-python, sigh
+TEST_TAG=${P}-python
+TEST_P=selenium-${TEST_TAG}
+
+DESCRIPTION="Python language binding for Selenium Remote Control"
+HOMEPAGE="
+	https://www.seleniumhq.org/
+	https://github.com/SeleniumHQ/selenium/tree/trunk/py/
+	https://pypi.org/project/selenium/
+"
+SRC_URI+="
+	test? (
+		https://github.com/SeleniumHQ/selenium/archive/${TEST_TAG}.tar.gz
+			-> ${TEST_P}.gh.tar.gz
+	)
+"
+
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}]
+	<dev-python/trio-1[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.17[${PYTHON_USEDEP}]
+	<dev-python/trio-websocket-1[${PYTHON_USEDEP}]
+	>=dev-python/trio-websocket-0.9[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: we may need extra setup or deps
+		test/selenium
+
+		# expects vanilla certifi
+		test/unit/selenium/webdriver/remote/remote_connection_tests.py::test_get_connection_manager_for_certs_and_timeout
+	)
+
+	cd "${WORKDIR}/${TEST_P}/py" || die
+	rm -rf selenium || die
+	# https://github.com/SeleniumHQ/selenium/blob/selenium-4.8.2-python/py/test/runner/run_pytest.py#L20-L24
+	# seriously?
+	epytest -o "python_files=*_tests.py test_*.py"
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index f6b7c5a3d835..299e03a797b8 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,2 +1 @@
-DIST simpleeval-0.9.12.tar.gz 22693 BLAKE2B 6c0b08859df8b7b55970d0d2a96d2b58a98c9bf43efed4952c7f0220594b1aa531398e881b9fa41caf40d2bd8d5d2e615c4da724a2850ddc05f9bfbda52c8841 SHA512 9b00bfd13a7c7bd05c1c68c43dcd2b52abe0ea648d640780a05499c95ff96bb4366add1d92086ec7e840075fcbff692e133ddbf4c2b8497dd80e115c24367641
 DIST simpleeval-0.9.13.tar.gz 24535 BLAKE2B 1cf644cac8e334725eb2a6c0d058b50646b3b405b1cf91a426b2c1701525b4b11f154c5990e267434537657850d29a760f30612834ec5d4c5870580767404cf7 SHA512 e8d518e16f68a2e5f28bc4fe056851b8e1507a147539820afb52e606a8815d5962fe9144c106e361213b4af7903e93e1d2db9a7e759b5ac488e8614de90a8ae7
diff --git a/dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild b/dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild
deleted file mode 100644
index 317421eb0258..000000000000
--- a/dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,22 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="
-	https://github.com/danthedeckie/simpleeval/
-	https://pypi.org/project/simpleeval/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/simpleeval/simpleeval-0.9.13.ebuild b/dev-python/simpleeval/simpleeval-0.9.13.ebuild
index 4bc426c02db4..dc5d391598e2 100644
--- a/dev-python/simpleeval/simpleeval-0.9.13.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.13.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index df8b15946157..40e999b561fe 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,2 +1 @@
-DIST sphinx-prompt-1.5.0.tar.gz 21537 BLAKE2B a5bc69797ea526bc3d66b52e98b80cbb9958add084ea6a4d70a85cc06c69271bbe9e658eb517b78dd758178b6f3b93d92ea87e9432e5c28a61307706a3c34ee8 SHA512 b3d023388eb024303e9264e621ad379367916f8e3567192fde90b3f0d96c94c53d783c2e14970ad3d85895053b3aab9ece6d9573d3bab1dc894e0e04757f3a40
 DIST sphinx-prompt-1.6.0.gh.tar.gz 38245 BLAKE2B da2ac8564e14a10d5b51ea5ebd2e5578e7c2795ea7f3c5d3f054c621090e4bf634b9a1f578f4c010bbeaa61cc0d18f1a48ce6c0d9a316e34504ada1b4fb61d7b SHA512 a896dad9d333fde843ab90f331be40c533fa32f75f68dfc012a6296d96661e726647250642e1cc4c54125d9acb237add640008671a657a5e47a885450831c21e
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
deleted file mode 100644
index 45ae944c743a..000000000000
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx directive to add unselectable prompt"
-HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
-SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.6.0-r1.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.6.0-r1.ebuild
index d79882caf8c2..0d04663433dd 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.6.0-r1.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-rtd-theme/Manifest b/dev-python/sphinx-rtd-theme/Manifest
index eb9bcc6d300f..900da5c76a4f 100644
--- a/dev-python/sphinx-rtd-theme/Manifest
+++ b/dev-python/sphinx-rtd-theme/Manifest
@@ -1,2 +1 @@
-DIST sphinx_rtd_theme-1.1.1.tar.gz 2783043 BLAKE2B c132cc4bba5459ca29740222cc917aac0fa5afb26748b1bd3d457ed0a02e63cd973deecd9a3d509187f54ae85798cb63fdfaa293615eae278228753808fd8c50 SHA512 c3e6e3a9d25b9c48a9830e696ca5c8f0c185a0328c76032cbe6dcfb93cda7ad9a724ec4e0e2a99079db28f35aa61ef2f569b87ce98a01c47a9701a6070bc395e
 DIST sphinx_rtd_theme-1.2.0.tar.gz 2784826 BLAKE2B 62d0af56a29d66831447009991a5e0fb0a483ca91ac2ef7e7ce0b19510281308b49219efd0c6e1bd8fc95c2acae233133ce2f89b7507c2b20f0f322e59ab06e0 SHA512 dd407c648c5512a79e31a106825c6f9ec4696b14d950830ab36faf912ea804b48b3a5d09c6a144e9cead773e4c057cbc809d7582deea1b253ce71b756f7f6b10
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.1.1.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.1.1.ebuild
deleted file mode 100644
index e54a120e1f0f..000000000000
--- a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.1.1.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/sphinx_rtd_theme/
-	https://pypi.org/project/sphinx-rtd-theme/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin docutils
-	sed -i -e '/docutils/s:<0.18::' setup.cfg || die
-	distutils-r1_src_prepare
-
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
index 12e89c1250db..2c22be818bd6 100644
--- a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
+++ b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-4.1.ebuild b/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-4.1.ebuild
index a34326eb3689..0f8610c5836c 100644
--- a/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-4.1.ebuild
+++ b/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 # MIT for jQuery
 LICENSE="0BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index c1e796b4b7ba..cedb274abe4a 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-spelling-7.7.0.tar.gz 57444 BLAKE2B 22491369888d632cf158013cb3634e110f3c6a34c59e410a10081f5d1857b85b66f62caf8987058c133f80a8230733fc6e749404207503f0b2441a152fdd5118 SHA512 3599e2d0bcb9bf908b3e6f41184256114e4ab5378543be8bfdd4f55dca249c4feb4fbfda8db4495acfa72fd9ac6c416a0c988f5d30f530eb8deebbcee5833245
 DIST sphinxcontrib-spelling-8.0.0.tar.gz 37610 BLAKE2B 8ae9fb62a5a7d35194884ce075b27b0e54f54c18d55f9573bc53ef7b2f953011655631e37ac3bb7c988df470c8cdf1cb576e4830c61fddc068e50d382d067751 SHA512 0d8c21ea660516238c43fabb505666dfee15abb39f538c40c6b61f91e20c246b16aa170cd444263507dd51913a27fc7719cddb28f30eab26825b565f70dd3ab6
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.0.ebuild
deleted file mode 100644
index 2485c0ac60ce..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.7.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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
index 166a8c27c728..ff4a7e40f1f5 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-8.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pyenchant-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 24d7bad1b06e..f667fecbf393 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,4 @@
 DIST trimesh-3.19.4.gh.tar.gz 12673418 BLAKE2B c54e0e1a946b858371d5de2f028bbc64a353a06859f428d6e221058a46e853bb7f245d7348b1cc7fbbdb930ba9600e24a39c2884a9acfa00b9d31d6576b87959 SHA512 b490e6d021a41c0a094c5e3596033a189d08310c04a2ce70c9b72d492e1cad1b5c9f110487c66d0a37eed97754e979c7b449d10a6a6abdbd81241099c248d5cf
 DIST trimesh-3.20.2.gh.tar.gz 12683352 BLAKE2B 3ed73e426fd72723d19b668aae790f44ad46b310b6ddbbedf1e87aa56880037fa09b43921131ce2a5bff02022e6630222c63fb205a4345e81959e14b0013c3fa SHA512 fb6ca184b9d62e7820f1b92c8ce67a02eed6355c49dbb209b328e149ab6e600c306a10bcbae3bceaaec0244874eebc8bdf06709310f8458e9f72ee9ad213ad65
 DIST trimesh-3.21.0.gh.tar.gz 12688064 BLAKE2B 5ac8c4cd3f087b63ad6e224a693380a7f5cad5d1e09e2d21d91410f462d51833baf09ac7015c52fa85e475832122c0aa61e8bfa340d42fb08c9e9fb0e5d8dbdb SHA512 1805213b8fe19fa5716ad8da1c23d7e23d06e96de13a18f59907a62fdf5b67ad9fb7842a7f19b4a315444261f210bbb312f6b0bbf728ee015f9d489e2dce4f0a
+DIST trimesh-3.21.1.gh.tar.gz 12689151 BLAKE2B e0d04a6003656f096404ec8972907381f5950f7a6ac3864963fc9a52dc015ad42d39e88ced8d125f725333ddde722358ebac9f263fda0cd21d663af42318bd50 SHA512 08716a310db8cae86a725072a6626b3703ffac3532182ce22389cf85fcdf5853ad8f17cfd8c34afde0e6dc0f2125d910d130810c3cce8e8dcb1605737074a3e0
diff --git a/dev-python/trimesh/trimesh-3.21.1.ebuild b/dev-python/trimesh/trimesh-3.21.1.ebuild
new file mode 100644
index 000000000000..50458139f318
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.21.1.ebuild
@@ -0,0 +1,65 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 87e9f5613d75..207f2dfa63ee 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,3 +1 @@
-DIST weasyprint-57.2.tar.gz 429120 BLAKE2B c97ba3fb3eec431a7de9a1a8a440290005de11b11d4abac4dd993a7d2fc4c14e64bdf13b8f8c12d4ba4f94b2049e0b05c3fb950c8b204f446323038c9c471451 SHA512 11b9469d37820439b1d0dad0117dd1c9649011c71aabb0e27008b303e5c851215ce9f0b271da9a74d614e54cb23f9c6036b6e094016b5688f6b700fb7444338f
-DIST weasyprint-58.0.tar.gz 433708 BLAKE2B 3ebb87eeeefad8d8a1a6a5d1ec54bef5cd153e8f837d19f87ce6ee891d4a20d41b38532972e9942e4d2123107491db42e0d690a95b8330510010ec2267c2948b SHA512 6c8258b1539ba7c6c692d0a54d0adb36a252d9f1a407df7934cf37202813e08e16e97d2f70a322a2787e2ab64545f4a4fd745fe4771b9383f520b9fc8d51db28
 DIST weasyprint-58.1.tar.gz 433877 BLAKE2B 2826629d1ed7825a9231ca69323961c7065138e04ecabbe59b07accb5264b915ffaa9ab999c3067afd033c25eecdd34b6bfe2f25d3c787abf5d4cec94295ffc0 SHA512 75a3512ce02551c2e8247cf7982d3db683c8aef92215e5b4584ca20d5e3f6a4603c65f98e8fcf513b8aff82ebedf221da7dd243e344c9d3626eaa7907fdbd5c2
diff --git a/dev-python/weasyprint/weasyprint-57.2-r1.ebuild b/dev-python/weasyprint/weasyprint-57.2-r1.ebuild
deleted file mode 100644
index 7fef6ba34750..000000000000
--- a/dev-python/weasyprint/weasyprint-57.2-r1.ebuild
+++ /dev/null
@@ -1,46 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		|| (
-			>=app-text/ghostscript-gpl-9.56.1-r3
-			<app-text/ghostscript-gpl-9.56.0
-		)
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/weasyprint/weasyprint-58.0.ebuild b/dev-python/weasyprint/weasyprint-58.0.ebuild
deleted file mode 100644
index bc748f853797..000000000000
--- a/dev-python/weasyprint/weasyprint-58.0.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=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		|| (
-			>=app-text/ghostscript-gpl-9.56.1-r3
-			<app-text/ghostscript-gpl-9.56.0
-		)
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/weasyprint/weasyprint-58.1.ebuild b/dev-python/weasyprint/weasyprint-58.1.ebuild
index bc748f853797..a755e2003cb8 100644
--- a/dev-python/weasyprint/weasyprint-58.1.ebuild
+++ b/dev-python/weasyprint/weasyprint-58.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index dac790ea795d..e167ba1f9fc1 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,2 +1,3 @@
 DIST zope.i18nmessageid-5.1.1.tar.gz 30589 BLAKE2B aa87ecc7b757c2f3ff877ea908df102477b5f888067a6bf98aab6467adaf7baa713c5b413f528cc0010b4082d03b48d069537dbf223713ed914982eb8f040433 SHA512 4762dc67d4b665ede25eaaeae1458257fef994207a887f128fb5c64685bcde08bc17e24890cf36a14febb57295813c9152f14aeea854493e4197702bb4e3d719
 DIST zope.i18nmessageid-6.0.0.tar.gz 27791 BLAKE2B 3589c46c0405f21e50df3eae1bc3aaabccd88d16cbc696634e31dffa866910965d050aef50534d9a04799d918830e78e8b977162409d7862e72e17eed4740c15 SHA512 415cf30bc571032719e39c4fdf12f3d8e877b975774a87fea22ff0577d83e4b1582c0af9744514b46253ffee04c4599c02803798cef2b514e8111c7eea17e34a
+DIST zope.i18nmessageid-6.0.1.tar.gz 27797 BLAKE2B bab5af18f9bec8a41b633bcd4081381dbda37b71eef32153e6889ca4b7760503f1ac2c8749b508213629505904e85166ea17d1898a5c50d5bcd55ae4a714c2a6 SHA512 8b50df352e7c53ce88c7adbc0eb1155b198ea0b200b411324819ffd59517a403f0be78746c76a7018e61e6272cdc1be1b623dcab1db28dafa3abf2a714623a4b
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
new file mode 100644
index 000000000000..fa1493119d30
--- /dev/null
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
@@ -0,0 +1,44 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
+HOMEPAGE="
+	https://pypi.org/project/zope.i18nmessageid/
+	https://github.com/zopefoundation/zope.i18nmessageid/
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	!dev-python/namespace-zope
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "s:'setuptools'::" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
diff --git a/dev-python/zstandard/zstandard-0.20.0.ebuild b/dev-python/zstandard/zstandard-0.20.0.ebuild
index 1040f372658b..b6f855dc6180 100644
--- a/dev-python/zstandard/zstandard-0.20.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.20.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:=
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-03-25 12:23:53 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-03-25 12:23:53 +0000
commit	e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa (patch)
tree	5fd8d31889cd922cb12a8ea0f478d38e4955167f /dev-python
parent	820942d62f75419e6e7bb336ba33cf77910000de (diff)
download	baldeagleos-repo-e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa.tar.gz baldeagleos-repo-e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa.tar.xz baldeagleos-repo-e7a95ac29d5c66fcdd630ab5c8eedb70f8d152fa.zip