gentoo auto-resync : 14:03:2023 - 06:17:35

38 files changed, 225 insertions, 890 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 51c9093d191f..b9f6fe6e61e4 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c49f85f8232c..cbeac7d84d2e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,7 @@ DIST boto3-1.26.86.gh.tar.gz 613310 BLAKE2B 4b16a9d637af664331a1197324219e9e58ba
 DIST boto3-1.26.87.gh.tar.gz 614323 BLAKE2B b2dab2b5850777e493d7b4df7bda8cce8bb4f3b316f9551489a1942caaa0deca915cf50e4dd3e910a4ceff0d0a49ec2539dfc8bdf955745a4d5b8018453f8280 SHA512 0577e56f4cef0386e113e0ee67796ddbd8084fdb1e2b4229525f7818a8d89f1177c875b0b80f9d3334fc774fd151805f673bc29211cf4ee6e08806a5917ec619
 DIST boto3-1.26.88.gh.tar.gz 615353 BLAKE2B eecc0bf96a8f6eadc2337de0a29f993f0a7e20c691fdbc170680f749be4988f6c91963f3089e9ef51376e5829bb8493a051d376bf1375137a31a9f864b677f5b SHA512 46a013179343ec9fb8973700bec74a998e08a7346f84812d2d938e3327f686690d12236f687c66b1cfd93010a986006ce8db040b8172241d55e097b3da4adf7a
 DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
+DIST boto3-1.26.90.gh.tar.gz 616132 BLAKE2B 1c6fb20ca08c75fce5bc192cd49c8540fb5a702790f5abcdcafd4ee803e4967e55c97a99214cfae57701e6f808501d48e3bf3b5c73e1737ca3f3909af2522d4d SHA512 da438af104c3362e366785da71b9892f45b2238d280c0c39df27572afc076d4535e73fe58aa7cc7fb565b92ed8423938ddb0f16e3a5ed641231e5efadb1bf0b5
 EBUILD boto3-1.26.74.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.79.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.84.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
@@ -14,5 +15,6 @@ EBUILD boto3-1.26.86.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef
 EBUILD boto3-1.26.87.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.88.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.89.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.90.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.90.ebuild b/dev-python/boto3/boto3-1.26.90.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.90.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index feb2e4e6c9d6..d919844e1b47 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,7 @@ DIST botocore-1.29.86.gh.tar.gz 11222402 BLAKE2B ceefb618f7156f93bd5a1ccb9addaec
 DIST botocore-1.29.87.gh.tar.gz 11221589 BLAKE2B c60ce2b4d58fa660aebc143f63848d871b2c0e9ad9ce234af3e23e7fc3eef64cc59186d687b844f1c767e569c263500cbb2ec1187bd14fb594eae28e3ed8e219 SHA512 2505f0c397257fb054c5a8808cbe807c2aa86015b71400b4ee7dafecddcef197ab89399df32eb8afc4761974490d65ae3524ee3b0ce7c1cdd9fa33bc1cdb95c4
 DIST botocore-1.29.88.gh.tar.gz 11227872 BLAKE2B 1fd9bf0f147ac87c92723d23b8bcefc8c22261932081aa4530b72de8b96ef964df293100a61940e2adb088f3b6ced4a64758f3c36dbf598676949fe84115083b SHA512 d71f2f7f453ecae000491acef22da701d12e0296154b3ba81cbc0821e9266f6e95e5adefbf94fdf98333775a03d7a6d255f28963c54278f22c5c888d15a291ef
 DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
+DIST botocore-1.29.90.gh.tar.gz 11234660 BLAKE2B 9472b843e9a36b59ffb8171a5148d07736690fef62a88a1853011b0fc6cfabe8588ea1e48b66696f1f9a5ade17c53261349249d20b704d91c1b8e0aac3528b12 SHA512 cdf20dbdac7146f2fb19ac8adce2d4b6605241cbfcbf15b5df7d7b8ccf1cf95f04e683de8bfc71322f2bdc467a15ada3502b19c43f0e5d1bd5c1a07996a1e731
 EBUILD botocore-1.29.74.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.79.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.84.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
@@ -14,5 +15,6 @@ EBUILD botocore-1.29.86.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d1388
 EBUILD botocore-1.29.87.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.88.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.89.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.90.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.90.ebuild b/dev-python/botocore/botocore-1.29.90.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.90.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index aecb014f237d..d74b5391c5db 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,9 +1,7 @@
 AUX doublex-1.9.2-py310.patch 958 BLAKE2B 262b23726628d859c31a8e3751d969c3cd6ba2a6d0a84bc172539e553871f269e42d70f1caf6df102a933cbdea42a9432ae973ec5dc8b81c1f2f87923db46650 SHA512 6e603fe6fe7068c8e6fe071d163f5edc3f25d3f4af6147180937fad52d98fcc8fc06cae34d2477293b8deee644473840a8293fa7fe235d68a8e922d032027670
 AUX doublex-1.9.5.1-py310.patch 982 BLAKE2B 9714bb4ac2eb8e96e8745daa7880055464225b0a8ec2e536839921d020dc0bb54a8067a29a072dfdca7c1c2912a8f7878cbc382da12a0bd3ec95e46b09a80517 SHA512 db4ecdb452c67037e2f37fff54923c115ded67d2e2028e7facb6c034ab2419ca4110b774368e902871cc1cad6ad354b5afcdc38bbcfddb8cc4a82f626e10bef0
-DIST doublex-1.9.2.tar.gz 80246 BLAKE2B 7fc1c4e6d117bee13e7125b634293aa7c9d1016c9cd5201f047143bcb1fae1e9607bf0a030cbaa2d6eb930474babe29aaf244433aba57ae4325a3a43af2fdf56 SHA512 0278f756930b0d5c3da676e3908ccc17b919c14f740aace3002f5117fa341ac52fe16fdaa2c3b36029757dd1dc2f36d8d35cdc8664fcfdbcafd4809d2fc969b0
 DIST doublex-1.9.5.1.tar.gz 80508 BLAKE2B 3c3e233bbe4fcc3a122430bfb826ab9824d41472e80802f0e6d345da83cbe97bb33912a831bead550299942b0087063e86839f6bf3a29a08164b6e3bf641f437 SHA512 498e8a8076ed7d3585aae7a20edf54d4143e6875cd8e7af3b47f9f9cfc612a5217d7877092c2af7f1ac80c7aad7be89946671a836fc5817de06ec541c0cb1e06
 DIST python-doublex-1.9.6.1.gh.tar.gz 81848 BLAKE2B 34aa108ba12f34f18f7a7b3d12fd2a539736d95097fd3ecf5344fdac551b16717d5348da1c6e2e10e19878b82de7e9195b9bd17d526156bc13e0ad2fd789b23e SHA512 c9779c5fcde43af653c2131894da44a878acf2cc81d53f6ab89a6fde071827a22aa97ec5a51561ad8861a98623d38c75f184be6234a6a5323c52e8e538c66710
