Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-05-20 13:25:09 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-05-20 13:25:09 +0000
commit: 422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f (patch)
tree: 04ccfefb247b41c21f693be687f6865da2b3a22e /dev-python
parent: 03932a0109e4f4c6a80766bdc61fd6c52333a24e (diff)
download: baldeagleos-repo-422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f.tar.gz
baldeagleos-repo-422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f.tar.xz
baldeagleos-repo-422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f.zip
147 files changed, 811 insertions, 2079 deletions
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
deleted file mode 100644
index 04d5fa02f6d8..000000000000
--- a/dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index f20e14788796..3c7ae2e165f6 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,2 +1 @@
-DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
 DIST GridDataFormats-1.0.1.tar.gz 2155370 BLAKE2B 8bf5ce65cefdcf490b75212bca8831957769118fbad7fdce42b5634ed67a1f5d4ac454f7429b984bafd89f5bc883fff1bca9dc71f529794cdd585e186e41e063 SHA512 2cfb8c50b4d17fa978924a0e65ae27f6e125bd1055bfdc9096ea35511f4c2a8a16f6bd9c652b9130fbdd66d4d464d8074b14f47c175f98df94c02fe973a0107b
diff --git a/dev-python/Levenshtein/Levenshtein-0.12.2.ebuild b/dev-python/Levenshtein/Levenshtein-0.12.2.ebuild
deleted file mode 100644
index 99ed5a94f473..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.12.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-
-MY_PN="python-Levenshtein"
-MY_P="${MY_PN}-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="https://pypi.org/project/python-Levenshtein/
-	https://github.com/ztane/python-Levenshtein/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 0e626911f513..dfeb04c4a04b 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,3 +1,2 @@
 DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5dddd7dc31e5b6fc99a96930130c7f85bb32c4c4c85b319149d8511f6591ede96098038ea1b502a3e33a42ca3d21db4e2a SHA512 1d5dccd33ae8bd19b234861435212c7a57ba330a5f76a45c9e5b8ac3e401bc3d5eb3c72aea20e66bf0ebaaa6b760131dfef07fb5a2cf4d7191b595e1d962d93c
 DIST Levenshtein-0.21.0.gh.tar.gz 36616 BLAKE2B 8408ba8231a8ff3f6bf9e6cc7ea763061ca1c826236d74877213caef0ce736695865dc3c02565cce960b794d07f96f6413ca144565d6693debf90a1b5718524b SHA512 bb1cf70497e89db5b427eb4ac79708d205fc9edfc9588d30c63ef6e3e77b9369c8892edc31c32cb135d54947e8eedb770d06a7d5c6f8743d44378d7d1a12d459
-DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild
index f100385f6153..0ff130fc34d1 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.12.0.ebuild
@@ -5,6 +5,8 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/_}
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1
@@ -12,13 +14,13 @@ inherit distutils-r1
 DESCRIPTION="sip extension module for PyQt5"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/"
 
-MY_P=${PN/-/_}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
+	MY_P=${PYPI_PN}-${PV/_pre/.dev}
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+	inherit pypi
 fi
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild
index 4fff13a30f36..0cfcd18bd518 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.12.1.ebuild
@@ -5,6 +5,8 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/_}
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1
@@ -12,13 +14,13 @@ inherit distutils-r1
 DESCRIPTION="sip extension module for PyQt5"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/"
 
-MY_P=${PN/-/_}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
+	MY_P=${PYPI_PN}-${PV/_pre/.dev}
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+	inherit pypi
 fi
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index cb2b23cdbf4f..e4c3b21e184f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,11 +1,3 @@
-DIST boto3-1.26.123.gh.tar.gz 640741 BLAKE2B a4d46a9995ce2c496a1cc0a4f9835474546a2a3b2252793cb80ad08e879afc3b69cc3bd6d6661d52c9812e9bec3f7dc66e5bfeae7761cd1a2f122762abf1f247 SHA512 2640c057a7beda8bafb5aa59af387d368bbf04f9e7a8bbe2ca5fd3adb82eb0480ba3e0b2580331a057ede010a6945397cf056fac210aced4a7c981dfa96c4e85
-DIST boto3-1.26.126.gh.tar.gz 642281 BLAKE2B c7a9130cac15843decf4543d6f74904080587d28c1158f6a01e390129a9e4feb8efd2ed806fb428c61e6f84285f4bc1beccb57b1c7fbec56499befeed4663fc9 SHA512 bd9633a2163cc251e83ab6f86d488e436255c6a0240468f372663aab77d09cb6c3039d424c0fda1c1a7c730be8b5cf7011c6e5a7efd04ba9e8e3cd6eb0d49f15
-DIST boto3-1.26.127.gh.tar.gz 645245 BLAKE2B fb320e064eae4a6755770653f5519e17ea11aa6f7aa566e0a625b1113cc784440c4d519bb2de544340d66c3fe80a510a1dadba3f724395c186ad7ef68b5ce11f SHA512 df6f9082a159e7ae8033ba92652cde9d73fc8b93e6793d3ce021b75135f825f7e4e102467caa179b36959a42b98376e30ada35d4a3259e359fbf417c92a6e487
 DIST boto3-1.26.129.gh.tar.gz 645918 BLAKE2B 2de3833e60f8a8b91a35c863fc67e1b098b4d51e296a20677ab0e35b62809118dd105cf9338ccef60eef454cbf4b443bf06aa56206a1db4720305bc23ef19d42 SHA512 6b97bee6947eb05e972877b8326b83c4fe6fd244c0ef63da3f2aec801a00810083bb5d4998ec262394cd130393c85f4a0f0cc22f58def1a425def2b3780a48bc
-DIST boto3-1.26.130.gh.tar.gz 646289 BLAKE2B a93c3806253f1af6cfa385531fc7b9efbaefd403a20155c5033fd4860f19fa845394a73aa5641d21c5a3992abac92245345567c1286370ea7f0029d0159e0ad7 SHA512 1bf0f7d682437cd5564515b7da622b10201a4d91358f52c2c4bff9a80f1c082b881b87c53a21a0eef6c5f5c36ae622efd0d80225b402c4bf93019405f31d1a9f
-DIST boto3-1.26.131.gh.tar.gz 646652 BLAKE2B c28edab15296d5b12aa8d423cba491f0665c8c3b87187cc7e75c75b16533b7cc10789833559cb39852257cac0d22d08f901d7459ddd53e2642f7ee8a42d73d64 SHA512 d7b9a215a895c79c3d8f63c4657d9c9ddf733219a36e7b204edd2602695d92826ba0ce4192fe50037dec672395aaceda3b115bad4d48c3437a1e20f52beaaa3d
-DIST boto3-1.26.132.gh.tar.gz 646952 BLAKE2B 1b819f0fefacd3c55cd877549709e62dde9c5320e5d999e9a50f47bcbd3ea25f4ac20e2f54b220def84cdd7d51fb369d37c6646468a1459164fee49c86985f9d SHA512 5cdbb31617f7bd67967d6e36eaa19d8b84233adbfe83b9dfb5a5a682970dc2646bea2173305e1a3bfa29fc1d845454ac9f686444d540162f6ec0437f2e8507ec
 DIST boto3-1.26.133.gh.tar.gz 648114 BLAKE2B 97c71216d92baffb9e07f9c112590a1fc7828dc90b66364c9f344cb5f95aa927c80c56426c679e9bff8b3fa82d203d527d529cb337e786b471c1df120a9fb186 SHA512 66270dc31b85860320e5dbffc77d2f51e1d4e6d413624269171e3824020ead0cee842cea0e292748127c0584ced74f835cd46554240bd522787e77ad939dc69e
-DIST boto3-1.26.134.gh.tar.gz 649039 BLAKE2B ac6c136c363fd14c373acdd5f1af2bb46b77fae74a5f633f87748ebebeeff8cbfcb3ed62874b255d9dea0824d565149dc0b9cf02f6a596e5b2278b77a479a4bc SHA512 195ae53f705bbc3cb801b4b8425071a796fdf6dabaf8f68d0fc4ec9e216cdbf5def719cc5a7f537f8a075bd5bd8a5d1aca35422d359b471c35dc58af04a63407
-DIST boto3-1.26.135.gh.tar.gz 649517 BLAKE2B fbc1d4bda5ac932569ca26a17146ce9ca7e5f238b0f3465f1be8c35a26e07fe9649951f2d2bffd574d34239569b73510ca414ca92563d08a021c5aa968745650 SHA512 468a07a448b5aa76a437e6c56dcfc3d198bf28647c744a14f76946b889583bc24cb802a26386ddff449aea2731b2cfbfb859e6fecaa3ef05512bf4d33b9e476e
-DIST boto3-1.26.136.gh.tar.gz 650400 BLAKE2B 973b78276ab19b4607bb7b1909c91336f47219e097a385d34bc6529d8e97cfdef56447dc5760cbed5440d79b429f7b8c27bc38c00168d39b3c514657e06361c2 SHA512 c4eeb3bf5b5d7adb0cb2f81329984dda4f4f34eb123a875012d9ee874de4429a80d6834fe489691a9090b075815b0fe419b09884f9a2dfeb761ecc909db8241d
+DIST boto3-1.26.137.gh.tar.gz 650777 BLAKE2B e4a7d02ccefbda53b33558dc107457eaa1df0871bb2fc548b348246192cfdd6760bc43a6e6861622de6376244b80a94a387bbb827be2f5b749bccf6b8ff5af58 SHA512 de5d29a4139650f0527e93a9e223b7d41b285b6c263a5bc7ec9ebad1eee19373b1f2093c03414f7b575f8a7402734b4076cfaf0fa5be34ff54b55d8960e9c836
diff --git a/dev-python/boto3/boto3-1.26.123.ebuild b/dev-python/boto3/boto3-1.26.123.ebuild
deleted file mode 100644
index 736d8a002190..000000000000
--- a/dev-python/boto3/boto3-1.26.123.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.127.ebuild b/dev-python/boto3/boto3-1.26.127.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.127.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.129.ebuild b/dev-python/boto3/boto3-1.26.129.ebuild
index 2a4a7643203e..736d8a002190 100644
--- a/dev-python/boto3/boto3-1.26.129.ebuild
+++ b/dev-python/boto3/boto3-1.26.129.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.130.ebuild b/dev-python/boto3/boto3-1.26.130.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.130.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.131.ebuild b/dev-python/boto3/boto3-1.26.131.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.131.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.132.ebuild b/dev-python/boto3/boto3-1.26.132.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.132.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.134.ebuild b/dev-python/boto3/boto3-1.26.134.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.134.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.135.ebuild b/dev-python/boto3/boto3-1.26.135.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.135.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.136.ebuild b/dev-python/boto3/boto3-1.26.136.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.136.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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_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.126.ebuild b/dev-python/boto3/boto3-1.26.137.ebuild
index 2a4a7643203e..2a4a7643203e 100644
--- a/dev-python/boto3/boto3-1.26.126.ebuild
+++ b/dev-python/boto3/boto3-1.26.137.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b7736b7f0802..f1e38e26339d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,11 +1,3 @@
-DIST botocore-1.29.123.gh.tar.gz 11446357 BLAKE2B 795e5591b64ae947c24f58916bd9935ef8a989260d1fb470e1422a7e765ba829331c39bf07fa834defea80881456e98f4ee045829966b975404752249f384249 SHA512 b46103ec68fd1d6ae40254a3d6858ccab8b7133de42691c583691583263c6327b2a332ed434a4f9e56662985bd142a65dc676b11230174ced0eb4d9bad3df028
-DIST botocore-1.29.126.gh.tar.gz 11453877 BLAKE2B 955931ba40d550a12f4cd16cd7f746a755453e5db3515bf790af94b230dae2503c3d71b85e94044780ae40d4bd5bc19b9cd8e9bb45f1783ae5eb0344f900f08a SHA512 ee5df31c1f3414f9f738d36712e83862de1006c89432b45293b89226b3c14f67f376b8d14f96092fe4524e5bbe9681e0ce7e2b30029c50aa98dcd02e8e2497d0
-DIST botocore-1.29.127.gh.tar.gz 11474348 BLAKE2B 72002e57593e114864bb8d6f0ec30d78fb503a6eee71fd0e61dbe430d976408583e2697db1828e8373bd5ba620b024c2e9bf3e25a69a39625b8ac7f5ae61a63a SHA512 b82f149807970666175222bba27213387782804c41393609011f36564b6a8be209777a575fa088e39440f7bcfe6d47d1183136aa2710ad4315f6f70075cd0ce3
 DIST botocore-1.29.129.gh.tar.gz 11476185 BLAKE2B b2601ecd28263e44f4830ccad24402e6c5f62127cd5abbe75fd270bb05fabcc10dee24e6ba8e37629232929990b1f6bd9870eead303642564342da60c3386bda SHA512 c38a8797f7c728755406e334094e0183fd69eb1a7c68e41b065d5d2c999948714390a647c68d0373c1d8a7b6d9d91fd950b10527ee88bca08788921903ff9535