-EBUILD doublex-1.9.2-r1.ebuild 1535 BLAKE2B 1f469fe719ae1bf4b573723e38ef003ce28a05d050deb1060ce3607bf813c5003e993ff1d3edde3715c9e6acbbfa8de38b88f65339380e8b6bd391e2d4d7dce2 SHA512 64a341420811c7de353f576cc44c5abc353ac27d2a73f2b0b58d4f1eee5343cf1e54879862806380a13b075c6b78b3a8691225e65b8c303950f9ec70ccb324aa
 EBUILD doublex-1.9.5.1.ebuild 1563 BLAKE2B 12ab626303c3707b88121022a30891b9c1ec8674ee3348a84a13530236d9d6b508e62bda703b550f0cec73f9fdc2d4beb4894b7f2b5e78a946de2ded7832c62b SHA512 caf3022fc3c6d63aaead59445c2315ad5a8b9dd4f259d6501fbc45c9c383b912df159df855cd1d60c5ddfe1acad1ae4ea64b22105545f3f49c344527135663b3
 EBUILD doublex-1.9.6.1.ebuild 838 BLAKE2B 7118daa9e5bea8e3d4163b6d8881efc5f2a1e95e3d7f198ed835981fecb372093783aa5ee3e959e413a4f32d2496a02d48d5ca9225e81e56e853bcc944b9791f SHA512 22994d050c2ee3c54a5f6320002bfea0606eede91e294d6d321bdc09ea7151515b4cdf0cb1e1e59a95d4ca799aad8f8e9dde62817a684d3aaf05c71837d00613
 MISC metadata.xml 400 BLAKE2B cffd7c3e58f02081cab7302efcc0d6bb825396f605ff5cc4a6599f95fd192e4739e086bbc0ec6763cde798dae2d8863d60edfe190c0c43d0a8c80a9d57ab1076 SHA512 543ddd2ced9992d59949f5d3920c3328015e6a7090fced6ef31d18e26631907970501b08116d6b5fede64fd1ad3180f1c3b8b70ed319ba8450df277461448318
diff --git a/dev-python/doublex/doublex-1.9.2-r1.ebuild b/dev-python/doublex/doublex-1.9.2-r1.ebuild
deleted file mode 100644
index b42ef4b5aad5..000000000000
--- a/dev-python/doublex/doublex-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python test doubles"
-HOMEPAGE="https://bitbucket.org/DavidVilla/python-doublex"
-SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pyhamcrest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	# https://bitbucket.org/DavidVilla/python-doublex/pull-requests/1/support-python-310-by-using-collectionsabc
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-python_prepare_all() {
-	# Disable broken tests
-	# https://bitbucket.org/DavidVilla/python-doublex/issues/5/support-for-python-36-37-38-tests-failing
-	sed -i "s/test_*hamcrest_/_&/" doublex/test/report_tests.py || die
-	# https://bitbucket.org/DavidVilla/python-doublex/issues/6/more-failing-tests-with-python-39
-	sed -i -r "s/test_(proxyspy_get_stubbed_property|stub_property|custom_equality_comparable_objects)/_&/" \
-		doublex/test/unit_tests.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
-}
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 640b6cbee9f6..f19fde8f225a 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,5 +1,3 @@
-DIST hatch-hatchling-v1.12.2.gh.tar.gz 381872 BLAKE2B 6290daca1f2d2cd4eb9479b2f34b782881651c0106008c8876c355e5f3aa12cdbd0168765fdc04dd7870f9b88d44cc1be8d3849b2f20393bf64bebe9dbf09dd9 SHA512 74404b3b5369f6a8350cbde9675de6d9d7a72aca721714d47d8c4052c341affed1ebb4f4caae96877c2ccf2c4bab29b8323643e2a3d7de67bfe5888f3a08cdca
 DIST hatch-hatchling-v1.13.0.gh.tar.gz 383610 BLAKE2B 0a3dc20f6c1c504c94c09897e23e6ade844318488093cf849e332cf08f7be178ddb3ae61d8ff01af93438c01216b056a3566e9d8758a0151e4d7498447a9524f SHA512 fb14e1d088676dfc2b76dda207aa514232c3c5b8472d7332c0d53e0bd4dbd1d0e3bd1ac9f261f72e1a32610c565485f5e382fc7071e80066735a04eb8cade13e