-DIST botocore-1.29.130.gh.tar.gz 11473884 BLAKE2B 13d50cd41f690cf1e45324ca311da65f946396ebe3856ff60c06e35edc290d4e1d1b76e2b3bc72c3c0f8578f4cae16a7812f5c742bd8847cc5dfc5e15e98d12d SHA512 0173113f295019bfd968af0651bde9032baa2ebb2018070db8702adc35d73ac98e03a828fed7637ebc76bf5d1ba66b6fadb87a1d2afdae8a23f6279d7d5f10ad
-DIST botocore-1.29.131.gh.tar.gz 11477200 BLAKE2B b82be25b352f8d8192e698e06ed7bb5ed56632a355930fef0d3e75eff3cba4ef3b165ad9d9b98a6d2a862fb0ac73b656494e2c33772a8527ee67fc0321ad7ed3 SHA512 b2ebdd6b1abb71a611120413a65b35f27e5962085cb35dc166b7eb04540622e39ef16d2f09f304a41c3692080f4bb8a6593cc60208b7d3f39d01e827a4795067
-DIST botocore-1.29.132.gh.tar.gz 11478315 BLAKE2B 79b6a073cfe33b537f459c1380e7dc4fbbd8ab3c65996973e844986e142da51422ac9010127d876dd74214b091f66196fb7b6300deef242fcc401fae834b4350 SHA512 57abc6023f176c34bd38a11c09af790b6c8a8921021c6d29121ff25d6122c106a356f78cd5b4d67e991e07b092326bf119e438ad3ea3978d67abe09412138b57
 DIST botocore-1.29.133.gh.tar.gz 11484789 BLAKE2B ce1acc51ffada796e594090e7b4d73029df362459a562116ad9dabc56b926f7beec5644e5ce7d175e8901eac28420b57b758be266aa61582cac7e4b91b794e05 SHA512 62631be4f9bf07803e193a8a7ff3b04a806d6dc7668317765b853bba1f1c66cf49c8345f7640f829622c3c8ce96c775bf00bbfa943ff175a6c9a479a888e85db
-DIST botocore-1.29.134.gh.tar.gz 11487191 BLAKE2B a50ff2681ebd56a55138b29be3177dd814ec4b37e4dbeb2144013c9b812de0db0593cc011347024d2c441d4d513180f0b98b26f89a17747b2a4a06a2c71dd9b4 SHA512 4358d3a4baf1f255f1d0d42fa331bad29d8e8d700156789723837bc60fc290d145a763ddfdadf6d78ee216de68332bed5b3b158858807718fbff35b853387c91
-DIST botocore-1.29.135.gh.tar.gz 11491287 BLAKE2B 722ba9b0a679b947e0d59a761d7711b44929005764f223cff23455ca43ae54f4b8c7ae0b055afb42e0a95673ecc4303c41ab98144c05abeaa5bd33bb02d4f8ae SHA512 09ebb3b853b6ef8b275b92716cd2ecce780f58c9a26aece2bbc5ffc30e9dd2e3746758b7a9de6eff4b81e959b8c57bbdbc71f64b21ceb73d024b76cec456b12d
-DIST botocore-1.29.136.gh.tar.gz 11494292 BLAKE2B 99186af221bcb9d5d45efaa467ce71bae87e995e958a24d08e540ae5377fa1b6a2ab44be24e05dab53182cbee6fa80435090917ec4e983d668dacc48302cdcb5 SHA512 00da837d157efb32a8cc1dcdd9b36d257955863c83bcad25609623bf74e13de50cdcee686da80845045202014c8402738bd0def0bb629a95780ac94f1ad64510
+DIST botocore-1.29.137.gh.tar.gz 11508178 BLAKE2B 2f74fd2f3923672a4fcd501f1c5ba48cd09965ea0f70689bd6559a4c4a6fe8921f783ef86f28ac57893c8b1366d8fca2fc79f0216747e04142ed33880f07fe39 SHA512 b800a1b73170b5fcbbf1b17477bb8f04b19f5f250a68bbb3b993b0e058d8df870eddf932f79d94eaa3255b976ce136adbdd5b359757cd79f2cfe2a16b3cfa2f4
diff --git a/dev-python/botocore/botocore-1.29.123.ebuild b/dev-python/botocore/botocore-1.29.123.ebuild
deleted file mode 100644
index d6d0f2607297..000000000000
--- a/dev-python/botocore/botocore-1.29.123.ebuild
+++ /dev/null
@@ -1,72 +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_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.126.ebuild b/dev-python/botocore/botocore-1.29.126.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.126.ebuild
+++ /dev/null
@@ -1,72 +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_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.127.ebuild b/dev-python/botocore/botocore-1.29.127.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.127.ebuild
+++ /dev/null
@@ -1,72 +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_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.129.ebuild b/dev-python/botocore/botocore-1.29.129.ebuild
index 491b6bbc21f2..d6d0f2607297 100644
--- a/dev-python/botocore/botocore-1.29.129.ebuild
+++ b/dev-python/botocore/botocore-1.29.129.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.130.ebuild b/dev-python/botocore/botocore-1.29.130.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.130.ebuild
+++ /dev/null
@@ -1,72 +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_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.131.ebuild b/dev-python/botocore/botocore-1.29.131.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.131.ebuild
+++ /dev/null
@@ -1,72 +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_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.132.ebuild b/dev-python/botocore/botocore-1.29.132.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.132.ebuild
+++ /dev/null
@@ -1,72 +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_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.134.ebuild b/dev-python/botocore/botocore-1.29.134.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.134.ebuild
+++ /dev/null
@@ -1,72 +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_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.135.ebuild b/dev-python/botocore/botocore-1.29.135.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.135.ebuild
+++ /dev/null
@@ -1,72 +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_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.136-r1.ebuild b/dev-python/botocore/botocore-1.29.137.ebuild
index 3ced99abe4ff..3ced99abe4ff 100644
--- a/dev-python/botocore/botocore-1.29.136-r1.ebuild
+++ b/dev-python/botocore/botocore-1.29.137.ebuild
diff --git a/dev-python/browser-cookie3/Manifest b/dev-python/browser-cookie3/Manifest
index 1e06a090a6e5..b536c008eb69 100644
--- a/dev-python/browser-cookie3/Manifest
+++ b/dev-python/browser-cookie3/Manifest
@@ -1,3 +1 @@
-DIST browser-cookie3-0.17.1.tar.gz 15882 BLAKE2B 76dbe885a21bc904eb53a2c9360f998d6b5d63b06b8025330d8960e07b630f13946f543a48cd9f3a24498e857e6245171fd7805bc403bae437caebd7209519bf SHA512 cf677a6cb8db32144dbced235fcd581743d997bcac77fe89a0d7c0b6400ff92d078cd04159f7819a8358128155cd105d44d4cde06cb345514e43d33dba931240
-DIST browser-cookie3-0.18.0.tar.gz 15607 BLAKE2B 51d815d2231331e48681dcb90f4499f2b701c8a1058e83d7591465e6cfbcdc9a6b9f6bcd569eca7b3468541cea12b02840fceacaba4545ea0f704dcfc054c755 SHA512 7686fc7c943a09f039e42454ccd184cd0540ece1095469149c363f907f3f50f232b6a5f1a2a14f923963d5b46320293ad42b3bdd1089e26b1a17f52960f4f7de
 DIST browser-cookie3-0.18.1.tar.gz 16073 BLAKE2B 1520e53919105e796e9210bf00abd90889f7f10ffaec1bb749005c339556a5aaba4f5d465225b7afcaa4d61f775855029a99ce76a2c90fa16274c2a0e3d42be9 SHA512 673d3268473b45f12469ba86223d0de302f8f3e6282da318e8adb138848953982e1a59740dd90b3b63746f4c29c649abed9d4e06e5e89303931ba7a395732df5