-EBUILD hatchling-1.12.2.ebuild 2087 BLAKE2B 74174d5bb78177af97ebfc1980e845f7033346a7421f98272168f20f16edd268a2414dbda28ba25ca8536710e50875ba033b8717c41a793dc11a856bcfad4e90 SHA512 5a2048812fbb9774666895f2b9ffd99027a83d38492b9303bcecbef1cef2ce1858860452f6f4d330ec442370484b893026c07170c1eaad741f8c07701fd0e9d5
 EBUILD hatchling-1.13.0.ebuild 2094 BLAKE2B 2e7a1d5a394a93f6d58a50b039fc9297393513803b0ae7bb551680a32321ed5940577acc02e6988865b0b026e0538f9b6efe24a9770e8c771ea5138e1de16aec SHA512 1cbe612df37be3a58213f1defd8df82469313a009cd77a9774e7ea16c615efe8fb0fd4127dc7e349daac0d9c1dd49fc3ff7629f14719f5d63dd4382c05514477
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.12.2.ebuild b/dev-python/hatchling/hatchling-1.12.2.ebuild
deleted file mode 100644
index 4a2101315a07..000000000000
--- a/dev-python/hatchling/hatchling-1.12.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{9..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# deps are listed in backend/src/hatchling/ouroboros.py
-RDEPEND="
-	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 5bb880950d11..83e7ff3e9a2c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,7 +3,7 @@ DIST hypothesis-6.68.0.gh.tar.gz 9350032 BLAKE2B c122455b7f941eaba8b37b7c4bd4760
 DIST hypothesis-6.68.1.gh.tar.gz 9350091 BLAKE2B 5d6d6912b20d3badca440b668838f456239653c393d8f148ba5dd16227e078586167f0d7ff0adbdca0efe2a81ff27e0307d97b63492658dc28c9abd7c7691551 SHA512 6dbaefa411f7945081158b7d730dc1893dfe02ec4b45f7bdd645f6f2198d39b3f4313d1e18dbe9a82d13e36df5bc541f1b31539128f9de5480b82b916bd74c0c
 DIST hypothesis-6.68.2.gh.tar.gz 9350253 BLAKE2B 5f98aac845a2f4e1dd9f54809d3e7e1b201bdecdec1c5c9cff10a37851af7d8d9e8cb643c1a9b0545672862b3639a17aed5f4197653d48d3114edd0105668307 SHA512 c3507f99376af924e375c51e0d56d4e444204d2ebe147d813a3f33a69594f83493c499714567b127556ea620df7bde58f4a1ba662bb182907e5e0d14cf13ee81
 EBUILD hypothesis-6.65.2.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
-EBUILD hypothesis-6.68.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.68.0.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.68.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.68.2.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.68.0.ebuild b/dev-python/hypothesis/hypothesis-6.68.0.ebuild
index c793a8a143d2..53e3bebd8313 100644
--- a/dev-python/hypothesis/hypothesis-6.68.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.68.0.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 16996d7f346f..3d549878587d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68e212afd5b2b97bc2f0eac6ec1aee45c0743d745554ef24fabd24667c2d6cdb3927350ca61b747e02afa215c1519 SHA512 5cfcdd49120d9ffc11d2f18501826b2f7094a51c439ac23e507f1027989ece4104d739a1905feba41f899d22a66e1345333f46e0f55d18925f166906f4992cfe
 DIST ipython-8.11.0.tar.gz 5462176 BLAKE2B 6024c191f327d04f7a26f2f371b200e2e3f26029d84a3a53fc7421cb4751f0e29fb8741a2aa0447026b43cc1d9a7674a07e06c30578812cc33220c55df72c497 SHA512 9b07da3fed304f6739396883d0219386bb08d4860853b30f308c2e9b9017f48d1228dedb511c872b706881ee80dc7bf03f541720ffb816c35b66f6f53ac289a3
-DIST ipython-8.9.0.tar.gz 5454595 BLAKE2B bb091bf9c2d9571ded5e1007d9fe60d34b9b0010747759ccceee3368822e3e190766439e3dd9b26df2dbb136ed2b81bc0d89d9b8857baae6e4d86a3524c07972 SHA512 2a9df79ff26bb34866dc523e75ba8e8d8de25d510fc273cbbf762b3011e53ff5331869f1d6fc8c44df6c9a8b5745a0545fe301a556b7f20e3a3dfca994316735
 EBUILD ipython-8.10.0.ebuild 4302 BLAKE2B 56977f20d28b41ff6a3deae19eccf31c2f6cde75cb384dc7ed31bd969cf074278b8bc34fb1b5569be893715c11195754733efd00e492e1518dd6abc8c4a8f6e4 SHA512 428e96f2aa0593a08a82e2cfff989424ba0cef8f78270d1e497161c0ede8d9a88fa659d585033fb7d87b4d9be0fb2a74abf2c219a16213c0c9ee5ea81dfc4e67
 EBUILD ipython-8.11.0.ebuild 4341 BLAKE2B c657404f0bf7fa6c9bed0772292859fa45456c702e3825651531efc1eaff7a2fb740c9ea52a2ad1fee18584670112b3cbe2e760d83bbd87b575062334c323375 SHA512 179cf02ed16f0f8a760bd1d53a92a60c3001813c89f84e78f7cc1ab4fd93a11d7997257166ec4804378d2b611cc0ba3902a9d5ad4f9fc0b3b17ec7f0fb17ec4b
-EBUILD ipython-8.9.0.ebuild 4302 BLAKE2B c2200d33b442a2103486ab6590f9b1e45f89959d87e5b38c3ad421f37c43903e867c38dc66610dbd851b67dcd6ac612653612f149e0db888e0bb49454b069c9f SHA512 bd1c44809e986a131d402ac8782b7283fb2246bbed0cbdb51c32dc369f397584c6056d60ceb7d3146d8c926767b6e598f4bbe20e3b47aabc467a52cef46fb8d1
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.9.0.ebuild b/dev-python/ipython/ipython-8.9.0.ebuild
deleted file mode 100644
index bf9a56efb0a9..000000000000
--- a/dev-python/ipython/ipython-8.9.0.ebuild
+++ /dev/null
@@ -1,156 +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_{9..11} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 7c993d8105cb..93b3c3c85e27 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,7 +1,5 @@
-DIST oslo.concurrency-5.0.1.tar.gz 59944 BLAKE2B 76962f187d58c514f7465a5cac2e695ee83ca020ae0f9d0d0d5a8e27cfcfb6d008f2df97f8b353ef2e7c57562b2cd169a4f6ccfb16bdaefcce1ace81445a64a7 SHA512 5987900e71020b2b8b77eac69c3541647c1600cb8a51f02d45938367e45ddce5e71b874a1eda79aadfec51d639fdb895f056964d0b4bd9bba597ae9423f35463
 DIST oslo.concurrency-5.1.0.tar.gz 59835 BLAKE2B feda58a724e835c060667edf7c126ac0a26c62dace84db5e0909abbecc3dd5649aca791e084e218bd39d2463ed4fe878a4a16018483191cf3668df8eb7761859 SHA512 a4fac20c32cff9c30cd464631cc4d390626ea4a52bfd5c132808983e682d32fe61cf7a735b01b85c4be806c6f473efc1ed89bfa42211a7ff59215d35cd607c77
 DIST oslo.concurrency-5.1.1.tar.gz 59787 BLAKE2B 630e5bef3a4a49d0f7b8b7f79643ef5f737248ec45de0e801107142b898a252fe7c67be6e0f6db4b968e5a163a47d63bc5f756c592d4f729f62c24aa9aeca172 SHA512 2eac13529f1635d39b5866d20d1f077ddcb2a676e78f4f50abe1df13c2fbf9f85aea1b360fde01e983459dcdc4958783477a87eb8fad106362e81e0f77b36561
-EBUILD oslo-concurrency-5.0.1.ebuild 1221 BLAKE2B ddbbded80387d2b0a0c7a6f9cae8f48b09601a913a18ca71029f132414b46edbf4e6b28797ad1d049c1238caad119a0f71e573e34f67de76d33d3dfc12725034 SHA512 1c0adfe3ac4d76447ae33a74ebd45dabac1a94c5b78f9e324f28516227ed1f9a1285f0404353469aaacdb5fcd58db47acd6740bc31ea94f363ec0ef9af0a915a
 EBUILD oslo-concurrency-5.1.0.ebuild 1221 BLAKE2B ddbbded80387d2b0a0c7a6f9cae8f48b09601a913a18ca71029f132414b46edbf4e6b28797ad1d049c1238caad119a0f71e573e34f67de76d33d3dfc12725034 SHA512 1c0adfe3ac4d76447ae33a74ebd45dabac1a94c5b78f9e324f28516227ed1f9a1285f0404353469aaacdb5fcd58db47acd6740bc31ea94f363ec0ef9af0a915a
 EBUILD oslo-concurrency-5.1.1.ebuild 1213 BLAKE2B ddb6378cf7ae556e544b36fd75ccce355e8a96d35bb2c40689101574ca297523d13176a3a2acd0f9fcbf0ba5684bb0186dc13f35f766ae1c2489c190b9430765 SHA512 57a66938f92a3c8a325162e8b269ea25511e37444994cb9507ffda469a6d517e6aeb25b504e2cc114941cdb7d80c0efafa9414a5deb4520f1268e8142024875a
 MISC metadata.xml 423 BLAKE2B 965b9f3a9b25cd0f93f13bc12af982b8435e946c1317b6c3a013d016ac6ac3df39f94e1a69f6ef28355459cc5d59fa32c2004727e6772696dab755aee6ad46f4 SHA512 ffc8e1547e6f8356071744a4cf2d5f88d02f2a34322857245c68057699f0b87ea351a7821682ab3d72b777260c8887524467a201fe931787fa1b2ad67eb022a3
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild
deleted file mode 100644
index 2f2e4dfe1982..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Concurrency library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.concurrency/
-	https://github.com/openstack/oslo.concurrency/
-	https://pypi.org/project/oslo.concurrency/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fails, then hangs
-	rm oslo_concurrency/tests/unit/test_lockutils_eventlet.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index c11d651a1c24..41ef8deae23a 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,7 +1,5 @@
-DIST oslo.context-5.0.0.tar.gz 33660 BLAKE2B 546191a1697fa833187890dfa50f6458b86c83f8d25382c55a3987cbad99e967b014275152fdfa5690b502f657c007734423af7544c8c9fbab4659ba29d5d3be SHA512 8a20e3bf94b018e2494712b7b72bc7d976af16db771338f76ef27a1d7b63cef77e5f5ae01fa6c42c3e2522a74b5f1c6dbd19a358bd74da4a3ef4398e3598b6b0
 DIST oslo.context-5.1.0.tar.gz 33601 BLAKE2B 0e1af626afa40ac2448e97b37f960d6e650d25e0b866e91f6afc9b585b5649e705e462894f7922ca89f3365f4085a00fe6b58e56d4653001bd6ca648143f9679 SHA512 d32b2a3bbd4e2f9c9e8c0438c9492380b8bbcda7563b9731852e714b202fc7a991b47a547d005bd815329e51500804afc7b8650a7cc4dd2b1cb28bbcd8401c77
 DIST oslo.context-5.1.1.tar.gz 33596 BLAKE2B ec16afb8af4c8532ee865a2184ff7d85845d826146482113d1c3e2e7ec43bb26d4e23b73f0de7589b9e1c82f6ef6f441bbff6c153f6c2dc4a1f81efe1ced6de1 SHA512 49e411b33dbe66ed20851a830db3fb52dc19ace786f7ba9b07be772390791d914eb7dd8424d38d48540c82a8cdccaf6a5eb70f8d2ca6f81ce24dfa72e6a8fa3a
-EBUILD oslo-context-5.0.0.ebuild 952 BLAKE2B f84dd5c8d6141e6377fad131e979a57e12785b3d7aaa6ecfae75348ce4786eed9e5e08d63be68b35ba9ed41fb9c6d4874f62370a8caf0e3a66985e9dc0446357 SHA512 a220ce1083cbe1c893df4c916cd8b764e862cd59725a74e4c1cb3c024fe6f2380fd3c7136d24eca0c100d92e0abcc53beb60aff4bb08dc98c2c13a5990c060aa
 EBUILD oslo-context-5.1.0.ebuild 952 BLAKE2B f84dd5c8d6141e6377fad131e979a57e12785b3d7aaa6ecfae75348ce4786eed9e5e08d63be68b35ba9ed41fb9c6d4874f62370a8caf0e3a66985e9dc0446357 SHA512 a220ce1083cbe1c893df4c916cd8b764e862cd59725a74e4c1cb3c024fe6f2380fd3c7136d24eca0c100d92e0abcc53beb60aff4bb08dc98c2c13a5990c060aa
 EBUILD oslo-context-5.1.1.ebuild 944 BLAKE2B 1049db8e31e43ac07a1f6db6291225d253ebe7173fd993dde986d0343ac49402d3de665c6813905d1123d170488528a6ac4c158407b630c77ed2d92863813f9d SHA512 de1d47b1c2aa38bd07ce3130925aad0fadd471f326069fff4ff6b293182fa21f3e4e1871e4216253ed62a70d5bf899be1badf2f648bc56de26cfa00798af3d15
 MISC metadata.xml 790 BLAKE2B b75e2d3cb436d1245e9ec756f17e5e759d98b4704652c46269f95c284318111e1cadeb389445851719c4bee57d04593ef21f9b21c7b3c8395eb937cc78782f71 SHA512 3b7edb7e029b009e861282ac5c8fd71a4a4e968935c3e91bdf11dbaac1eaa2d434003dbc4b0acef53187ca6c42a3f9908124b6dcf9a50d444068f49ad1c5d42b
diff --git a/dev-python/oslo-context/oslo-context-5.0.0.ebuild b/dev-python/oslo-context/oslo-context-5.0.0.ebuild
deleted file mode 100644
index 751d7dc090ed..000000000000
--- a/dev-python/oslo-context/oslo-context-5.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.context/
-	https://github.com/openstack/oslo.context/
-	https://pypi.org/project/oslo.context/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 35c800aa2c9b..174f4d4d7d96 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,6 +1,4 @@
 AUX oslo-i18n-5.1.0-fix-py3.11.patch 1196 BLAKE2B 08d78934986b45d23095e73cd1f465c371372de3fe3f2681bd087a00556fda60b719a40471638423df109be55929c34602bdc589c256421bc89d5c2a0dfcbcfd SHA512 214f367932692c4910b4285df1c05ceb7389bdbf9821e6287df33c9a07e81990a00ce9514e6b53e9f562ae3647aa198247808a2e10f1a746ebdeff169b6c4749
-DIST oslo.i18n-5.1.0.tar.gz 47423 BLAKE2B 621ec835fc975978fe3da392edda66471cd85fcfbe5af8c7a1704d7422d8f52f3b61c97ac8cfbd2aca94f65c8428cc5f97b095bc116ece605a4dc325a4a0171e SHA512 b2243f22de3ef3e33609c5aff573c4448a42c74d75022e023bea97c5338608e3fcd9da92aa2d262051e6b2ccbd5a88cfb2c91da79b7e3f81420dc24117da9b1d
 DIST oslo.i18n-6.0.0.tar.gz 47479 BLAKE2B c49b3b1e79a5f72d6ebaeafa3024f891c72da4058eca711400d581eb5bf0a0dfd5f87ce0685f96a54aa06140fc4a5fa213220017b26a55a8d3ef72c3db397226 SHA512 50179ada0449e216ec0a269ed928ca196158fc576a4ee9e0ab4e916fea595bec261cdba90b0adcd3cd089ada4ee47d24c756e9142ebf49e3a446472141db1638
-EBUILD oslo-i18n-5.1.0-r1.ebuild 836 BLAKE2B 9a9f2009f5c1ca5fc811b7c7e92a18432d3736fb5654396248e736b454592faa71bf72d7e02f601bb7ba4aaf76421eb218dfc130a93a4b7f27e6416f19ca865f SHA512 845d50e05a3435375445265afc174ea42fb1e2cc09d4462bc80dbbd30620bfe0f068aed3f2bce448d1a7f5a6f5141ae2fc96e3aa9ab80d7a26176bc34a3f1ac7
-EBUILD oslo-i18n-6.0.0.ebuild 836 BLAKE2B 9a9f2009f5c1ca5fc811b7c7e92a18432d3736fb5654396248e736b454592faa71bf72d7e02f601bb7ba4aaf76421eb218dfc130a93a4b7f27e6416f19ca865f SHA512 845d50e05a3435375445265afc174ea42fb1e2cc09d4462bc80dbbd30620bfe0f068aed3f2bce448d1a7f5a6f5141ae2fc96e3aa9ab80d7a26176bc34a3f1ac7
+EBUILD oslo-i18n-6.0.0.ebuild 799 BLAKE2B 3cd73c46a413fa95ad409384ab4608c076273b0c4d37c32597c204b2406c9a15c1000760fe3c68ff8516c448e0c371a3d6680aeb11b67a4746f248ccb75cc27f SHA512 1a75b3d3dcf5bef850039daa5f272de3b54af3f0ef4c9ac5c5d34aea397d925d3e296c5806dbce0ffdfbe207f403ed68e867effe6847a84a4eec0220945a5b93
 MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
deleted file mode 100644
index af940e767e5e..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.i18n/
-	https://github.com/openstack/oslo.i18n/
-	https://pypi.org/project/oslo.i18n/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.0-fix-py3.11.patch"
-)
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild
index af940e767e5e..aa429dc1edf5 100644
--- a/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild
@@ -6,10 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
+inherit distutils-r1 pypi
 
 DESCRIPTION="Oslo i18n library"
 HOMEPAGE="
@@ -17,8 +14,8 @@ HOMEPAGE="
 	https://github.com/openstack/oslo.i18n/
 	https://pypi.org/project/oslo.i18n/
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${P/-/.}
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 714b14f64f12..7a5799d6dcf1 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.log-5.0.2.tar.gz 96529 BLAKE2B c53de6c2b6576f4f1e1c0de8ed10639962b12a1fd0c1d40fa4c6d1c05a7d2c2cd0c3d3144336ab5984a7e5a91894d5556e20972f07abd5b66a961be63c6262f0 SHA512 1726b736f2c6797dfb65085f07768756a42397a41f7f42505e86df4c0247a3b5d1992dcf42ebd8898f9013cd9d0ecc96747eb0523911474d89f37ee94ffb7272
 DIST oslo.log-5.1.0.tar.gz 96584 BLAKE2B ced8ccc5ddaf1865e29dadf31bf7b691e2cbddfd2f1c4b2dcca36ce66e47516275058d05c11ddfb36a319efb5b220645f2c5c63ac16eaba599e4591cb09cbcfc SHA512 f4288892039f92e2cf75db79aa6cff567b5c3474a49f1d38ca7046bd00c1235afb59777c9e57b68a13b6696206527ef8f66c2a60aed8c6f8b1279f8418aba3cb