diff --git a/dev-python/browser-cookie3/browser-cookie3-0.17.1.ebuild b/dev-python/browser-cookie3/browser-cookie3-0.17.1.ebuild
deleted file mode 100644
index 3c6893c9a37a..000000000000
--- a/dev-python/browser-cookie3/browser-cookie3-0.17.1.ebuild
+++ /dev/null
@@ -1,30 +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="Loads cookies from your browser into a cookiejar object"
-HOMEPAGE="https://github.com/borisbabic/browser_cookie3/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/lz4[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# make cryptodome-friendly
-	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
-	sed -i -e 's:Cryptodome:Crypto:g' __init__.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild b/dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild
deleted file mode 100644
index cda71a917a78..000000000000
--- a/dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild
+++ /dev/null
@@ -1,34 +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="Loads cookies from your browser into a cookiejar object"
-HOMEPAGE="
-	https://github.com/borisbabic/browser_cookie3/
-	https://pypi.org/project/browser-cookie3/
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/lz4[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# make cryptodome-friendly
-	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
-	sed -i -e 's:Cryptodome:Crypto:g' __init__.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/click/click-8.1.3.ebuild b/dev-python/click/click-8.1.3.ebuild
index c7bb20f03595..e583dfa451bf 100644
--- a/dev-python/click/click-8.1.3.ebuild
+++ b/dev-python/click/click-8.1.3.ebuild
@@ -27,7 +27,7 @@ IUSE="examples"
 distutils_enable_sphinx docs \
 	'>=dev-python/docutils-0.14' \
 	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinxcontrib-log-cabinet \
 	dev-python/sphinx-issues \
 	dev-python/sphinx-tabs
 distutils_enable_tests pytest
diff --git a/dev-python/django-redis/django-redis-5.2.0.ebuild b/dev-python/django-redis/django-redis-5.2.0.ebuild
index 8b872a451d91..98062080f8f2 100644
--- a/dev-python/django-redis/django-redis-5.2.0.ebuild
+++ b/dev-python/django-redis/django-redis-5.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/jazzband/django-redis/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/django-2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 63ab42a8cd38..12a58f37d3c4 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -2,3 +2,4 @@ DIST setuptools-67.6.1-py3-none-any.whl 1089263 BLAKE2B fe1ca817d2743e5edefac472
 DIST setuptools-67.7.0-py3-none-any.whl 1093434 BLAKE2B 76e91b7353f75f4c2c3eaa0222b1e846c82fb24a7c7220408cc3f547d8243bc0e306b19661f26e5bd5b2a82b3f8e58c60b3906869011477fbc2db82152baeb94 SHA512 22428cf43932d4a16f704adace5e6fa9ddff15c2715c9ba2c0f47c2e96d5fa95e5fbd21e2e55cef9c43a41d29f6cd2d09500b1cb81daedb64820e388ead70346
 DIST setuptools-67.7.1-py3-none-any.whl 1093433 BLAKE2B a28d3fa5fe0229e681c9cdf846f387b57e77a31a3d20f18a7164af6d6e5832ce65c71c8dc9326bebae2e2c5d80498609acaa315999133b320972ca4f6dc988c8 SHA512 b9ef9fbd268f48f5c585deb4bd5ee9d47fc4633832fb52dff61663ce045b05d67d9aee1eab0482a34dd7b55aa42a1eb0948ac6bb94fbb050435c73f3b63439f9
 DIST setuptools-67.7.2-py3-none-any.whl 1093536 BLAKE2B d267f3aa3006e1a50ba519d1461b168d288741158d53bcef95075a16e35145f846bf72337bade5343b0be5ffdb9794cc15a68284841a10628b4c26d49b7b4141 SHA512 ef9041fd899e3f138e6ced79de2a52e15f1bf44dcfe6566b9b6ebf071fadad5b7b94f1a07ec81607170b34dbbf2126b4e0c2337314c8597883740c6786b54230
+DIST setuptools-67.8.0-py3-none-any.whl 1093916 BLAKE2B d02bd5ccfe27c116497f8ae46603e5863c88795a489523d4cdaef3bad1bfabd5dfccf7a00f17290e58cce89a6348fbc194c00ae5ccb4c5e89a083fbb84c2cca6 SHA512 a80fc8d632ee6d1947689bb3f27ffb85206e518bf6c153ad43dd5e9f1825fa6e45d9df2baedd1fa9a8afb12a7854215bc4f56bb73d9033704745954890267c9a
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild
new file mode 100644
index 000000000000..ef453bce3899
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
index e2d5a9cfa0aa..c95a4c9d68fd 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
@@ -3,16 +3,14 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
+PYPI_PN="Flask-SQLAlchemy"
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
 
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="SQLAlchemy support for Flask applications"
 HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.3.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.3.ebuild
index 251cf499770c..589e92c87d90 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.3.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.3.ebuild
@@ -4,18 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=pdm
+PYPI_NO_NORMALIZE=1
+PYPI_PN="Flask-SQLAlchemy"
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1 pypi
 
-MY_PN="Flask-SQLAlchemy"
 DESCRIPTION="SQLAlchemy support for Flask applications"
 HOMEPAGE="
 	https://github.com/pallets-eco/flask-sqlalchemy/
 	https://pypi.org/project/Flask-SQLAlchemy/
 "
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -36,4 +35,4 @@ distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/pallets-sphinx-themes \
 	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-log_cabinet
+	dev-python/sphinxcontrib-log-cabinet
diff --git a/dev-python/flask/flask-2.2.3.ebuild b/dev-python/flask/flask-2.2.3.ebuild
index 286b40b9cfe3..4c29d21277ae 100644
--- a/dev-python/flask/flask-2.2.3.ebuild
+++ b/dev-python/flask/flask-2.2.3.ebuild
@@ -49,7 +49,7 @@ distutils_enable_sphinx docs \
 	dev-python/pallets-sphinx-themes \
 	dev-python/sphinx-issues \
 	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
+	dev-python/sphinxcontrib-log-cabinet
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/flask/flask-2.2.5.ebuild b/dev-python/flask/flask-2.2.5.ebuild
index d56d48edc5ca..919916aa47c0 100644
--- a/dev-python/flask/flask-2.2.5.ebuild
+++ b/dev-python/flask/flask-2.2.5.ebuild
@@ -49,7 +49,7 @@ distutils_enable_sphinx docs \
 	dev-python/pallets-sphinx-themes \
 	dev-python/sphinx-issues \
 	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
+	dev-python/sphinxcontrib-log-cabinet
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/flask/flask-2.3.1.ebuild b/dev-python/flask/flask-2.3.1.ebuild
index 8d8c0720ed1b..2a9f09c0ee40 100644
--- a/dev-python/flask/flask-2.3.1.ebuild
+++ b/dev-python/flask/flask-2.3.1.ebuild
@@ -49,7 +49,7 @@ distutils_enable_sphinx docs \
 	dev-python/pallets-sphinx-themes \
 	dev-python/sphinx-issues \
 	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
+	dev-python/sphinxcontrib-log-cabinet
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/flask/flask-2.3.2.ebuild b/dev-python/flask/flask-2.3.2.ebuild
index c0ea5720c769..42ed25f381b7 100644
--- a/dev-python/flask/flask-2.3.2.ebuild
+++ b/dev-python/flask/flask-2.3.2.ebuild
@@ -49,7 +49,7 @@ distutils_enable_sphinx docs \
 	dev-python/pallets-sphinx-themes \
 	dev-python/sphinx-issues \
 	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
+	dev-python/sphinxcontrib-log-cabinet
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..69ab35341208
--- /dev/null
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fuzzy string matching in python"
+HOMEPAGE="
+	https://github.com/seatgeek/fuzzywuzzy/
+	https://pypi.org/project/fuzzywuzzy/
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/Levenshtein[${PYTHON_USEDEP}]
+"
+# pycodestyle imported unconditionally in the only test file, sigh
+BDEPEND="
+	test? (
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 48cc53844de0..8536d69341ed 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 pypi
 DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index c1f1701f3e12..6d024ffef9cf 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,2 +1,3 @@
 DIST gsd-v2.8.0.tar.gz 107602 BLAKE2B 1317548dda93f7b7d07e74163f09aea9808ee50617e02c43f635339313e7604f5e06e0d488bdb7b336e96a7c80c1d1b1cbde0de6809102fedcfcdba2ced7c8ca SHA512 9346ed54a28d23cca9b1d3a82a86c4186dab47a6949e519e307ce121a3ed80105332360fb5a151cc68c403e00651746b2fef4d2c51781188a52569032f3bd700
 DIST gsd-v2.8.1.tar.gz 107943 BLAKE2B beeddac15851396a4969988396459ff244cc191d02618a5a2fe3059ad4e798b6f95a526fb46149d447c2478bb6f8eb9dae7e484bc15aeb7c0585b20808dfd1fa SHA512 6b68966abc92b46d84287687e975631a923b38aaca936d5031c27b8dc0fda5e02f13b725e0c87dfb61f68bbfa0ac906895479232b8ff646c98c12025e78ed6ee
+DIST gsd-v2.9.0.tar.gz 107656 BLAKE2B 78abd1bd832b1cd39844b87ddba6d687627c91624d3bcc3f81b7187b341bbcee1e2135934901bf1b860730ca4397298bd8d5d8723990e3f3efe3151bb941d406 SHA512 96883044b9c6cd580b2b45bc4db4b5f21121f83b4d67d2fc0449661e793a49466f26e497ef873d16a0af35bcb0926332fd4ce6f254f46582ba5cfccb8b52a02a
diff --git a/dev-python/gsd/gsd-2.9.0.ebuild b/dev-python/gsd/gsd-2.9.0.ebuild
new file mode 100644
index 000000000000..72189439c631
--- /dev/null
+++ b/dev-python/gsd/gsd-2.9.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="
+	https://github.com/glotzerlab/gsd/
+	https://pypi.org/project/gsd/
+"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/numpy-1.24.2[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gsd
+}
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter-console/Manifest
index fac2c631a7dd..fac2c631a7dd 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter-console/Manifest
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 625f50a84e8a..625f50a84e8a 100644
--- a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
+++ b/dev-python/jupyter-console/jupyter-console-6.6.3.ebuild
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter-console/metadata.xml
index e839e340cd56..e839e340cd56 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter-console/metadata.xml
diff --git a/dev-python/jupyter_events/Manifest b/dev-python/jupyter-events/Manifest
index e3ded81aafe5..e3ded81aafe5 100644
--- a/dev-python/jupyter_events/Manifest
+++ b/dev-python/jupyter-events/Manifest
diff --git a/dev-python/jupyter_events/jupyter_events-0.5.0.ebuild b/dev-python/jupyter-events/jupyter-events-0.5.0.ebuild
index 77d74e343a72..77d74e343a72 100644
--- a/dev-python/jupyter_events/jupyter_events-0.5.0.ebuild
+++ b/dev-python/jupyter-events/jupyter-events-0.5.0.ebuild
diff --git a/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild b/dev-python/jupyter-events/jupyter-events-0.6.3.ebuild
index 68bc75161c46..68bc75161c46 100644
--- a/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
+++ b/dev-python/jupyter-events/jupyter-events-0.6.3.ebuild
diff --git a/dev-python/jupyter_events/metadata.xml b/dev-python/jupyter-events/metadata.xml
index f779b78a9efd..f779b78a9efd 100644
--- a/dev-python/jupyter_events/metadata.xml
+++ b/dev-python/jupyter-events/metadata.xml
diff --git a/dev-python/jupyter_kernel_test/Manifest b/dev-python/jupyter-kernel-test/Manifest
index 992409107efb..992409107efb 100644
--- a/dev-python/jupyter_kernel_test/Manifest
+++ b/dev-python/jupyter-kernel-test/Manifest
diff --git a/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild b/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.5.0.ebuild
index 203a41b7e426..203a41b7e426 100644
--- a/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
+++ b/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.5.0.ebuild
diff --git a/dev-python/jupyter_kernel_test/metadata.xml b/dev-python/jupyter-kernel-test/metadata.xml
index edbf614f1086..edbf614f1086 100644
--- a/dev-python/jupyter_kernel_test/metadata.xml
+++ b/dev-python/jupyter-kernel-test/metadata.xml
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter-packaging/Manifest
index 5ee407d80a0d..5ee407d80a0d 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter-packaging/Manifest
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild b/dev-python/jupyter-packaging/jupyter-packaging-0.12.3.ebuild
index a559c30981a7..a559c30981a7 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild
+++ b/dev-python/jupyter-packaging/jupyter-packaging-0.12.3.ebuild
diff --git a/dev-python/jupyter_packaging/metadata.xml b/dev-python/jupyter-packaging/metadata.xml
index f779b78a9efd..f779b78a9efd 100644
--- a/dev-python/jupyter_packaging/metadata.xml
+++ b/dev-python/jupyter-packaging/metadata.xml
diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
index 012365b775b0..159922881754 100644
--- a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
+++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	~dev-python/jupyter_events-0.5.0[${PYTHON_USEDEP}]
+	~dev-python/jupyter-events-0.5.0[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.0.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.0.ebuild
index 751320d279d0..a2012f82db64 100644
--- a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.0.ebuild
+++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.0.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	~dev-python/jupyter_events-0.5.0[${PYTHON_USEDEP}]
+	~dev-python/jupyter-events-0.5.0[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter-server-mathjax/Manifest
index 425042501ef1..425042501ef1 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter-server-mathjax/Manifest
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter-server-mathjax/jupyter-server-mathjax-0.2.6.ebuild
index b99dc8f2a074..55c550c20901 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter-server-mathjax/jupyter-server-mathjax-0.2.6.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/jupyter_packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server_mathjax/metadata.xml b/dev-python/jupyter-server-mathjax/metadata.xml
index edbf614f1086..edbf614f1086 100644
--- a/dev-python/jupyter_server_mathjax/metadata.xml
+++ b/dev-python/jupyter-server-mathjax/metadata.xml
diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
index 58b937ad62ee..946e12237884 100644
--- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
+++ b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.0[${PYTHON_USEDEP}]
 	>=dev-python/simpervisor-0.4[${PYTHON_USEDEP}]
 "
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/jupyter-packaging[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
index 61d27338ab34..4e9077bc4f2d 100644
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/jupyter_ydoc[${PYTHON_USEDEP}]
+	dev-python/jupyter-ydoc[${PYTHON_USEDEP}]
 	dev-python/ypy-websocket[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-fileid[${PYTHON_USEDEP}]
 
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index 71dc6feb5c44..9381d6ef341b 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-events-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_ydoc/Manifest b/dev-python/jupyter-ydoc/Manifest
index 0544517f7a1b..0544517f7a1b 100644
--- a/dev-python/jupyter_ydoc/Manifest
+++ b/dev-python/jupyter-ydoc/Manifest
diff --git a/dev-python/jupyter_ydoc/files/jupyter_ydoc-1.0.0-no-node-for-version.patch b/dev-python/jupyter-ydoc/files/jupyter-ydoc-1.0.0-no-node-for-version.patch
index 2195a0d60e0b..2195a0d60e0b 100644
--- a/dev-python/jupyter_ydoc/files/jupyter_ydoc-1.0.0-no-node-for-version.patch
+++ b/dev-python/jupyter-ydoc/files/jupyter-ydoc-1.0.0-no-node-for-version.patch
diff --git a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild b/dev-python/jupyter-ydoc/jupyter-ydoc-1.0.0.ebuild
index 9e0af1754272..fe76f29a7356 100644
--- a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
+++ b/dev-python/jupyter-ydoc/jupyter-ydoc-1.0.0.ebuild
@@ -8,13 +8,18 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
 inherit distutils-r1
 
+MY_P=${PN/-/_}-${PV}
 DESCRIPTION="Document structures for collaborative editing using Ypy"
 HOMEPAGE="
 	https://jupyter.org/
 	https://github.com/jupyter-server/jupyter_ydoc/
 	https://pypi.org/project/jupyter-ydoc/
 "
-SRC_URI="https://github.com/jupyter-server/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="
+	https://github.com/jupyter-server/jupyter_ydoc/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/jupyter_ydoc/metadata.xml b/dev-python/jupyter-ydoc/metadata.xml
index edbf614f1086..edbf614f1086 100644
--- a/dev-python/jupyter_ydoc/metadata.xml
+++ b/dev-python/jupyter-ydoc/metadata.xml
diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
index 79eb2f5ee4a0..0f8053ac5c0e 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/jupyter_console[${PYTHON_USEDEP}]
+	dev-python/jupyter-console[${PYTHON_USEDEP}]
 	dev-python/nbconvert[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipywidgets[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab-pygments/Manifest
index 664a8ff7a6eb..664a8ff7a6eb 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab-pygments/Manifest
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild b/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.2.2.ebuild
index d348224ed44e..d348224ed44e 100644
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
+++ b/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.2.2.ebuild
diff --git a/dev-python/jupyterlab_pygments/metadata.xml b/dev-python/jupyterlab-pygments/metadata.xml
index a0d4c5913ba0..a0d4c5913ba0 100644
--- a/dev-python/jupyterlab_pygments/metadata.xml
+++ b/dev-python/jupyterlab-pygments/metadata.xml
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index e40f94134638..8f711812d9b7 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,3 +1,2 @@
-DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
 DIST jupyterlab-3.6.3.tar.gz 16847186 BLAKE2B 6916722469ab100a1a240b8a565c9800f35535b2a9b2c39a6bfd275b078d88df9faa1f12d4ce3819155af7b0ed22282836f9b233534bd3e63d8a330d1cd7cd21 SHA512 3d6b4781f9fab02504b2c0223a4d060d80c3442fa6ac53ae326296d69942d68f8545450f671f6ba65c7c4e218aad62ef4f4ceb658899c21aaff3640c3055d364
 DIST jupyterlab-4.0.0.tar.gz 18227222 BLAKE2B 98a6e1cfb4dd72a2cd183cb7210e45a70a9dc9f77200c42f58340889ac97dc2f7bcdb18822f7b9618e955dcf651bfc4b3d2087677cc112a4e2085fe6d70c3014 SHA512 7ed40068fe3f617870bc3fbad0401145baaf79e1688bd2e5a879ad92c8c1058a1a0c5fffafe7c1c0fbf1e77c2bef8e975f39d14e54b739bf8de653c264bffaa6
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
deleted file mode 100644
index de5a578a347f..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
+++ /dev/null
@@ -1,75 +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} )
-DISTUTILS_USE_PEP517=jupyter
-
-inherit distutils-r1
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
-	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	test? (
-		dev-python/check-manifest[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/openapi-core[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild
index fc7e13fd86ad..754ac08338b9 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_ydoc-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-ydoc-0.2.3[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-ydoc-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
 	<dev-python/notebook-7[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/markdown-3.3.7.ebuild b/dev-python/markdown/markdown-3.3.7.ebuild
index 86f7b0a45d49..e76f6c79f571 100644
--- a/dev-python/markdown/markdown-3.3.7.ebuild
+++ b/dev-python/markdown/markdown-3.3.7.ebuild
@@ -4,16 +4,17 @@
 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
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python implementation of the markdown markup language"
 HOMEPAGE="
 	https://python-markdown.github.io/
 	https://pypi.org/project/Markdown/
 	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/markdown/markdown-3.4.1.ebuild b/dev-python/markdown/markdown-3.4.1.ebuild
index 5c975786ed97..2f9b02409000 100644
--- a/dev-python/markdown/markdown-3.4.1.ebuild
+++ b/dev-python/markdown/markdown-3.4.1.ebuild
@@ -4,19 +4,18 @@
 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
+inherit distutils-r1 pypi
 
-MY_P=${P^}
 DESCRIPTION="Python implementation of the markdown markup language"
 HOMEPAGE="
 	https://python-markdown.github.io/
 	https://pypi.org/project/Markdown/
 	https://github.com/Python-Markdown/markdown/
 "
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 24d2598de7a9..b1844af9f7b0 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,2 +1 @@
-DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
 DIST MarkupSafe-2.1.2.tar.gz 19080 BLAKE2B 560cc052c105c3d9f2690c3e5a2a597dd36848080e3c7d6f8273dcd03bdb613ed54cfe6e53b9ec8053deb38d0d055123da7204a671c1fff3295596d44a63b317 SHA512 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b
diff --git a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
deleted file mode 100644
index 1c6f647d8e1a..000000000000
--- a/dev-python/markupsafe/markupsafe-1.1.1-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=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index be5823f6b277..c8f0938d94cd 100644
--- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
-inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
-	virtualx
+inherit distutils-r1 flag-o-matic multiprocessing prefix pypi
+inherit toolchain-funcs virtualx
 
 FT_PV=2.6.1
 DESCRIPTION="Pure python plotting library with matlab like syntax"
@@ -17,8 +18,7 @@ HOMEPAGE="
 	https://github.com/matplotlib/matplotlib/
 	https://pypi.org/project/matplotlib/
 "
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	test? (
 		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
 	)
diff --git a/dev-python/metakernel/metakernel-0.29.4.ebuild b/dev-python/metakernel/metakernel-0.29.4.ebuild
index 402971339dc9..d1d3484925cf 100644
--- a/dev-python/metakernel/metakernel-0.29.4.ebuild
+++ b/dev-python/metakernel/metakernel-0.29.4.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/jupyter_kernel_test[${PYTHON_USEDEP}]
+		dev-python/jupyter-kernel-test[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/moddb/moddb-0.8.1.ebuild b/dev-python/moddb/moddb-0.8.1.ebuild
index 2842021a8ec9..466a5526a1d0 100644
--- a/dev-python/moddb/moddb-0.8.1.ebuild
+++ b/dev-python/moddb/moddb-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ClementJ18/moddb/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # Connects to moddb.com
 PROPERTIES="test_network"
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 3cf516228e53..4fd6e7b1b3e9 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,2 +1 @@
-DIST msgpack-1.0.4.tar.gz 128053 BLAKE2B fcbaafbea57f87c949a43a6bd6f6507eb3a07ac5e4a9c44fabfbb7c07849f1edabb8dadcd99a547fed32bce0f900f965368c4ee744acd4e850cad5c27022f463 SHA512 dcd59bf77408acf7171bdcc46c4d6bf875d36e80b216b7721544855e6c2b20be469415ee768b2195e74fe4650621ee6bfaa7897e709ac0d8d59cdb30772cb90b
 DIST msgpack-1.0.5.tar.gz 127834 BLAKE2B 3dcf454630021e35d5c6d5ce850d7ac74a6d11d6fe7c7ed07040daa62585bd6b11dc0f68a5b4c4bf20346c25bc23017f79f2d1bad09f175008b184461d0eea5d SHA512 bc3bf27ca7a9204c5ebc009e4a03db4fb48f6c2733bef393aed16652f07ac92c9400258818743245598343c86494d39b39017ab70d7563a5844091eca11a9faa
diff --git a/dev-python/msgpack/msgpack-1.0.4.ebuild b/dev-python/msgpack/msgpack-1.0.4.ebuild
deleted file mode 100644
index cfaa6d5dde0e..000000000000
--- a/dev-python/msgpack/msgpack-1.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="MessagePack (de)serializer for Python"
-HOMEPAGE="
-	https://msgpack.org/
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
-IUSE="+native-extensions"
-
-# extension code is relying on CPython implementation details
-BDEPEND="
-	native-extensions? (
-		$(python_gen_cond_dep '
-			>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove pre-generated cython files
-	rm msgpack/_cmsgpack.cpp || die
-
-	if ! use native-extensions ; then
-		sed -i -e "/have_cython/s:True:False:" setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index cf3ca688b993..f19acda64759 100644
--- a/dev-python/nbconvert/nbconvert-7.3.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
 	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.4.0.ebuild b/dev-python/nbconvert/nbconvert-7.4.0.ebuild
index bd50730a6bcd..51776ff6b345 100644
--- a/dev-python/nbconvert/nbconvert-7.4.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.4.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
 	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 3640b58df007..bfb168b88ae2 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-3.2.0.ebuild b/dev-python/nbdime/nbdime-3.2.0.ebuild
index 19b967c51bd4..27fb9f3cb3a7 100644
--- a/dev-python/nbdime/nbdime-3.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-3.2.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild b/dev-python/nbdime/nbdime-3.2.1.ebuild
index 19b967c51bd4..27fb9f3cb3a7 100644
--- a/dev-python/nbdime/nbdime-3.2.1.ebuild
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index 06f074a3c923..7d0eca7a6cd2 100644
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -7,11 +7,10 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 pypi xdg-utils
 
 DESCRIPTION="Jupyter Interactive Notebook"
 HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -35,7 +34,7 @@ RDEPEND="
 	dev-python/prometheus_client[${PYTHON_USEDEP}]"
 
 BDEPEND="
-	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-packaging-0.9[${PYTHON_USEDEP}]
 	test? (
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.5.4.ebuild b/dev-python/notebook/notebook-6.5.4.ebuild
index f9cebac4432d..37e716091ae7 100644
--- a/dev-python/notebook/notebook-6.5.4.ebuild
+++ b/dev-python/notebook/notebook-6.5.4.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-packaging-0.9[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nbval[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/numpy-1.24.0.ebuild b/dev-python/numpy/numpy-1.24.0.ebuild
index 8b7f207cba57..a593e8307df4 100644
--- a/dev-python/numpy/numpy-1.24.0.ebuild
+++ b/dev-python/numpy/numpy-1.24.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
 
-inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+inherit distutils-r1 flag-o-matic fortran-2 pypi toolchain-funcs
 
 DOC_PV=${PV}
 DESCRIPTION="Fast array and numerical python library"
@@ -17,9 +17,6 @@ HOMEPAGE="
 	https://github.com/numpy/numpy/
 	https://pypi.org/project/numpy/
 "
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
 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"
diff --git a/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild b/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild
index bc00b3b6bc1a..d85f1add34cf 100644
--- a/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.34.2.ebuild
@@ -23,13 +23,13 @@ RESTRICT="test"
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-client-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-packaging-0.9[${PYTHON_USEDEP}]
 	>=dev-python/metakernel-0.24.0[${PYTHON_USEDEP}]
 	sci-mathematics/octave"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
-		dev-python/jupyter_kernel_test[${PYTHON_USEDEP}]
+		dev-python/jupyter-kernel-test[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 284d270b5e4f..1b2bea5faa8b 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,2 +1 @@
 DIST podcastparser-0.6.10.tar.gz 31717 BLAKE2B 19ea422b78c7631fd2622f935e292d5bb14a31ab749db36a9a19e356a5a331246e7d853412bf913522588ce6446be2070f2ad4e6c1b50d245058eae49739519e SHA512 55b822a80f8fed56feb41d5f9a39c04371e4e11dead45b8ca6aaf666ecc26dc3c94673331da59e2ed6665f2a9ca367b6daccb24f987b1763b6b3ad8b302ee783
-DIST podcastparser-0.6.9.tar.gz 30399 BLAKE2B a1882cdb298b3e2dccc0aa821ffb97863377b51b6dd78bcd09e00d9170b88c94298996ca20c7515ab761f9ff0c73b371b7f8c9b3c4fbacbcdc2215004e3cc137 SHA512 5e28b361b5fd0aba22c8c34318d3c8f575d82913f7de0f8f62ced9c8d904dcfcf40282b8b832867998f820de6bd5b793ce6be4657dd04b4965a151e32f2f0131
diff --git a/dev-python/podcastparser/podcastparser-0.6.10.ebuild b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
index 1ffb1753139f..1a6cec51cd7e 100644
--- a/dev-python/podcastparser/podcastparser-0.6.10.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/podcastparser/podcastparser-0.6.9.ebuild b/dev-python/podcastparser/podcastparser-0.6.9.ebuild
deleted file mode 100644
index 1a6cec51cd7e..000000000000
--- a/dev-python/podcastparser/podcastparser-0.6.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Podcast parser for the gpodder client"
-HOMEPAGE="
-	https://github.com/gpodder/podcastparser/
-	https://pypi.org/project/podcastparser/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prettytable/prettytable-3.3.0.ebuild b/dev-python/prettytable/prettytable-3.3.0.ebuild
index 13a47ab415d0..67f6e404eefc 100644
--- a/dev-python/prettytable/prettytable-3.3.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.3.0.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
 HOMEPAGE="
 	https://github.com/jazzband/prettytable/
 	https://pypi.org/project/prettytable/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/priority/priority-1.3.0-r1.ebuild b/dev-python/priority/priority-1.3.0-r1.ebuild
index ea6b3ef1580d..43edb3c815cd 100644
--- a/dev-python/priority/priority-1.3.0-r1.ebuild
+++ b/dev-python/priority/priority-1.3.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/python-hyper/priority/
 	https://pypi.org/project/priority/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pushbullet-py/metadata.xml b/dev-python/pushbullet-py/metadata.xml
index 2374730a06b5..9c494aebdb56 100644
--- a/dev-python/pushbullet-py/metadata.xml
+++ b/dev-python/pushbullet-py/metadata.xml
@@ -6,7 +6,7 @@
   <name>Louis Sautier</name>
  </maintainer>
  <upstream>
-  <bugs-to>https://github.com/randomchars/pushbullet.py/issues</bugs-to>
+  <bugs-to>https://github.com/richard-better/pushbullet.py/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.12.0-r1.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.12.0-r1.ebuild
index 524586104d51..4a285e8a8a99 100644
--- a/dev-python/pushbullet-py/pushbullet-py-0.12.0-r1.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.12.0-r1.ebuild
@@ -4,15 +4,17 @@
 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
+inherit distutils-r1 pypi
 
-MY_PN=${PN/-/.}
 DESCRIPTION="A simple python client for pushbullet.com"
-HOMEPAGE="https://github.com/randomchars/pushbullet.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+HOMEPAGE="
+	https://github.com/richard-better/pushbullet.py/
+	https://pypi.org/project/pushbullet.py/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.12.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.12.0.ebuild
deleted file mode 100644
index b68d7ef38a3b..000000000000
--- a/dev-python/pushbullet-py/pushbullet-py-0.12.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=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-DESCRIPTION="A simple python client for pushbullet.com"
-HOMEPAGE="https://github.com/randomchars/pushbullet.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip tests which require internet access
-	PUSHBULLET_API_KEY= epytest -k "not (test_auth or test_decryption)"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r example/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index bc632c79f752..faff15f57ad4 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1 +1,2 @@
 DIST pycryptodome-3.17.0.gh.tar.gz 16714317 BLAKE2B a7a96ba4d10078ba4d9bc02b384c982ad7307065fd6c9118def43bebc073eccdfc11a766742e5d0207e9cce32aca2fe3da51f8a59964de8c15db6808cc2aae03 SHA512 c0a0754c0dd1d8138e8dd27c034e3f3469237eb5f205d86d0c5e2377fd7672c6ed0df9717292a73d380daaabe88c3be80b575ca1149f4c70f08d82aed0d4b39c
+DIST pycryptodome-3.18.0.gh.tar.gz 16720227 BLAKE2B dfdc3a7cc0b1aea1e7b7d8f6e8bcf651ca92f0020e2c51849512d00e716283537feb884cacdc655d99a6b992305db9b899172d022bc9ff65d6349ee40b40c4d5 SHA512 a30a6b406bfd1d4288169924924636246c36999ca1e14c5cb70bd2f71ce25739dae04726ca97bdaebf7a8b36927cc6f617fbe2599fad48512a2c5e016a528247
diff --git a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
new file mode 100644
index 000000000000..b1c72218bd8e
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="
+	https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/
+"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:=
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto
+"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
+	"${EPYTHON}" - <<-EOF || die
+		import sys
+		from Crypto import SelfTest
+		SelfTest.run(verbosity=2, stream=sys.stdout)
+	EOF
+
+	# TODO: run cmake tests from src/test?
+}
diff --git a/dev-python/pypresence/pypresence-4.2.1.ebuild b/dev-python/pypresence/pypresence-4.2.1.ebuild
index 9aa4e1181564..16be852178fb 100644
--- a/dev-python/pypresence/pypresence-4.2.1.ebuild
+++ b/dev-python/pypresence/pypresence-4.2.1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/qwertyquerty/pypresence/archive/refs/tags/${PV}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_sphinx docs/sphinx dev-python/alabaster
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
index 3595381d5be2..5111fbbe60bd 100644
--- a/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/PyrateLimiter-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/pytables/pytables-3.7.0.ebuild b/dev-python/pytables/pytables-3.7.0.ebuild
index 5bd90d75f872..d526c7692756 100644
--- a/dev-python/pytables/pytables-3.7.0.ebuild
+++ b/dev-python/pytables/pytables-3.7.0.ebuild
@@ -3,17 +3,15 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
+PYPI_PN="tables"
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="threads(+)"
 
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Hierarchical datasets for Python"
 HOMEPAGE="https://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 8624198679b5..2821fbb33404 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1 +1,2 @@
 DIST pytest-testinfra-7.0.0.tar.gz 79296 BLAKE2B b0870cbf466627daff0ed6a3063c15c9b725fab4009fc24c3779b56765901e6b8d3a42fce429f1e42151b78d61f52c38955772e562c74d78c717a61a5fe74f04 SHA512 507d7a434c2eb159e2c36b1be3d447e386d3a4e614f2717ed8add456358f644c18f801db6774a4854e4ec7936643febd332aa4096ab26ae0080aceeff420c78e
+DIST pytest-testinfra-8.0.0.tar.gz 83448 BLAKE2B e1dcd7f685183ad0d1c79f3fe7542797f2c91839faf79e2b368c0e330aec22a420621859d419f7816b72df4aad9ac9d5ecc99d257804311d6b8b77c20b5b833b SHA512 ee8e8df7ba0422ea60d55149495a682b88a62646b6b601dd95a135a5d3a131d5cc57cb0f0cc0ff7166d004758619283480e52b8507cc2eedbc25c46a16da60b5
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-8.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-8.0.0.ebuild
new file mode 100644
index 000000000000..ac3689c80baf
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-8.0.0.ebuild
@@ -0,0 +1,56 @@
+# 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="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-testinfra/
+	https://pypi.org/project/pytest-testinfra/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# Ansible is called via its CLI
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible
+		$(python_gen_cond_dep '
+			app-admin/salt[${PYTHON_USEDEP}]
+		' python3_10)
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x EPYTEST_DESELECT=()
+
+	# This is the only test which actually fails if salt cannot be imported
+	if [[ ${EPYTHON} == python3.11 ]]; then
+		EPYTEST_DESELECT+=(
+			test/test_backends.py::test_backend_importables
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "For the list of available connection back-ends and their dependencies,"
+	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index e26145b95ead..4349113787fc 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-xdist-3.2.1.tar.gz 76362 BLAKE2B a5cea5bab1176554bd0d1ebfff5400f60bd43964ae13c7f77ad77fc257db32ba0a0d6f2f3ec16211e48852a6bfd02a0949d618c7f2f6a8da11dd2843d88565a4 SHA512 ea42bea8b4df3d77ef680cba81f76f9f79d0ffcaad6f5f879cc82c53203d36ffe26f233dd6c5d1cbea22b43d257f0f4e6be793116bb281956316c44fc412f9b7
 DIST pytest-xdist-3.3.0.tar.gz 77580 BLAKE2B 5d983fd9c825b76d666a4de36087441a42e32ef11171d2fb4f8dde1f062fda2e664eb766af62012c977b5804f059eb9415fe70030d8a6ffc627833d8e69f1a02 SHA512 15cdfb3db409147fc5107d58bc8e2177a9351d2fde2486523ba17f77754083b75decafe442d5849d1be159a2eb9c20f6c3ec11a8c4cf16ac22d4e98a1f9de452
+DIST pytest-xdist-3.3.1.tar.gz 77751 BLAKE2B 483774b3fefefb513cc3021c49fd816089869a885ba098588e503530ff3b2dfb77612aff80a7147ff33fd8c1fe69c4fda40133de94007e41c699ad763d112e92 SHA512 f439ff1acf65a8df025fec847602ebdc5355b2099501845f8cde3c5287299a9c3102fa6dd6fc82a30bc016893556a24b0b5409323f5db4015e77c711a7b5c59f
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.3.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.3.1.ebuild
new file mode 100644
index 000000000000..bf8b80a00e63
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-3.3.1.ebuild
@@ -0,0 +1,45 @@
+# 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="Distributed testing and loop-on-failing modes"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xdist/
+	https://github.com/pytest-dev/pytest-xdist/
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
deleted file mode 100644
index e221ff2690e7..000000000000
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ /dev/null
@@ -1,88 +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
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/
-	https://github.com/python-ldap/python-ldap"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-fi
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-IUSE="examples sasl ssl"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	net-nds/openldap:=[sasl?,ssl?]
-"
-# We do not link against cyrus-sasl but we use some
-# of its headers during the build.
-DEPEND="
-	net-nds/openldap:=[sasl?,ssl?]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx Doc
-
-python_prepare_all() {
-	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
-	# https://github.com/pypa/setuptools_scm/issues/228
-	if [[ ${PV} == *9999* ]]; then
-		rm -r .git || die
-	fi
-
-	if ! use sasl; then
-		sed -i 's/HAVE_SASL//g' setup.cfg || die
-	fi
-	if ! use ssl; then
-		sed -i 's/HAVE_TLS//g' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Run all tests which don't require slapd
-	local EPYTEST_IGNORE=(
-		t_bind.py
-		t_cext.py
-		t_edit.py
-		t_ldapobject.py
-		t_ldap_options.py
-		t_ldap_sasl.py
-		t_ldap_schema_subentry.py
-		t_ldap_syncrepl.py
-		t_slapdobject.py
-	)
-	pushd Tests >/dev/null || die
-	epytest
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index ccc6ec51a639..8c0ef17fe54d 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,10 +1,3 @@
 DIST scikit-build-0.16.4.tar.gz 271037 BLAKE2B 6cca8a3c4f4b37228b77ac098650a5eca4ad0f525ca7dcba178f4cffabb7e60e9a7bbba244e64c1a598ab5916f2f47788198eb2a19803d8d0cf7b9792f4e06e2 SHA512 90315ceac4c372e4d7248b4b56b6092362c2c43fbdc180d1a234e057209c508a05d2c6e0a3d0c2587c3adb8957e4c66d5c171a2a2bc3dbf9874a0de58d97d976
-DIST scikit-build-0.16.5.tar.gz 271974 BLAKE2B e34d44fb27975720adc4ca57a0fabc9b05260a13043b546d19bfb44fa1c60e6490c5d7bbd41494481da470e24c05c4da3eb41b26c78160a35be1e3c29f9a4ef4 SHA512 37e50b3a1fc04b6758b65a58f5d5239effbc0ab38a4a2024098b6a69eea1d7a9a388e41696176469e9c55a7c8b73ace9d7eee2daf5d0fbaefe2a3e09880ee600
-DIST scikit-build-0.16.6.tar.gz 272201 BLAKE2B bb14b0db52d0c04b9630fa27ccbc58c7af72eb8640c4dc82e920acdbc815e2eb8f7662684b23aa42765966ae1ad4e046dead3d7090a263d79f69bfd955ab0f24 SHA512 f36a46845420b441ca158ea05bc20023238afdf81b2108554a52a4a2be0cb19ef6b2729997199d9a9d18841c8470df8f7e7a986a86e1172328f0963f3a015f3d
 DIST scikit-build-0.16.7.tar.gz 274287 BLAKE2B 8a5064c021d904312ccf89a396ab794b89b73ad1b6238767ca74eeb394f0f1514eedd3c746353ee3e9e7b825988b3c52c563e1f19d0acfbe69213c5a306f1dcc SHA512 5bba94214c249f891b2972301b0e37b5f10938151e37a04b845dfc9e11ae85edc7e3880984f9fbbd1c037257fc8baa3ba7b006b1f1b7abb941d1a54e049f3cbc
-DIST scikit_build-0.17.0.tar.gz 266282 BLAKE2B ca8d9fbb422363850b4ad12d3b8e2ad6e1664b8b7354c64e6fc1ad4ab1965a3be92c24699041b67dc91c2be02f7d17be3eefd9a909ea0380149eb5b58e01ea49 SHA512 0ad536ac624eecc0710b5e65ec976cc9f8eb15f0017edf79016724ae8321909c134cf9b6842f58d80b3e62edad95652987339e26e3c576b909adccd3a2f492d1
-DIST scikit_build-0.17.1.tar.gz 267911 BLAKE2B 365e7e4bcc902a00464b157feaee4efcddff3fca8c8026b252b25b44de5ed5a646c21d29df55133d6945868f346f638c5adcf9da530b1ff6bcb5689d0f33bf90 SHA512 617a68d92787c576f1c3fc9c24c8cc90e1fe976a853f3ae81442e1a99a20e1f4049d7ffac967c2248bf172f07a3e2092fc28b8d558b35da628a58cd3d9d16ae3
-DIST scikit_build-0.17.2.tar.gz 268269 BLAKE2B 9ca0f860b8bdab235ae9e59ce5ca8b82320b8a2e806e787f9acdfd58ac0dd6c6e28e0a71e7c0177bf87022ecd2d73bd3783b5eaaa899f273d5b65399ef03e77e SHA512 a6ff41958e336679a0996c63627ee1486c81f36fa0ace3418137421626ab068b4eca29e470cf1cc92c82c5cb3ebe45ec710fe7d098e349deb6f1d3735ed6338c
-DIST scikit_build-0.17.3.tar.gz 268932 BLAKE2B 887751f64cc703a9d6125e87da01d327ef34416ad0ad5170d7f01dcc64318d1d2cd36fc2c302bb8c93f72964d5e2efd1d1bd67c3dc001e60ed88fb952c34ae41 SHA512 adb3df364551b8671f0d60c3a68825e420e6ba57e715f7da583f601dd82a228d68b326ccb457f07b26ebfb9272ea04a2cdfa2cd82d4d04ed9682ec08ee2e0584
-DIST scikit_build-0.17.4.tar.gz 269511 BLAKE2B 90c618eab2a585e71585d039f7990ee07b0280db7e516aa4c390c15233a43e074ccfcb06c518d738ca748321966a3344a1515208a4aa3fb40442033cbcd49215 SHA512 5841789027e763e4448680b73704c683ca4400e3750679d8413e008de5213d56fc28ab84a1dce137171bae690bc99386844dd99a0810238e1a07d44310535d1d
 DIST scikit_build-0.17.5.tar.gz 269848 BLAKE2B df1ec6ff3791efeea0ea7b672b7c5d2ad946c9c8d1e8b7035f4036315701ad1b7d61b0917e75ca8c9aff10fe8f25e53b8d1221fa6c3b554225ff8d8f5dec5fd4 SHA512 f0c9a861f9931db36df137d96a9a53d2bfa4a696efc2c1307ff50a00f7df828042d933ef1f670d14d0a339ccf5b94ce99fca7ffbab9169b6e70c47440f4eef06
diff --git a/dev-python/scikit-build/scikit-build-0.16.4.ebuild b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
index a5c47bbc0893..2013e2ccca1f 100644
--- a/dev-python/scikit-build/scikit-build-0.16.4.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
 HOMEPAGE="
 	https://github.com/scikit-build/scikit-build/
 	https://pypi.org/project/scikit-build/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/dev-python/scikit-build/scikit-build-0.16.5.ebuild b/dev-python/scikit-build/scikit-build-0.16.5.ebuild
deleted file mode 100644
index 816678fb858a..000000000000
--- a/dev-python/scikit-build/scikit-build-0.16.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-		tests/test_pep518.py
-		# This fails because of additional item setup.py in sources
-		tests/test_include_exclude_data.py::test_hello_sdist
-		tests/test_include_exclude_data.py::test_hello_sdist_with_base
-		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
-		tests/test_manifest_in.py::test_manifest_in_sdist
-		# Wants internet to install things with pip
-		tests/test_numpy.py::test_pep518_findpython
-		# TODO
-		"tests/test_command_line.py::test_hide_listing[True-bdist_wheel]"
-	)
-	epytest
-}
diff --git a/dev-python/scikit-build/scikit-build-0.16.6.ebuild b/dev-python/scikit-build/scikit-build-0.16.6.ebuild
deleted file mode 100644
index 816678fb858a..000000000000
--- a/dev-python/scikit-build/scikit-build-0.16.6.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# sandbox violations
-		tests/test_hello_cpp.py::test_hello_develop
-		tests/test_issue274_support_default_package_dir.py
-		tests/test_issue274_support_one_package_without_package_dir.py
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
-		tests/test_pep518.py
-		# This fails because of additional item setup.py in sources
-		tests/test_include_exclude_data.py::test_hello_sdist
-		tests/test_include_exclude_data.py::test_hello_sdist_with_base
-		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
-		tests/test_manifest_in.py::test_manifest_in_sdist
-		# Wants internet to install things with pip
-		tests/test_numpy.py::test_pep518_findpython
-		# TODO
-		"tests/test_command_line.py::test_hide_listing[True-bdist_wheel]"
-	)
-	epytest
-}
diff --git a/dev-python/scikit-build/scikit-build-0.17.0.ebuild b/dev-python/scikit-build/scikit-build-0.17.0.ebuild
deleted file mode 100644
index 2439d933fc24..000000000000
--- a/dev-python/scikit-build/scikit-build-0.17.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.7[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -m "not isolated and not nosetuptoolsscm"
-	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
-}
diff --git a/dev-python/scikit-build/scikit-build-0.17.1.ebuild b/dev-python/scikit-build/scikit-build-0.17.1.ebuild
deleted file mode 100644
index 2439d933fc24..000000000000
--- a/dev-python/scikit-build/scikit-build-0.17.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.7[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -m "not isolated and not nosetuptoolsscm"
-	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
-}
diff --git a/dev-python/scikit-build/scikit-build-0.17.2.ebuild b/dev-python/scikit-build/scikit-build-0.17.2.ebuild
deleted file mode 100644
index 2439d933fc24..000000000000
--- a/dev-python/scikit-build/scikit-build-0.17.2.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.7[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -m "not isolated and not nosetuptoolsscm"
-	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
-}
diff --git a/dev-python/scikit-build/scikit-build-0.17.3.ebuild b/dev-python/scikit-build/scikit-build-0.17.3.ebuild
deleted file mode 100644
index 2439d933fc24..000000000000
--- a/dev-python/scikit-build/scikit-build-0.17.3.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.7[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -m "not isolated and not nosetuptoolsscm"
-	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
-}
diff --git a/dev-python/scikit-build/scikit-build-0.17.4.ebuild b/dev-python/scikit-build/scikit-build-0.17.4.ebuild
deleted file mode 100644
index 2439d933fc24..000000000000
--- a/dev-python/scikit-build/scikit-build-0.17.4.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=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build/
-	https://pypi.org/project/scikit-build/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.7[${PYTHON_USEDEP}]
-		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	# not packaged
-	sed -i -e '/cmakedomain/d' docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -m "not isolated and not nosetuptoolsscm"
-	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1a082b83dc25..7393c222a08f 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,3 +2,4 @@ DIST setuptools-67.6.1.tar.gz 2486256 BLAKE2B 7827eec689b6a4463888137660489a29cd
 DIST setuptools-67.7.0.tar.gz 2491327 BLAKE2B 3d1e89cf5b2753883397ff3a668dbfcef41c57775bd1871ada69c11a7deffe53fd4c4036b5c98146ec0496b1be86df1522c64cc981acb5ec192bd93bd800c2de SHA512 39502337b5d7f710c55219ab970a5cab23e8987598af722ad231d2dea2e1dfaaddb09dc698a5746a719b36e5e3065c48ecee2ac428e4d41470bec6ad3c99daf6
 DIST setuptools-67.7.1.tar.gz 2491346 BLAKE2B 2eb89badcbfec51fb3deca5f4267036305569bf42677b87c9eeb7cecd902c121ffc6725506bfa0ba3ac50e06c036a520dd14b6193ff048e21ed80dfeb1c93602 SHA512 c90a6ad0c215540dfd93d5c88126dab15499deb80ed601f4a90c92dfdff5fed6ff168fb8e6b9dc5ba8b1f067114d383400df390b2eebd934e2e728c3b56886af
 DIST setuptools-67.7.2.tar.gz 2491608 BLAKE2B bd77a85081e95813cdd8fc1f63b768c73036b2f49103defcfd09ba9df7b2c5dba84d4f1aca553e0642ab8d764ae390310f1c6bebbae31736d1b5c16802cdc0e5 SHA512 06db096193ef52111f064c327daefb12ea2bb2ebc6712436bae01f986165455fe89a1d2220cbaaa6391a182e2aee19b9cf7a709c158af8c5ab6232dfbc258bd9
+DIST setuptools-67.8.0.tar.gz 2492475 BLAKE2B 37c34605a58b41e14300e389402fe6debf9eeed20c72ddf53fa798b41484d1522d2b5313c74eb69a687eaf32c225f0931f901f452aebf6f7023b2419d127b808 SHA512 5dda7082fc563ce73d810efc9cdbccb8649fef2eac52f1a902c76ab5ec67a87ff64e36e918d0e3b168f5214d787bdc22e8ef9adeccb77d8d368dcbb48f5fb35d
diff --git a/dev-python/setuptools/setuptools-67.8.0.ebuild b/dev-python/setuptools/setuptools-67.8.0.ebuild
new file mode 100644
index 000000000000..734c47cced02
--- /dev/null
+++ b/dev-python/setuptools/setuptools-67.8.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.9)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	distutils-r1_src_prepare
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# fails with importlib-metadata-6.6.0
+		setuptools/tests/test_egg_info.py::TestWriteEntries::test_invalid_entry_point
+	)
+
+	if has_version "<dev-python/packaging-22"; then
+		EPYTEST_DESELECT+=(
+			# old packaging is more lenient
+			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
+		)
+	fi
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index 641f27e18954..7ad11570cc7d 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>layman@gentoo.org</email>
-  <name>Gentoo Layman team</name>
+  <email>python@gentoo.org</email>
  </maintainer>
  
  <origin>gentoo-staging</origin>
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.22.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.22.ebuild
index f887c5074a0c..12989fa66297 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.22.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.22.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.0.ebuild
index d5a1c212b499..9367b43a299c 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
index b18b1293f0a3..8807851cfbe3 100644
--- a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN^}
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python documentation generator"
 HOMEPAGE="https://www.sphinx-doc.org/
 	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
index 2512db91dbce..1aa0874208e8 100644
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
+++ b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
@@ -4,16 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN="sphinx-ansible-theme"
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
 
-MY_PN="${PN//_/-}"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="A reusable Ansible Sphinx theme"
 HOMEPAGE="https://github.com/ansible-community/sphinx_ansible_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-log_cabinet/Manifest b/dev-python/sphinxcontrib-log-cabinet/Manifest
index b1cd4cfd0bb0..b1cd4cfd0bb0 100644
--- a/dev-python/sphinxcontrib-log_cabinet/Manifest
+++ b/dev-python/sphinxcontrib-log-cabinet/Manifest
diff --git a/dev-python/sphinxcontrib-log_cabinet/metadata.xml b/dev-python/sphinxcontrib-log-cabinet/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/sphinxcontrib-log_cabinet/metadata.xml
+++ b/dev-python/sphinxcontrib-log-cabinet/metadata.xml
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-log-cabinet/sphinxcontrib-log-cabinet-1.0.1-r1.ebuild
index ffe620e9a7d9..35dc52c64617 100644
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-log-cabinet/sphinxcontrib-log-cabinet-1.0.1-r1.ebuild
@@ -4,17 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Organize changelog directives in Sphinx docs"
 HOMEPAGE="
 	https://github.com/davidism/sphinxcontrib-log-cabinet/
 	https://pypi.org/project/sphinxcontrib-log-cabinet/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/-}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild
index 8b7d7f4e0e43..291b2263615e 100644
--- a/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 3560f2a5fabc..53481f0b5973 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,4 @@
 DIST SQLAlchemy-1.4.48.tar.gz 8448993 BLAKE2B 02c5457e099a0f0bb0e5427a95d3ea35d504d0b5f1d10003b59c8dc76f92ea7b4720512d934fae64b12d95c5de5230139f3af9f5bd6e372fc07228b432995bd9 SHA512 f948e79c92889f2462b117ca49ccb8e82d5f8da0027c65488a3f6c64a802dc0bca96cc84c4e77bb3b8d434dfd66b621ef4d69c5d417ad781d1dc7136bcf6dea1
 DIST SQLAlchemy-2.0.12.tar.gz 9264506 BLAKE2B 83a3aa719e2809b5b48ef5332cf6cbc0e973089dad142dbbe952d14b2e4f3e5a1cf67c7a7240017fbddfafe1c57d6acb974d9c61e72970d8a8c49b7a57f52a91 SHA512 0e4bbc7d4729b2667ca1e8a0c88293e44698346415e3742ad3c686495c9855b5714dab161590605d5ee60523a2544f590f67ac7d01f7f2756ddc7156688db902
 DIST SQLAlchemy-2.0.13.tar.gz 9286442 BLAKE2B 3d2c06d7c89db1d5c5c13366cfc818720f8db0c1e26684c8de5856fd2cedf8c307f8653817eb080526b1da17bcfbd1163f1066226881ef47a553f5662e1989c2 SHA512 b560dedfaa1c2d854feddcb7ac343b184603db8143db8ec9551180fb5345ec793bc74211c838dd15cb45feba970d64f53daaeffe7d5bfa8c6c534742f6aa8453
+DIST SQLAlchemy-2.0.15.tar.gz 9296612 BLAKE2B 45abdb9010b854e52762d9c84a471e92ece2b212620a74d161b19ef7c6bce3d9ad39b3075c4f32749774884e3ffe255f82028dd6a6375e269d2827cbf18c35e7 SHA512 a1b9301f4a81428ac36b9280840a27433fcfb97dec2a04888e6e53cc33104c82972147e2b840a929e05af0edb47ee496a7ed5171201332aad374ce64baef414d
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild
new file mode 100644
index 000000000000..a42e53f101d6
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+		# hardcode call counts specific to Python versions
+		test/aaa_profiling
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+		# TODO
+		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
+		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+		test/engine/test_pool.py::QueuePoolTest::test_recycle_pool_no_race
+		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
+		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
+		test/base/test_utils.py::ImmutableDictTest::test_pep584
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/statsmodels/statsmodels-0.13.2.ebuild b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
index afda1e8d8b96..9dc4b0f65e51 100644
--- a/dev-python/statsmodels/statsmodels-0.13.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
@@ -5,11 +5,10 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1 multiprocessing optfeature
+inherit distutils-r1 multiprocessing optfeature pypi
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index c2674052741a..12f99d7aed0a 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,2 +1,3 @@
 DIST sybil-5.0.0.gh.tar.gz 55213 BLAKE2B c95c051ee1a2edf5f9be0cc1dc23caf4c48a6e6b29e16c5b1e9f1ab785012d774eed8f972467132ecad530d59f992dd802474178e32df0a47fcfed36192689de SHA512 6511ad1ba6c814d0ab951f96e2ea7e4791fac3fbcae47693e8562fafe8e0c73648407e10036ebed42ac4ebb1458208677d850f46dbe238419f7ae545f8add6b6
 DIST sybil-5.0.1.gh.tar.gz 55327 BLAKE2B 710830830402904d630d5405ddaa403cd4249061d76a066015dc77cb868f2009ef368675de518dfd98b9d42f1dc8056fca751fb67394ec1f62bc06c66c3665c7 SHA512 72894949f3a0c41ec2424688edd19e9a796e46c7ce66da3223c206dc02bb4857c711b8269faefe539c26d73686e5a82a5185d943843dec3577ff96a59d0b8072
+DIST sybil-5.0.2.gh.tar.gz 56319 BLAKE2B 56c64c0110a7d0e808eaf786a22e8ce30572a8546be85987b4c26d86e1d8ea8c3f35557463a032a32b23861e7403a4196b03ab0b4d2641d6854f5d4cfd6d4b18 SHA512 43b8a7e6067d99a82e1ef07fce0a2034402db086f5a2043c0c4136eca8bf27a2e53d26f03d0e717b05076a5e65cfc259e685c883a7526840135454a6c68c3100
diff --git a/dev-python/sybil/sybil-5.0.2.ebuild b/dev-python/sybil/sybil-5.0.2.ebuild
new file mode 100644
index 000000000000..e18ec7aee855
--- /dev/null
+++ b/dev-python/sybil/sybil-5.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automated testing for the examples in your documentation"
+HOMEPAGE="
+	https://github.com/simplistix/sybil/
+	https://pypi.org/project/sybil/
+"
+# tests are missing in sdist, as of 5.0.1
+SRC_URI="
+	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+		dev-python/seedir[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tinycss2/tinycss2-1.2.1.ebuild b/dev-python/tinycss2/tinycss2-1.2.1.ebuild
index 83b3aa668531..915035573e75 100644
--- a/dev-python/tinycss2/tinycss2-1.2.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.2.1.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="
 	https://github.com/Kozea/tinycss2/
 	https://pypi.org/project/tinycss2/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="
 	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 	test? (
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index d9c6b68397ad..fd67c47dae44 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -2,3 +2,4 @@ DIST tldextract-3.4.0.tar.gz 111437 BLAKE2B 94a3a77144fcaddebdf2129cea8fd43e971f
 DIST tldextract-3.4.1.tar.gz 104202 BLAKE2B 24e6f5a4af1718fdf3b52b2c12146849033b80fc0ba0320ccf72735fd0e39c36678660a70a203964ebd92acb3911e037b899b1796a941731735fa1e028999cd1 SHA512 6b63ba8f800e1adc836ecee43947fc0ee5198eefe7d3f64a267c7e0a4d18a44c60454ba67636a4b19e00a125f8b37f1f816f782976a9a335e5500a333c8e07aa
 DIST tldextract-3.4.2.tar.gz 105004 BLAKE2B 0bf2eddea49983720a554874bf1ec2d3280317657c9752d87ef825c9ce451f15a443c847d2bdbd6ac0f3fa3166da4bfce9852f6aff6710c5a53d8ac42541e9f2 SHA512 60ec9d99339940354db03e01d46bed571d604be9edce406476696d6a4d5e07677243f4c7f40fb1ca7e7f2f6bbe9d7d25a4959ade7f5091bcf89524c2c9cc927d
 DIST tldextract-3.4.3.tar.gz 105593 BLAKE2B 46e3998fe208a188ec3d547ade8ec8019f712b3b36d692dff44130c9daac879a1ba8e859565e6f5631415254a3cc625bbadfb499d450fbae7fbbfe32e108eae0 SHA512 6bdc66e73bbc537a355c21ea6d2b512e58f2199f7f38ae8d737aa4ecb7c615250276bdfb2aab939df06877216407c083b248d054cc2ad07fdc4243dbbef318c5
+DIST tldextract-3.4.4.tar.gz 105688 BLAKE2B 070fdde3f71b09a9f5409f7a9a0eb8a0a0855ffca4fbf1926146d21de11af4ed893d796932384df7b1713a52f10c7b367ba7f154d15fd7da2c72a71993c4454d SHA512 f6b4a7ed984c95e66838cda951058281e5e05bde74d02c6e5a6cd0345dc99703179303123905a095a46afe4c05dacb94a09677b6aa4cbf018df22e7bc2809a40
diff --git a/dev-python/tldextract/tldextract-3.4.4.ebuild b/dev-python/tldextract/tldextract-3.4.4.ebuild
new file mode 100644
index 000000000000..421d0afe56cf
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.4.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
+HOMEPAGE="
+	https://github.com/john-kurkowski/tldextract/
+	https://pypi.org/project/tldextract/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 71e53c7dd583..d4af7e226e8d 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1 +1,2 @@
 DIST trimesh-3.21.6.gh.tar.gz 12691963 BLAKE2B 518d8d73268ed40f03fba48fb1e07f5ccf8801bc779dbe99261670e61f291de5f549a078de5de392da2754b08735eb7bcfe9716f541bde94296e6f48edf2e44e SHA512 65b348d334f7770f74e48bbed15f613b71fc0ba101c51a868bcd6becd315aa4a13f76722b2de84f6624b37b4d617dcc418f92ab19acb5e7f1992834bc0a5b96c
+DIST trimesh-3.21.7.gh.tar.gz 12692942 BLAKE2B 3b4b7919b8c0abc6b8fc744d09f1e15ce31f50d3654f35b88444b49d6fe38f862e36cfe62ff4e31df5aacff07e8045c5ed11110b3c656304648d06cebbc8b6e5 SHA512 671af8927617239a5a4412e68051bfc7336d3006ece827d376b3e5add48eb4fcd28cd51f5bc41e92f9c6b94616e80566197165f406cdf8ca5e7d02679c0c1bfd
diff --git a/dev-python/trimesh/trimesh-3.21.7.ebuild b/dev-python/trimesh/trimesh-3.21.7.ebuild
new file mode 100644
index 000000000000..c3382a6092c5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.21.7.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_{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/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
index 580a04609b49..059408116335 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
@@ -7,14 +7,13 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1 systemd
+inherit distutils-r1 pypi systemd
 
 DESCRIPTION="Synchronize calendars and contacts"
 HOMEPAGE="
 	https://github.com/pimutils/vdirsyncer/
 	https://pypi.org/project/vdirsyncer/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
index c7f229c42ee3..55eb83b01a48 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
@@ -2,19 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-WX_GTK_VER="3.0-gtk3"
 
 DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="wxPython"
+WX_GTK_VER="3.0-gtk3"
 
-inherit distutils-r1 multiprocessing virtualx wxwidgets
-
-MY_PN="wxPython"
-MY_PV="${PV}.post2"
+inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="https://www.wxpython.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PYPI_PN}" "${PV}.post2")"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
@@ -45,7 +44,7 @@ BDEPEND="${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${PYPI_PN}-${PV}.post2"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 1ee656621dc1..1f4a03ed3c94 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1,3 @@
 DIST xarray-2023.3.0.tar.gz 3686167 BLAKE2B b9c2e04d0278e383aef17280e74863244d458324c01ac59a453e72196d65cad8fbca9f8f99a33b6db66637f742e04e5615fa8fc6eed307f0511954a856f8f3d2 SHA512 c08269e6fc8cdd3123dd7c39e0b85959bafdc53a5da75187fc615281fb71212bf2e45059f8d18fa05339567a4827e7bb68de3e605416929a6a1defdb4ed393e3
 DIST xarray-2023.4.2.tar.gz 3692437 BLAKE2B d4fb5b184386bb7e9574ea3bdf484c3df82b9dca1fcd2380ac65b6a58da9f89da057d70efa9bd045b5cf6900c38f6aa4176fd2990cfe1369f987c452711307d6 SHA512 581b06a677b80c0f7e494a80ae52d75bd62bf613b13b7b7215458ceef727fb55a898c8da8cc6f8a6875ef6898007897eea8be55fb138f1dacad42965bbf1d956
+DIST xarray-2023.5.0.tar.gz 3707468 BLAKE2B 55ee416c41aff8edcb609adcac1c0a2e1d4ae896c25ae3d771d755930725f69f854feac42c42558db598acc5d0a852370198908d85d5af9664c485052948f4ca SHA512 ab6538b280f05acc296d8d73003e07f494d330a2a6a486d2f3dac121aee9682e2fa46c05be868b23a31584c908e0f6454757bdac7ec032d3a6f79a4500c0629f
diff --git a/dev-python/xarray/xarray-2023.5.0.ebuild b/dev-python/xarray/xarray-2023.5.0.ebuild
new file mode 100644
index 000000000000..ee523edd9eac
--- /dev/null
+++ b/dev-python/xarray/xarray-2023.5.0.ebuild
@@ -0,0 +1,56 @@
+# 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 pypi
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="
+	https://xarray.pydata.org/
+	https://github.com/pydata/xarray/
+	https://pypi.org/project/xarray/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.4[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+	# TODO: segv in netcdf4-python
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
+	xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-05-20 13:25:09 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-05-20 13:25:09 +0000
commit	422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f (patch)
tree	04ccfefb247b41c21f693be687f6865da2b3a22e /dev-python
parent	03932a0109e4f4c6a80766bdc61fd6c52333a24e (diff)
download	baldeagleos-repo-422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f.tar.gz baldeagleos-repo-422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f.tar.xz baldeagleos-repo-422fdd9fb085a458fbeeb0ee21c87559c5ebcc6f.zip