-EBUILD oslo-log-5.0.2.ebuild 1583 BLAKE2B 1e700556277cf2274e2d32ebcf8132e854cb63c84344a2f7ee5bb49ef64a9644781dfe240a893cb7f4094b5aecef89184e7bccbbb698e606cdbfa692f40bf045 SHA512 b6d087a0ccdabf47c95c1bbfc5940454b3850f38e391b60f3423cade2f12fb65138f8d4be0a2e117214dfc12f79c82cad9b716be5dafeca95c24cb031c3cf482
-EBUILD oslo-log-5.1.0.ebuild 1583 BLAKE2B 1e700556277cf2274e2d32ebcf8132e854cb63c84344a2f7ee5bb49ef64a9644781dfe240a893cb7f4094b5aecef89184e7bccbbb698e606cdbfa692f40bf045 SHA512 b6d087a0ccdabf47c95c1bbfc5940454b3850f38e391b60f3423cade2f12fb65138f8d4be0a2e117214dfc12f79c82cad9b716be5dafeca95c24cb031c3cf482
+EBUILD oslo-log-5.1.0.ebuild 1578 BLAKE2B b4f4a05f8842acbfcc23f9ba4ba4712794b10c5feb9fdf518947e3ef1a5836e93fa1fa20ad63c65e72636aa7dfef5f988d0a9792147109652214f3b3ee3404aa SHA512 f1e83b288f50897e45689998b5ff64fb81a3f55e5ef5af5694ba1531e13afc02662c8916b17a70234629a563ae5f79ba4af1a9e807923c2be315823d13289c7a
 MISC metadata.xml 914 BLAKE2B 47a0937cefc2cc4c8c4300f4aae699a42c5d659cb6017aa01b87aca14bdcb9f47256c3417cc0178999c452a35ebccd915b020b537a4d688d1d00664b7be1332d SHA512 dfeb43d43608a56c60e62046f1fbef6c6cc794431917d7734caf0b3afb5d1b761c1a04ee01ab0fc4d6051c39a984d6edb25663dae2cf94354192d5f2b8abd6e7
diff --git a/dev-python/oslo-log/oslo-log-5.0.2.ebuild b/dev-python/oslo-log/oslo-log-5.0.2.ebuild
deleted file mode 100644
index d0041308d78c..000000000000
--- a/dev-python/oslo-log/oslo-log-5.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.log/
-	https://github.com/openstack/oslo.log/
-	https://pypi.org/project/oslo.log/
-"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# this is used only for eventlet, and eventlet is masked for removal
-	rm oslo_log/tests/unit/test_pipe_mutex.py || die
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-5.1.0.ebuild b/dev-python/oslo-log/oslo-log-5.1.0.ebuild
index d0041308d78c..fe3f197f4c1a 100644
--- a/dev-python/oslo-log/oslo-log-5.1.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-5.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
 HOMEPAGE="
@@ -14,8 +14,8 @@ HOMEPAGE="
 	https://github.com/openstack/oslo.log/
 	https://pypi.org/project/oslo.log/
 "
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${P/-/.}
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 2eae71ac3225..63288842b04e 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,7 +1,5 @@
-DIST oslo.serialization-5.0.0.tar.gz 34194 BLAKE2B abaddf813ae35bd4434c96432590ca50cabeb6d31f03a2c48eb30aba9350b74d326deb463c56e38650a1df53646043a4ee28dcba09718725f7737cd96bf0e6e1 SHA512 0e2cf4efbf9803912fa5114c76da8645db0e946d6a8c4ae2c5e2ba4f5922d956e36e25f89f0dc1d384dedefca38e6c3b0e64df7098e49d1a9d8b5f8296dacc59
 DIST oslo.serialization-5.1.0.tar.gz 34274 BLAKE2B 8430af01862103e842aa0c73525a38ea4b834727d74ce25e5813cd9022ad09832dd84ca0193e55302877965c6c563decbddaf3b92d324e7f50f03a4c0900c0b8 SHA512 1fc87c2400430b9b57de4b1c80df01d80e509137ff2facd3245b4ef5852ccf26d5b57ede9a7e3a24a585ee8f193a696d9bf46207eca47c39e71d49a622fbcf9d
 DIST oslo.serialization-5.1.1.tar.gz 34306 BLAKE2B bf3f326e05ad86366eed93f144ea1c0736ac3e73f113336446bca1a73446aa913968a77c0ac5083de594244446fa6179846bca21bdf53911ee8d7cb6ba39d45d SHA512 a7a9c9d12d6ebf2c99e71f67ad304e2428e889184e0346ae606613a779990b8fa2ef272bb3aea876e8435a6e426b76b5d5a3bee2ad6b3a070c0c4a07a78ddf7c
-EBUILD oslo-serialization-5.0.0.ebuild 1168 BLAKE2B 2c019c3c24cebda3724d702bba7c6880ff9125f0ed5eaea8c7e09ed5dbf135066b5050014c8bad11624ac59a0f774e5337157bb24c893abe9d53ec1cb72bd7d1 SHA512 87646f883540f79d4980cf038a1ca5e463e11548586709ab2b361fe6672a3a25de3a0f43506851a65f358b692237a056b1593860000ed942cba64a6cf3bad3a9
 EBUILD oslo-serialization-5.1.0.ebuild 1168 BLAKE2B 2c019c3c24cebda3724d702bba7c6880ff9125f0ed5eaea8c7e09ed5dbf135066b5050014c8bad11624ac59a0f774e5337157bb24c893abe9d53ec1cb72bd7d1 SHA512 87646f883540f79d4980cf038a1ca5e463e11548586709ab2b361fe6672a3a25de3a0f43506851a65f358b692237a056b1593860000ed942cba64a6cf3bad3a9
 EBUILD oslo-serialization-5.1.1.ebuild 1158 BLAKE2B 6d50c78dcc94b5808b91cf9d020e21e8ebcd9e399272dacc67eba58a6340f08dada133fc59fe8e1b08e80834a75ab6d00b61050ad209fa49c608408dc2c02b62 SHA512 b4d838d55fe133a4b421b793cf426ea6d6486e2e7e4cdac7bb7dc2fd13c140afdec0cbf13c93365bd7a2d6f6f34fac121e7426ec55803256e05d04a5d183f79a
 MISC metadata.xml 683 BLAKE2B e6024e67c412b6d340960285e24611f5e9957fa69e18dc013e3443a33a9c8a15dc007611742a973be81969911962c016875f6fa71c4139ca51fb6942a28a2d38 SHA512 0646bbb2e66aad9004322771300d5267f5e76dd8b639cc7b73e510809b2ba641c1c13b9a61041ef9850950f93dd95053b8804f9466aea7a2fdffe7b36a1fa5bb
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.0.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.0.0.ebuild
deleted file mode 100644
index b9a01084170b..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-5.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.serialization/
-	https://github.com/openstack/oslo.serialization/
-	https://pypi.org/project/oslo.serialization/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
-
-python_prepare_all() {
-	# remove spurious rdep on pbr
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index 991848b16f30..fff48ed3516c 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,3 +1,5 @@
 DIST poetry-core-1.5.1.gh.tar.gz 479091 BLAKE2B ff59460a75893c18f9ad0063a880b40c6cff108d03c7f7bd16aaab53a72bf8af2c08af949c448e8703390589112e26c19e9ea9ddfaf2bed69791f86293b62b1c SHA512 ffc2cf6a37175feebe6ae926250d20ebf5742f459824f54b7ad8ea0f65c28639ef1e90a3cbd31bf58fca19d45699c5a22a583cefb5d60795d7e92399bdd1a421
+DIST poetry-core-1.5.2.gh.tar.gz 484004 BLAKE2B 56fe974bb37233ee75a220d35dab3d246b9a4145a3abd88981a0c2b9f51cb894b3534746638d7fa75a41451c856261b0b8e737af8778f78fcc9ae894a4b2430f SHA512 e0eab97bcf678f8fd329074d14cb394db8732666b0387384d273db49ec020ff34e15e9982e049bce62e9ba80443404de7646e66433164a2358f9802a8ce2fbb1
 EBUILD poetry-core-1.5.1.ebuild 1651 BLAKE2B 8e6adf14cade67cd360743aebc2f4da3c14cefa4b0cf5dab380f6d0d8e46eb36e9c47e31752d8fb46dc5f23927978cf40ddc185c3041bbd197f89564f4e6bda0 SHA512 5decea28fa0bf38b960051a05d676378c4d83ec0ad5cd0323d5d957ee840ca0a2d0ef28ffeae97c61b3e899905cf65ef457cbf02952c6143270653bbf301b61c
+EBUILD poetry-core-1.5.2.ebuild 1659 BLAKE2B e45ac593b72d02c198f208759de6761feae031267e290cbedb9e17c74cdf16921562666eb821b8ae1ff85fa659d32af226c13e3ff4a768019f5f006d701076ad SHA512 14f0b1b97397fd27f5e47b78cd08748c0f7fe848edbbfcfe9bedca1c8eaf3d123542349adedff25f1b500c91dbbfa8b6ea434364fb6556ae81c7cbd3436eaa6e
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.5.2.ebuild b/dev-python/poetry-core/poetry-core-1.5.2.ebuild
new file mode 100644
index 000000000000..b8e8dad4b649
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.5.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# check inside src/poetry/core/_vendor/vendor.txt
+# (note that some are indirect deps)
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pep517[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# These "fail" bacause of glob file path resulting from newer versions
+	# in our tree than vendored. But those don't affect anything.
+	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+)
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# needed for migration from <1.1
+	distutils_write_namespace poetry
+	epytest
+}
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 0b1c354cd5a5..30b96769e743 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-check-2.1.2.tar.gz 26152 BLAKE2B 75b58b97cb78f297614f6dce62662ee974e899846d896fa4e1d6ee5aa1e916e8c1d363a8de19fe842263702a94cb6e58519639bca82ac98d17ab596b724e98bd SHA512 1b5532e9473067db819e7d0ded5b8e681197c052b83909920eee0fc45c48047b849f513e6ad77d94e0fa06c9eb00845ec3f3ad7f38f3e90d80d82d7460d0d35a
 DIST pytest-check-2.1.3.gh.tar.gz 21570 BLAKE2B 8873d649e63ffca1fc8ab04383467f4cfb6c34f3970db95f1d439a3526d2a8b3482524ec2eda6a09fb2d166a781ff94895b976685ee8846d8e80ff5de6fd47e8 SHA512 bfd3975d93e27ccda71944e66b57e7628c5efbbbb6d9ac137fd58c96de760a1a4059fbdaf67d9c8844d2e5f0d7c671f2768fe1ced26f9a5406b872627238f664
 DIST pytest-check-2.1.4.tar.gz 24770 BLAKE2B 72973951e900276e771c083ad8869afbff5305c922c4cbc3fa02b302c6c72f24616ec89f25c2cbc7a2fbe333a4a8c00e2436a2f55345cc8b9791a1e5c2e64125 SHA512 8bf110f7c8e7d76c394ece5b6ba83cdf4ebc459d3a79541c5077237a1caecd0ecc82a74ebc796de9cbc921f48d1c739d1c40dcbd9c2efa3b1ab01f0234238bed
-EBUILD pytest-check-2.1.2.ebuild 636 BLAKE2B f0befe4b344359d52da5fb55388519ad126452a6bdfbbdc2321f51d7ff08dbb48b9a811043cb0643829deb506b79a637386f66a5c17ee60241c7669263c1c967 SHA512 0a7aa340f820bd0fd7bcc335916a288181af731def7094bfe6a225a5243b68da0fb56c3486f3120176378f72b931de9c552879cc411869bcf5e8f96ea9dfdfd1
 EBUILD pytest-check-2.1.3.ebuild 685 BLAKE2B 23880ae46ce4efbc11122f6d23688ed3b02d65f75cb304918cb33025d9cf43ccca02d10e086e96174dde8833db50f5412aac03afd54caf7de2038638e2703f01 SHA512 2c7d5f1f72b349770e11fd37b11f0620bfcadbef80be094f91fc12eb1ecdcd55e7e823d7de6088780a72588fa703a0126a2bb75939769269da0ba7cc7fb0c0ed
 EBUILD pytest-check-2.1.4.ebuild 625 BLAKE2B 3f3cf9e094bd52902dbcfaafc199e48b3283d8b0e1c0339c90dff8b2c7469b53735487a459df26929e0e6fd4ab0d24695da53d4e48a0de2ad4f78fd1ecd1ca9c SHA512 8b57faa2a0df2e1c732668c427faad77a77e924ce29fe042e16be2084f4cb433a4d806636324a823621611b4e4fd2317a4d03cb96c26af20874f487aaf2ea9ae
 MISC metadata.xml 509 BLAKE2B 85ec27b195520ffaf65e8f9a0fe166f0ba07aa22bb8981d558f96d2d89cb00441478eacc47a482bf2243d26b015ff42a1058c2e90a58d7cfbb20bc521b5722f5 SHA512 8d9082c66dde73cd751e3b42fc08ddd3c1815f6a7882d1b659972e5fff64506de79265df97161d63f05e3106c818b0155c2c3e21c861a44d330ff57506bd64a3
diff --git a/dev-python/pytest-check/pytest-check-2.1.2.ebuild b/dev-python/pytest-check/pytest-check-2.1.2.ebuild
deleted file mode 100644
index b5d97d7f8762..000000000000
--- a/dev-python/pytest-check/pytest-check-2.1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 6c200dec473e..4ae6c8d0fc34 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,3 @@
-DIST stevedore-4.1.1.tar.gz 514168 BLAKE2B b3b37bfae408adb1664562b99c9951ac035196babec8424068bcffa8226fed8da54044e6efe5b1b739b1caeb49bdaf1b65eca38ec6b4e200b837714d926e2dfb SHA512 9f75af586e4fff1bebb88351a242b171d6cce795d86cfffd021c47bafd9ced84a78a838a589d8828fa7bb0f183e767fe888b0780aeda9129895182bf4e0ff717
 DIST stevedore-5.0.0.tar.gz 513970 BLAKE2B e1135a281c88633daed4ec41a5bb66c3bf2ed2275a3502fbc90b6ba09ac55693e5c98a0af49d948adf141812e195dfdb6a293021405abdba962c05ff506a1879 SHA512 4041172deba14b8e33cb48d8b629810e66a52e1676a989417c1b896930e980e0057efbf8f9b6b9c4c82ffce02b132b8e6c5f7a5b02e49d7c7c242ab4a20bac02
-EBUILD stevedore-4.1.1.ebuild 1208 BLAKE2B 5f629ce2497a92bca6fdd11c989ff980cf43ea4d6f835cad6a996d203f96ecc6b598ece01a595cba9a60791bcc12f7bdd7d22053ad458a05b2e34be5f5d832a0 SHA512 e7f4c6cac0aecdd1bd253a9da00b7492132523b92f562e23d4202f4ea7467cd335a0e1a3fab6f04482df890d05552d8cef0add598545ba1451c5a7c79b1a1ab5
-EBUILD stevedore-5.0.0.ebuild 1153 BLAKE2B f0d461c57fe8c2d097de091a71eb82f47eaeb7ae707dd3a116e721407eaeb745bfa962831c71e0099a19c25a40cab696b56a4f83f5b0a30be093ff1071ae82f1 SHA512 9e0234fffa8870b7f28c113a4073baeec3f7b40248d401146bc91a024fe689b985442e94cb3f334f567e3f6cf6349905625976717b74c497c7f605dd4187817f
+EBUILD stevedore-5.0.0.ebuild 1106 BLAKE2B de4bfbb9928ddd8517cd795032769f437fad560bf5b6448bade8f00a3193ec07d754db8255eaa34d4f25804b88ef12edc1ef6f1b0c07844f5872e7d6d53557aa SHA512 21042774ef2009a773a9a9a412b0ef85a61f22c10cff8561ff5c5971cd0b31f8fda19a7dace2b333e2adf5c3379217a83b404175eadaa828fb4a20b2d8667e1f
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-4.1.1.ebuild b/dev-python/stevedore/stevedore-4.1.1.ebuild
deleted file mode 100644
index 0d1d6e08debb..000000000000
--- a/dev-python/stevedore/stevedore-4.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="
-	https://opendev.org/openstack/stevedore/
-	https://github.com/openstack/stevedore/
-	https://pypi.org/project/stevedore/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-
-	# Also known problem, inside venv
-	sed -i -e 's:test_disable_caching_file:_&:' \
-		stevedore/tests/test_cache.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-5.0.0.ebuild b/dev-python/stevedore/stevedore-5.0.0.ebuild
index 86df56933289..fb7343a6080f 100644
--- a/dev-python/stevedore/stevedore-5.0.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Manage dynamic plugins for Python applications"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/openstack/stevedore/
 	https://pypi.org/project/stevedore/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index d8518e4474d4..da619f3ad50a 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,11 +1,5 @@
-DIST trimesh-3.18.1.gh.tar.gz 12657109 BLAKE2B 8e5370193e7d47f1dc2d7d43c356df1a56c2b4b8af6f47ac6aa889b04a3b950ec507b5cc0fe6f99f874cf66111aa72773025ba3821013466bb34baced3a361ca SHA512 72936c0fc6f89ffa35b80928dc5abac8ca4fac023f5be1d4adec6d020f3da6ee2c7a97efb0cecf58faad94ef6f33949533ac789affcecee07696ca0188fd47f0
 DIST trimesh-3.19.4.gh.tar.gz 12673418 BLAKE2B c54e0e1a946b858371d5de2f028bbc64a353a06859f428d6e221058a46e853bb7f245d7348b1cc7fbbdb930ba9600e24a39c2884a9acfa00b9d31d6576b87959 SHA512 b490e6d021a41c0a094c5e3596033a189d08310c04a2ce70c9b72d492e1cad1b5c9f110487c66d0a37eed97754e979c7b449d10a6a6abdbd81241099c248d5cf
-DIST trimesh-3.20.0.gh.tar.gz 12678960 BLAKE2B f99ff3d7fd1a84e1ce9b6d1d67b38216aa8b3e3250096f2ac7c4585fffe0a4e565c093bf30bd98bf46daa910c80266edd12dbd43c5a2aef8a7d66c75b08972cb SHA512 82eb81d8b43880d1205c31ddcc085735cfc0bf64eb4918fd539fe5b476c107f484ff1b969d6f8bdb0ac2486d201ba1ff4316b84311afc38853ffbe8f13d0fb9b
-DIST trimesh-3.20.1.gh.tar.gz 12681880 BLAKE2B 138c10b4e57971e155770f4d398e364a6c4e827d564bb6be608e93c4ba17bd3a06c313e73308069635143d974c945a9231785102bc14c024382675f66675b9eb SHA512 09c048e3a22abecafb8f163ab8273565f244ba232cc988673bce09efbc8696ba92aa53ec57bff41fe90605b032ef147889331de38580948ee04333dbfc608635
 DIST trimesh-3.20.2.gh.tar.gz 12683352 BLAKE2B 3ed73e426fd72723d19b668aae790f44ad46b310b6ddbbedf1e87aa56880037fa09b43921131ce2a5bff02022e6630222c63fb205a4345e81959e14b0013c3fa SHA512 fb6ca184b9d62e7820f1b92c8ce67a02eed6355c49dbb209b328e149ab6e600c306a10bcbae3bceaaec0244874eebc8bdf06709310f8458e9f72ee9ad213ad65
-EBUILD trimesh-3.18.1.ebuild 2217 BLAKE2B c230c692f86f17a22476b07c9f53932898002623f262883eaea2bb0fc6eadbf8a13df593aff9fb10081aaed92c6140c70608d92688cd4848b868611d69c6f936 SHA512 720f8b517b3ee4339d66f1e47c787b34fa52036673a458de0ca71ceb5a02dae0f3fe46c3e859d3864891becd88fc7dec69b7e8bd58044737bdef5646ed5832b2
 EBUILD trimesh-3.19.4.ebuild 1908 BLAKE2B fca44800b00390609a488c1d6ed4167a162c5e0f8b03d37d06c327f1f3516f2cbdcc51c5954df0dba0a8f99493bcd3ea5b8b404e6152d38105139a4c8935bfdb SHA512 5db0b712d9c1cd0bfa309c0018c0a0bb4a8b28f970e76a18308640b0a237b5e68fb8c23320ad2f0674eae050da0913942081da0ba00c18dc9f7596655abe1460
-EBUILD trimesh-3.20.0.ebuild 1909 BLAKE2B 34fe461b88e583ac9981b590db715562151e7faa2a31bd6596c0455f329f3e7f81c06ca9e994c6a20d1ca75c88003901beca7c77578aa60ef3880a35bb20183e SHA512 253b8d5652d031951198bd51f657984d7c65c8f0e7f9a2a7628905d8c88a761411f04824cd6f09014b3cdc7ba40581f2f100aec3e5dad6fc1fdcabc8c907c7cd
-EBUILD trimesh-3.20.1.ebuild 1909 BLAKE2B 34fe461b88e583ac9981b590db715562151e7faa2a31bd6596c0455f329f3e7f81c06ca9e994c6a20d1ca75c88003901beca7c77578aa60ef3880a35bb20183e SHA512 253b8d5652d031951198bd51f657984d7c65c8f0e7f9a2a7628905d8c88a761411f04824cd6f09014b3cdc7ba40581f2f100aec3e5dad6fc1fdcabc8c907c7cd
 EBUILD trimesh-3.20.2.ebuild 1909 BLAKE2B 34fe461b88e583ac9981b590db715562151e7faa2a31bd6596c0455f329f3e7f81c06ca9e994c6a20d1ca75c88003901beca7c77578aa60ef3880a35bb20183e SHA512 253b8d5652d031951198bd51f657984d7c65c8f0e7f9a2a7628905d8c88a761411f04824cd6f09014b3cdc7ba40581f2f100aec3e5dad6fc1fdcabc8c907c7cd
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.18.1.ebuild b/dev-python/trimesh/trimesh-3.18.1.ebuild
deleted file mode 100644
index f9ed1e3cda78..000000000000
--- a/dev-python/trimesh/trimesh-3.18.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-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/msgpack[${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-2[${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
-
-src_prepare() {
-	# remove pyinstrument from tests, as only used for profiling
-	sed -e '/pyinstrument/d' -i tests/{regression,corpus,generic}.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# does profiling with pyinstrument
-		tests/test_scenegraph.py::GraphTests::test_shortest_path
-	)
-	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/trimesh/trimesh-3.20.0.ebuild b/dev-python/trimesh/trimesh-3.20.0.ebuild
deleted file mode 100644
index 842ffb868e16..000000000000
--- a/dev-python/trimesh/trimesh-3.20.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..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/msgpack[${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/trimesh/trimesh-3.20.1.ebuild b/dev-python/trimesh/trimesh-3.20.1.ebuild
deleted file mode 100644
index 842ffb868e16..000000000000
--- a/dev-python/trimesh/trimesh-3.20.1.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_{9..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/msgpack[${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/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index fd22e0eca252..876e906f9eb2 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,3 @@
-DIST websocket-client-1.5.0.tar.gz 49931 BLAKE2B 03911ba7c147e19dab2fe3198ead34f1dc7d7ac970f33d20cb1eaa9ade0924be873c8ccc585326a8feb9ccf86443b1f5ee1482191cb14a50dddae5b5275b1f9e SHA512 678ab14a8c036e341134e6ae19d422a8888e64ec781983c2eff9d7897298a3b1899b65813351bb566319c931918c034cf0a730aa07c06e48ebac3ddb409a8dee
 DIST websocket-client-1.5.1.tar.gz 49942 BLAKE2B 7996798a5ff8c2eb1322fc7a9fa61d5cff99c71413293ce5b05f9af3581cff472350e79813ce3b393ce4fa4b7d19de956f0ad9ff6232c426be3c8adb8c91fb40 SHA512 9fce0c8de64e051b151c40a295a7f722ed7f95d19bd92ffd5cd9c64962821024e79b70d18ca7e30ca8b8707ba86be041134f13d7e2cf7bc4a4539eb22ba60895
-EBUILD websocket-client-1.5.0.ebuild 815 BLAKE2B 4b56a084ca302a4b29d3e0e4865b2cc7d44f771a943131470a36d328bd24033ed1ac105f4ba3bcf6c6c50b63e224b116943f34ed56b256345dd4a7cd0185e501 SHA512 dccd228be3b31f4e30b019fcb1f3bc592a0e30591bbe636689cb27ba139975ba3f85e6062635905310ee2d1468ed2b85fe23f1be5d4651d12cc0430aaecc9fea
 EBUILD websocket-client-1.5.1.ebuild 788 BLAKE2B 4448d1da394ee13ad1bf3f813e7263adb80ebc2d8be577b92ef455290c1cae2acc0886d346a4cad9587d7c8b9023c41d88ef5350b8a205af2c690fa1c9fa7fab SHA512 dd1cf6120c5a47fdf6a4513bc880da474c2a7d8132acfabcca6834e0cc8897301e4e12eeff9f48b1cd415ab4622031de1a0b5e1d5671a074dd00b33f4e36da78
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.5.0.ebuild b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
deleted file mode 100644
index d98896f264c6..000000000000
--- a/dev-python/websocket-client/websocket-client-1.5.0.ebuild
+++ /dev/null
@@ -1,37 +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=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}