gentoo auto-resync : 20:05:2023 - 10:17:50

author: V3n3RiX <venerix@koprulu.sector> 2023-05-20 10:17:50 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-20 10:17:50 +0100
commit: 399fa07bfac673a8846466b16c76549e329b55b8 (patch)
tree: 29af17ef91f1bd986b8e615a96b61db7fad5df14 /dev-python
parent: 388a0747e5972613060d5ca13955b5cd7132533d (diff)
179 files changed, 880 insertions, 2165 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 ecbcd6dd90bd..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_{9..10} )
-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 0d5affa1ddfe..009c7ba20ef3 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,5 +1,3 @@
-DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
 DIST GridDataFormats-1.0.1.tar.gz 2155370 BLAKE2B 8bf5ce65cefdcf490b75212bca8831957769118fbad7fdce42b5634ed67a1f5d4ac454f7429b984bafd89f5bc883fff1bca9dc71f529794cdd585e186e41e063 SHA512 2cfb8c50b4d17fa978924a0e65ae27f6e125bd1055bfdc9096ea35511f4c2a8a16f6bd9c652b9130fbdd66d4d464d8074b14f47c175f98df94c02fe973a0107b
-EBUILD GridDataFormats-0.6.0.ebuild 620 BLAKE2B 1b8ea8099d1a2840abf61c65775f7421de933a2466126958ee3e7521cac1ee72b52fdff41e056b1b062cdfc0a150b0ea1582281a82a8d30d30ac54bd5fe20810 SHA512 1d2b84d77f39c2ab33212a879dc1851c80bc31f2da21f653c436721a4c1c06ac5a01fca2b48c6145d2f590bcb7864b3486db6f71140854b7de1b49dfadab6213
 EBUILD GridDataFormats-1.0.1.ebuild 641 BLAKE2B 01b81fd205262f4e0cb6f65af90d184c3c1abc8bcdec575355fc818d10118544b4c94c93df68d39a2c4653b86f48ae089fe3a0380bdf8223b758a70314545802 SHA512 a2d9b12c5d3a9c29fb1dbaf92559563853a9d735662dce508cffbc82bd4f7f46ab423638a7a03bb468b05b7ba807a51841b5f977456257e4c90cd4bd7b7ae563
 MISC metadata.xml 608 BLAKE2B 25b3e613ce6776ecc00b7ab3e65ba253be7715f167b37d4fc4d625b035e8d24706cd56bc14f2f0cac2b3f4da6b84c8bcd2b219914490b9e3bc9fab0cbbc2ddfc SHA512 48ca119e78978f100a3212a59d716d49766e6bd523813c5395d05f705f1258e1899183d52faabfef95162b82ccfa08b5b771c1a00c53d7c42a54aaa97eb9ae52
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 ef724aeb48b9..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_{9..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 e46405679dfa..f8aa5d1cdf48 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,7 +1,5 @@
 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
-EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B 7f74159f1e57e0b9040b8b0a6af3c52d1c64661639b2f3ef1a569b5ad91d36a939c044ec3e4ba499158e57930285b8a81cf8a48e89b5b330966cefaffd015c4e SHA512 8ce08ce36977336487a1b870c2e474bc257f05db1b14b39cdcd56d5f0bb3cb14ab768ba6e13a79804f99578ff6dc841b7e19186b9ce6e1b529b4c7ac2a636b0a
 EBUILD Levenshtein-0.20.9.ebuild 1045 BLAKE2B cd155abb675212a0b0fc245d7ffa8c3bd8ae451ad4be29adb0b5b198bc5602cff51894b31493f19acdc2ae2107ee6e38b78564e40303ee020ec90b8949929fb5 SHA512 4355a6ac8bc2a2da72a20028cfbb5c8556d5c723a69b1776bf04b3e0570e457e3ed081f257476036379c05feda4320dbc195b6cf4a3ab71fa109ea35fc820b1d
 EBUILD Levenshtein-0.21.0.ebuild 1068 BLAKE2B 28c38a63f7a0e0f314e3d8c037b8de56a0969636eaf6509964a437a1ce7406a2aa6717f7a0f6b9d51f720c211d2aacf2e8f230b9b65b6650c4a1ee9390df4de3 SHA512 4cf2c896d3d88e586baa529c3956367b4f2262541e1e3c43f7271b61f8f110dbbfdd02d3c2257ddff1a8f35f3c0443d2d55faeafc080153f2f7d6c046cf089c3
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 626e479d8684..1fb8859b29e9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 394d9901dc4a..f1c293297dc1 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5_sip-12.12.0.tar.gz 122886 BLAKE2B a090c3053086d789b2a54d63716302693233177256fe01e70a04bb67937094374aa7fff063988a307c6b75c3c0f99882c831bbae1684b94f2e42be5051975934 SHA512 0d1d5f483333dfa6a41ee98cc7a3c8940d6f30afc4358faa88e620043f2cf26667903fcdd9083e1b9f92cdef78ace0442b72b5e1d10889b057daa118cc5ba660
 DIST PyQt5_sip-12.12.1.tar.gz 122905 BLAKE2B b2feb1eb13553cf016d31efaebc6b128ba3f8f664152de847218f639e492d1b0d0d9d0d5e92f6591011388eff8f6815e7d6e9e78b17d954b38358781db5d0265 SHA512 683e7164a55070d3473a5b7f1a6b2aa6a42ca78b97f78d5f6b9dc55fc8a0007993e74762766838bb42a097e924bfa00c1fc112db1d98ad2c55c97165d5eeac78
-EBUILD PyQt5-sip-12.12.0.ebuild 686 BLAKE2B bc51b29beaa51b99f5e5a90a64b9767c3799daed089a78571350f5fa0447cfc91a930b874040238dc40af409c942a2999f4a523e258cfcb3cc8f555e74363be6 SHA512 80805f8757436891626789d3e73c351018d35becac839ce6dc4f7a2b9fde395c66823e263895f43cab35502dc014d88a3aca5f6dc23a85b966bddfd9db07a01e
-EBUILD PyQt5-sip-12.12.1.ebuild 691 BLAKE2B b5ddbf7cd299c63ec4df801f9e3a9fd318eef6566fcdd57654ee3044644cc412aebf0635e642e240c2c460b412fd28fa44444ab5ceb50d69a4fe7ec7f91f78e1 SHA512 95afbbcc8843dbe4cd81211e3aebe153d32eca520242901e0b39a3d82d0586c2f190292748a53b767f75039752f2537eac2a29dd428439a1d2c5228106e7c14e
+EBUILD PyQt5-sip-12.12.0.ebuild 685 BLAKE2B 879b3553e9bbaeb47c5044372c7b342c4b54ab55a54303f5ca5787ea3ba582ba2fe108ed78753ff098c2f5adb3ffa4f92b82dfd903c5bf15046982216bf0dd29 SHA512 657946bf30750da7d349a3993665d770de6fff9edddd6725d6ae68e1f4eba34c98fe2a2e5cba54cff224ba6a13e9aadcc799c411f557842fe884b6a80d84de75
+EBUILD PyQt5-sip-12.12.1.ebuild 690 BLAKE2B 5f20ffb359a6155629aeb8f9cce4d3ffbfe215a20c8ea1cd330b1940cc2646f089f3330e6d072f933988605319f70a52f92f028827c2621ab82a04f759e22323 SHA512 42ca3c8d157a1f65badf8c5f5aace1661b7ebf704cdc33fcd0ea2c93e33d5629e71f7f352d726d5273ae9699894baf55958a57d7afe91d3fcdb137feb07204d7
 MISC metadata.xml 649 BLAKE2B 0a6faee65b39f122f65965490284b17856ba6d86537f3f3780f8604366739c346b01e29e933a91c7edb5ff898e5d51a10e4bf288228d1943a1c9e9970eac4c86 SHA512 3af9be87db6da5cb071f4025cd6fc1964a4b0629ebe93239f6c5a3734d4ef8ef06e652abbac5c9bd86f882a6235bf3b1f0fec6f0035c77ea42571e47c6045e29
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 c2e8bc17898f..c18c7e8c8b47 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_{9..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 1906637cae9b..469e940e7fbd 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_{9..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 45b5229a0bdf..d13339ce4e50 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,24 +1,8 @@
-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
-EBUILD boto3-1.26.123.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
-EBUILD boto3-1.26.126.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.127.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.129.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.130.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.131.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.132.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+DIST boto3-1.26.137.gh.tar.gz 650777 BLAKE2B e4a7d02ccefbda53b33558dc107457eaa1df0871bb2fc548b348246192cfdd6760bc43a6e6861622de6376244b80a94a387bbb827be2f5b749bccf6b8ff5af58 SHA512 de5d29a4139650f0527e93a9e223b7d41b285b6c263a5bc7ec9ebad1eee19373b1f2093c03414f7b575f8a7402734b4076cfaf0fa5be34ff54b55d8960e9c836
+EBUILD boto3-1.26.129.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.133.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.134.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.135.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.136.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.137.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
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 9cb4e02a14ad..5600ff1c40db 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,24 +1,8 @@
-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
-EBUILD botocore-1.29.123.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
-EBUILD botocore-1.29.126.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.127.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.129.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.130.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.131.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.132.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+DIST botocore-1.29.137.gh.tar.gz 11508178 BLAKE2B 2f74fd2f3923672a4fcd501f1c5ba48cd09965ea0f70689bd6559a4c4a6fe8921f783ef86f28ac57893c8b1366d8fca2fc79f0216747e04142ed33880f07fe39 SHA512 b800a1b73170b5fcbbf1b17477bb8f04b19f5f250a68bbb3b993b0e058d8df870eddf932f79d94eaa3255b976ce136adbdd5b359757cd79f2cfe2a16b3cfa2f4
+EBUILD botocore-1.29.129.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.29.133.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.134.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.135.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.136-r1.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.137.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
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 72dba14f47f1..23c3a328cf9e 100644
--- a/dev-python/browser-cookie3/Manifest
+++ b/dev-python/browser-cookie3/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD browser-cookie3-0.17.1.ebuild 764 BLAKE2B 3719e453a4535c6b42d518b26ebe109c03a88925af1a3c5647076776be8ab81ac75189d411e61f083b08cb0f922f6f911f732e615455ac0951e67037fda74782 SHA512 83f5a6cdc5d72cc47c8c66d63219ebd659562154f465b7459126a3df6861dc8cb02d087b7486f5edc0c97ff04fc89e919f5bd967ebcbcc3418a08804facf6c13
-EBUILD browser-cookie3-0.18.0.ebuild 784 BLAKE2B b155aaf7466e97e4347aba6a71d219a86ca6aa1243352f8be5d20cb88e51f8c75edb4b8ae8b91af60fd4dd9568e1b90c0bb1ea5ea9fa974955f91072649dd1e8 SHA512 2f4bbd3b6aab7891494584c9a2a9373b36fdc2c6584f285388256d4fa63bb29ea0ae6a36f338823b8e1e25d2b5e12e7f9034259d93231bd020e9dc9ae2e0a09f
 EBUILD browser-cookie3-0.18.1.ebuild 785 BLAKE2B 1bbc40f697cec934673dcc4eff2456f8d2ae1efeddfb29d5c92e05b09f430fb6a869bcd50757031fd20bf05397d1ece031778310ae13a863ad88659d1d77c3cc SHA512 3f100bef1c47f1a4a2254115cf5fa3cf4dbb09f59f58df1a5ff9923da400833c85f772711d82e1e96834e42f234f5bc09f32c46b425f86a186cf76473cdc8b9b
 MISC metadata.xml 516 BLAKE2B cec8305c1ded26acbcbf08fa45b6247b05d20a20ea3c9463066b9a442bd8513489d51ee61325620e75e1e0b30a27c785506382285c9533d4bfb7f23344a5c297 SHA512 52157186448dcbe5d4644c518f6b8a3ebf602e0fe4ad700cc20dcac920c02f1dd2acc86ba24a63029d9a5952f025c7d5eef79821de726b42e849cd41e1155737
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 aef18db017d7..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_{9..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 5d5225ac0edd..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_{9..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/Manifest b/dev-python/click/Manifest
index fea8695cf58c..a9f1d5ac90d5 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,3 +1,3 @@
 DIST click-8.1.3.gh.tar.gz 333961 BLAKE2B ed80d9be1e5740f1e4af62e97cd78488dc99d59da4a6dc9c99fb62b08c32ca2b889e3678a2841052922d102d8ac83df19e3e2d0ff41c46387e695d3718c7702d SHA512 29194ee3877e013a2fe1037870522c5b5a78136ca60da9109f29312a3e52c767867f5eec2d90ca385cd0508f77555b9d6ad8f5141dc31900ddc9307a2207a818
-EBUILD click-8.1.3.ebuild 956 BLAKE2B 8570482d7b1e0445cf7a29d175c959ee3a6d31d4a0e81d97385b9ed1f5a6ee4fd2b24a6fa9b71f52730331f3947ea506a8509ac99b6d073d3f3184359d721329 SHA512 6e20b336a10781ad3f42d38904d0a4dcb17173514a1c44badca10b27dd87611db8ddfcf6bb63be493bcf598a24021d31302b01be4e2d4ec153aec0f36b3a7b3e
+EBUILD click-8.1.3.ebuild 956 BLAKE2B fc899a1b5435b2535081845fcc8551553b050756e5726b8ed0b07e62236c88b639e17d87f101537243273efb9348b23053145bc3d6c685e21bf1322c4fd0bd4a SHA512 4ded0e120046978e75fabde0e96abe6937af3cd6b08c9e5e9edf683bee6fe05ea1b9bcae25e17a9a02c034c820a0067def3140685bedff62248d44ae9c763c4e
 MISC metadata.xml 386 BLAKE2B e460c7d70bbd848cd239d9e1ba5dc234c7de2a2bc0c77bfefb6aed1fa6d954de18508d4db44e77495f90a141180fa2602b15d3699aaaa99a48520a7e37a098f4 SHA512 ef8dd0545e92bb8fdc107fd6170068d35f44abad698226ea4724c450aebc0f32c76eb90b9fc936f9c85b8a93637f6006e889796e2bb3b7da5f57c1419f6b3794
diff --git a/dev-python/click/click-8.1.3.ebuild b/dev-python/click/click-8.1.3.ebuild
index 69ba0fcb1a78..a3c2e2bebde7 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/Manifest b/dev-python/django-redis/Manifest
index 6beb6272eec2..24a0814c8c5c 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-5.2.0.tar.gz 44132 BLAKE2B 5d9680e43bfff506924b90cdce4fcbf40883a732af6b599c2e36d8549ce2aedbd69540b187152dc8fdc0d2a93b21c5fd2724d6386772f9b4af8632e38414b577 SHA512 65d3dc6b1d72c8b90908cf368cb66ac2eb74bdd32d0b42c8a5288b4448bd7444b21320251262627bc950eaf0d1a1ef0c3014761b690122bea9e5e20f744dd433
-EBUILD django-redis-5.2.0.ebuild 1667 BLAKE2B b142f46db92f6b04dcbd6f9e255f8b87a54fe5f04afffc91ea53861ef93cef17cf24f0a4d53b7124cc88cce0982cbbf4e80c884ea45135dbd01cd4d5117f826f SHA512 40eb7f34704ef3fcfe94d1eb78999c33619929180d0d2d62a3888a9263e77c0c2acf7b7abdfef254befd5e998f832f0b34efefe2b8887f0185dc3bc71a153321
+EBUILD django-redis-5.2.0.ebuild 1672 BLAKE2B f70c1ba9a1fb3475a82a36e9dc9325971e03a1cb38a424feedb694c07c7741eac6b539de5dce35347a16be3f58c24c2df610fb1ec0eaef32e9a961e4dd7e4b4c SHA512 2e10c557b6af865f266be81e941749d9debc35604af44ad0a7719eb757f200cb9eff85c0f5f2a9e7015bbe07b539a7eb973e44db08b3a6d67cd8555f3edc3f0e
 MISC metadata.xml 486 BLAKE2B 5bbffdb40a82538635cec1802d748bcf8c628390de12d19450486651f84f0c23ff7471354080aa51ae80790600d76f35a6fd37f720cb61cf410eab92bd15cbed SHA512 45cb2046312b95a3f9c87287e9a01015dc46b767de2dac060e79ee5457fa066f3229e815b313b4692128c88f6e13208f96048532ffe6554533427edc92286a2b
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 93fae35b6975..7400467f8ded 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 a7c122297229..40d533bbb8ef 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -2,8 +2,10 @@ 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
 EBUILD ensurepip-setuptools-67.6.1.ebuild 667 BLAKE2B d1cf91291a9b0d6bdfd0b7205dff5f45feb09dce8b59fa63ca1bd429d4c4979b704ad358283556a8525daf9fa40102adfd6ab036fa85ad12748d840009a86fed SHA512 d81a77cafc36c907562009df0b6b49cca6014ff938adaa793a47a1d49be5085dec788ebf3a0c6496b97834146aa9b661bb523605dffe67ac6891472076b90efb
 EBUILD ensurepip-setuptools-67.7.0.ebuild 675 BLAKE2B 906f1692e9f0548f543d88c79495bd7b1266f5d07793399aa8fb0d76e0814014a48e062b695aa647eba6bcaee7c6c40c734df61cc6de0a12e81042393a9a5ee1 SHA512 2abeebec6e65b5f6433d9e116655f3e11f03b958dc8c573a5f386a3ad80d6c387225b70068f6aacc5d4d770be202ab444f7fb3cf70927799ed931ee53a04c11a
 EBUILD ensurepip-setuptools-67.7.1.ebuild 675 BLAKE2B 906f1692e9f0548f543d88c79495bd7b1266f5d07793399aa8fb0d76e0814014a48e062b695aa647eba6bcaee7c6c40c734df61cc6de0a12e81042393a9a5ee1 SHA512 2abeebec6e65b5f6433d9e116655f3e11f03b958dc8c573a5f386a3ad80d6c387225b70068f6aacc5d4d770be202ab444f7fb3cf70927799ed931ee53a04c11a
 EBUILD ensurepip-setuptools-67.7.2.ebuild 675 BLAKE2B 906f1692e9f0548f543d88c79495bd7b1266f5d07793399aa8fb0d76e0814014a48e062b695aa647eba6bcaee7c6c40c734df61cc6de0a12e81042393a9a5ee1 SHA512 2abeebec6e65b5f6433d9e116655f3e11f03b958dc8c573a5f386a3ad80d6c387225b70068f6aacc5d4d770be202ab444f7fb3cf70927799ed931ee53a04c11a
+EBUILD ensurepip-setuptools-67.8.0.ebuild 675 BLAKE2B 906f1692e9f0548f543d88c79495bd7b1266f5d07793399aa8fb0d76e0814014a48e062b695aa647eba6bcaee7c6c40c734df61cc6de0a12e81042393a9a5ee1 SHA512 2abeebec6e65b5f6433d9e116655f3e11f03b958dc8c573a5f386a3ad80d6c387225b70068f6aacc5d4d770be202ab444f7fb3cf70927799ed931ee53a04c11a
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
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/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 8802339166eb..7fc5fc2853b3 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
 DIST Flask-SQLAlchemy-3.0.3.tar.gz 135538 BLAKE2B df0e682b39bf621ed2de415cec3cbda4f937d65a750050e1281082cf42dcfacf51ded5123a5832a6bbc7506f3f8e8a553007cd58710266b7ba18819e96e65c81 SHA512 0a49780048491bbef7384d895a34ea2732f9d6702fb40b07987eb8d0ceb73aae7988539febaeafcf050b7dc67f1297301497c84c90d139b4bf2874201186fcef
-EBUILD flask-sqlalchemy-2.5.1.ebuild 770 BLAKE2B a7fd7d974f01f8f0c0b46a043ede73d276a5e4411dd331ae3a869633498a3e4e31d63393c8e57c2366f683124fe07ab57b22435f20a23890c126ee0ce2b52c24 SHA512 ccd986cd8810487e76642322ad63f4e1f45a6642b842260a636c6ad3d82cb994a2d316e716142bc6039909c78d5044c90fc713f73d40742df71c0a9a2d9ebb4f
-EBUILD flask-sqlalchemy-3.0.3.ebuild 882 BLAKE2B a1c4fdbc976e00d5351622bc6e8db5169d813d2ad80b6f63894ad4ca4dfbe1cf3ceac34b1397d627ac51aafedf29d17c7763cdca33c0bc8bdeae6be762f5cab1 SHA512 e2d2b1c88ac341781f38097a55ac741376e93f9774163704aa04e3db6e849f3ed6c19b7efd869ac972c472ed87451afd306d207bb45b78fb46145317d3968151
+EBUILD flask-sqlalchemy-2.5.1.ebuild 691 BLAKE2B bcf487d0b2f9e1f98c6ae35dd9a9f2cb974e9e5ae7644d063c80329ffc8107daed15e942948694d84ca6641077c58f9ed7e11f0d0068b0efcc00201b91156d16 SHA512 8fde870ba7c642f5cfb8e5261c6f85859c94e918f5695e2989c9bebf83c400d2009cf67b71c4f5d78454cf69867d83b8f76c6f4ce0e752a506e2e1dffa3d7247
+EBUILD flask-sqlalchemy-3.0.3.ebuild 820 BLAKE2B 9e0fbe756945883e2bc082f4e78485bf7382ddf42530638258dc217a37071e59c050312fab4052da98ad7fd965726bb9244c94db313cf21809ee218c567136c6 SHA512 b93362ed86a5c6b527564e128bb4ae078b2fc36e0f54fce6f282e41da27179d2429522bb1d962fdd7ea833cefc7edfdac9799584d8f608a03274ee66cfc89784
 MISC metadata.xml 728 BLAKE2B 8e1ad7f3e4c0c7ea958c39dfedd2c4fe31ccd74d845b6e0f2fc3a142200a75265ef33f8c73b427efe58ade3ca71a04405d8f9078b403221e056204bca1eb4ac5 SHA512 629e0bd18d29527d48fd128bd0a412b65d215855edd34a3d978f74cdf59114e54eae7d8037e2ce33d428cf4fc97f13642c5a0f0fa5c5696d1ef3607c5763d2ae
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 65fa481668ae..6d1423b938b0 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=( pypy3 python3_{9..11} )
-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 c5c8a05c951d..9199be9dff68 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=( pypy3 python3_{9..11} )
 
 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/Manifest b/dev-python/flask/Manifest
index 95271be0d9ad..115e7dc8dd3c 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -2,8 +2,8 @@ DIST Flask-2.2.3.tar.gz 697599 BLAKE2B 619902202443567bc79111c15f19d0bea9e03b0fb
 DIST Flask-2.2.5.tar.gz 697814 BLAKE2B 62d7bedf533f1e47c359c76e7a83e4edca15c3cac40f39d96897b150307ee4a151a9a17a71e369623635f2f0ab082d40cb2bb616e30c112c857c5a91896d07f5 SHA512 f399519716f95d0282da7dd2617e13841a7c12dbf8b440183839a0999b2fb9ede5fb5b6f4526e8539e432494e3aa29b7ccde992b0874c1ed0b2af2d030197457
 DIST Flask-2.3.1.tar.gz 686211 BLAKE2B 83998bccde3c3b0abc413c27e4db7589ebbd82cad025ca2926e977bb267248164d529f9bd7b04483070a05fde3c6ce90ed2014ab510c689da0210d3c32af9364 SHA512 371d85a9af74484d7d77dab1747f9d331e797fa2bfeb3f2c72aa679091852efa505c56f37c197d7cb2f02a77a6e88ec2f1ee8efe35fc65d2c23afe5b24d6f4db
 DIST Flask-2.3.2.tar.gz 686251 BLAKE2B d81553b100e88ab79218422d6d39bb8b186f436c3729985504d1f54536b5e0f783509dcfbf0791890e7c03928131ddd4b8894db51f27e4075c50248ebd7846a2 SHA512 7917c3658a1dec77decad2dbc067a1ae602a66007573f1ff26527c214dede2c455ca5e6490159922fac967ceea99bd880cf929d05e21ed49b08abf501d96e8f8
-EBUILD flask-2.2.3.ebuild 1440 BLAKE2B eedf7942b3a18204776dc5f15e56539c7bf27be88c64d894c2ea03f236e4eeab07d2749310d82d486ac0e0869954159c788e4a1c612b658fd76a6e9bbb44f85e SHA512 d6e318e383879456cc0cd6cbda516633d4c0c3852338d9d44e785cbb37fe804bb7be1489923c2a42f09d12f2f69b2541381a6126bb63f35caaa3628f267641b1
-EBUILD flask-2.2.5.ebuild 1448 BLAKE2B fa43b62224e38883dac73b012686f9ce9c6dc150afc55b841564a55e12860c5cf10ec26c17bfb45413412e214c6eb0c4372c8e48393cdd4c4309e22e1b69e752 SHA512 f7e798a9be4195abd547ff699370f9468958dd22b79314f87fd8f0c2a6b3dc3213f7bbbb04adfd92b70503122c2915221332e1bafc9c8e3f74bf417e9b62f081
-EBUILD flask-2.3.1.ebuild 1460 BLAKE2B 124110edb36358ce089191d7e08ad8d177bf6859bc5eb3665cc344bdb221fd098ccfecd290f972a566fd438817265ce85180c55803082233e137ba35a2b3137f SHA512 2d2d14807ace795acfca977004fe684f02ce859a9392690a9a30fb129a9b135e44daea02654fb658135ad06105770f9c92b61615a07c874233ac133f0c65edde
-EBUILD flask-2.3.2.ebuild 1461 BLAKE2B 7caf07ed2865b1c6b8ec3de5cfadd242431521f72936221030c4ec045e889aade038a83a9b0d1b8daf8a3f9f3f5c9cee1f96ec7d0c90948b5600a04fcdd4fab6 SHA512 7ea3a8458c6c506f6a91089ecc033174f89bb12ff57d486a4e952aba74673a681d05fb29a27c5426d09c7a36cbe44f67e190deb4e5691b0535ecf500b42a1db6
+EBUILD flask-2.2.3.ebuild 1440 BLAKE2B 285d96058313bcbd179afb10da1ac9e8451e0b209262951d7d0ac6ea527bcf07fa0fb82f736ee3dfaf5e9afaef95124dbdd1ffe91bf3248640cdd28acd357b39 SHA512 1595e3c1b70e2aec21ab368d3fc4a3dd1e35912da09bfbc6efa44854eff9a2b199c7949d24246a846621016496d079b574a26e79c187c87efc4040ac0d064e4a
+EBUILD flask-2.2.5.ebuild 1448 BLAKE2B 64ea6025e49b52dd44dbda773d9d7c1ffd894a868960307c926ea1a5fe37c9c335fef59f71c37a0f23b60000bf5e53fe7b4a33488097f5893b2cbf4b9569f742 SHA512 9e13793c11bb8e82ca8124ee2b2adacfa53f29e9253a7d9c65253f0cdefcbba85be8a409b9c35a43c5005c2fb2dce22d6ef1dba67106d7c829b80b7111aaa1eb
+EBUILD flask-2.3.1.ebuild 1460 BLAKE2B 108dd7d59d54718cc61ca297bc042f45408a04ec4ef6769ccb8118f060a878986db818c89aa1b950dfec7b3a8cffa924866d671bcf9fa6bf5638126ac269bfef SHA512 9b1b67c4d15eba496a79a676178a18bb7bf5b3141c2133867ce05cd5470958a877764c1d61f33dff89fbae72c61e301e1ee2ca3c4de7530390504805cb8023c2
+EBUILD flask-2.3.2.ebuild 1461 BLAKE2B 19110a36be49adda2b9806dec63e6981bace1e0018b50d14c1c661677bb6d116b136c6f63c4e3a3bf3d28541d726248b522089839a9b756368e6dc60656e7573 SHA512 992742f028d6f6e2c50cee2dd14dc9385ca48a3c523ab508bfd78f9c3b0bfad9afa2fa2a702aa33284dc1c3a53d98a331fbff46b0a6d5266c73827cb8e484b1a
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.2.3.ebuild b/dev-python/flask/flask-2.2.3.ebuild
index c478dd8ddc0f..50981fdaf46e 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 29e71c327a7c..a5d6cd13fc07 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 f251178bc028..1a83e9280c39 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 1376fb6b9ea5..afba0e94f96e 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/Manifest b/dev-python/fuzzywuzzy/Manifest
index 7213bb3cc702..751a70a978d2 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,4 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 526 BLAKE2B bb782a0adfe298a692dc38208f9f2ce7dd8685f1646b0180f7ff700877b8805ca831eb922670d8627a8d862bca4e42a2732ec664f92c559beeaf46d6d8aa29f6 SHA512 2764504221e5253d4aa139a8bce3b22e9216b63a7716bc677007beaf2469d91cedac295bb3a379f7404e99e8dc9255823a30a2102060fcc267a3f416e9b624cb
+EBUILD fuzzywuzzy-0.18.0-r1.ebuild 678 BLAKE2B 419fb3424b0da91b3eea10416a25fe1a98671572059c7b64e181866d27ae413c72a646046a66aa476e0711dd19c502480c1561d0ad80bd2c91bea25c00c78496 SHA512 297ef3633f533e96f4b7cfac77b629bfad842b283c691a07492337b57a25e249da9bbc45abf7e0108a717b819f2fd16a14d83515bb5e9f3a2e70fb19e5ad6471
+EBUILD fuzzywuzzy-0.18.0.ebuild 520 BLAKE2B 70fae28f3e15d27aab48f0e6e6e404de6bc0b9e57fb74747b3bfd0fc4aeafdbd43ccab37d080027e0e8cb094b1e012481cb4a1daca9c0e0f9424db482777d47b SHA512 c399bb29b4e3367aba94e02fabff73ecdbe6b54668680405bbf78375fbe8794144d7244f54b2d8c1245d8ae1d16bfd7f3d28ff8e85ad6e6b4429823cb193cd87
 MISC metadata.xml 397 BLAKE2B 7d156fc2db4d42258707bbdd93f09ee48ad139d237413b3ef80e4618f614c1e1da4e4a60bfde43976e9cd8fb06bb38f15db086571b93f8eb0cd7c9e4a2d932a4 SHA512 fee9f0884d1a8b2d66e799d5f58402951be0d99c0660e4d378f31dc76fc7384f73d6600dea1270882ce23d35cb45248f123f2ecd91eaba04a63bfa0cf73c0127
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 3b415a460edc..eb36fa333825 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 464b1fe3c916..daeb5c725dd2 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD gsd-2.8.0.ebuild 759 BLAKE2B f825dc2059ec969c4454b686b7a8a6d450c75cf2d2d478881018c5b94ffa78ad17e3fb0f81470e967bec6f6a188007805ba4f06f01a2c2cb79bae6b5b795370c SHA512 677fe27fd5b57104efc8af001f22444bdec4ca7b1f54229707632bcb43e1288adb669f6304019fb84caf444f7b93752565f33c7fc7bb04c913f448e93417bf89
 EBUILD gsd-2.8.1.ebuild 775 BLAKE2B 2c3a1ead4c629c6fbb0036b02419f97eebc152977a90c062e58118c5fc7d42f3ee8857be6e75394a299c0154e5da3541b068f2ee3e2331a45aa21adffc98608b SHA512 4c6ba8abec9652c0f09718169be1afe80ee5cde6f99537b68c94c5b049abbdbbf8bd352d02484f6b117050ef1725d0f81c0697ce05b3e54dd6fbbfe6e8739c7f
+EBUILD gsd-2.9.0.ebuild 776 BLAKE2B 14c170e8c1a1759e97ff6068cb205765f69bf07654aa29e2a015dc3dbd53198c617e7897037603b5281c5d6478fc8eaf675cac0eca4e5913cd99fcde0ec93393 SHA512 4260afed08960051c10b02ecaae60610b6adbc07610b7336add379a9bdef131d19ac0b546ecbffd619e157824452605f91f9eccc36e2354e0f63e91f6e110aee
 MISC metadata.xml 470 BLAKE2B eaa8e5381c07e9d74d0df82cc0d3724493f0e0acce922837677d7fe6434ccd868cee2f85fa6e48cd2b01844247120c8ccec516b78279f770d3b90568e70e6f02 SHA512 2a1b071f15d642d7e0f1c71500c349cee330f65fa1c0841ff21e0b84227eb68e1ddd244b08c352cc7ba8a8f9910cdfc365cda943838f533bf70bbbb8d0945c47
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 234cec16c03b..7b47e68a3c28 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter-console/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_console-6.6.3.tar.gz 34363 BLAKE2B fd5875f608bec0528f7751b7cb146bff3f5c6caeb531a360eb5dd6164c44b3a4a84d1371756f42c256fbada7572176172894a01bc5b7cca835f12a390815ff5a SHA512 fc896dfc783648127690458712e90eced9578629dd55e3bfc9e15319ffa919c118c78d7872f0274455c3996fa9321bccdfa204b94b45a2de733b7703894c9034
-EBUILD jupyter_console-6.6.3.ebuild 972 BLAKE2B 513d13941d3a6da9f332d6033b43c8dac4d17a99eb05e3b6799b9f9a23497f0ba05263eececc94cd5f350cd6a1fbc734f9443e2aea088d6cddbf6858bdf36401 SHA512 3a31c21cfc68147d30aa7c46c401157afd353b17bbe281e787cae933f773c29b171087ccba2372bde5c82b72f96344c3350c1489c2c3568816027f6607fad751
+EBUILD jupyter-console-6.6.3.ebuild 972 BLAKE2B 513d13941d3a6da9f332d6033b43c8dac4d17a99eb05e3b6799b9f9a23497f0ba05263eececc94cd5f350cd6a1fbc734f9443e2aea088d6cddbf6858bdf36401 SHA512 3a31c21cfc68147d30aa7c46c401157afd353b17bbe281e787cae933f773c29b171087ccba2372bde5c82b72f96344c3350c1489c2c3568816027f6607fad751
 MISC metadata.xml 702 BLAKE2B 38bb264e2ab7f1feca67ae6a35d2ee20c04b53188cc7d3a51bd2d1630ba6a9e89ac949013bbd9ac3443331bcf3f115f85537865787daee26949b9773aa9b9197 SHA512 c3f9fb275560a3aef2a5266d2070e3d013f53e2f3f7e1363626b15d290ccd619c65a19d6ee2b849a683a96159c8af29c55c81eff5a333759eae5cd6773736b24
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 8709fe346234..8709fe346234 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 0d62052f276f..0d62052f276f 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 478aa8bc15bd..b635c08b3afe 100644
--- a/dev-python/jupyter_events/Manifest
+++ b/dev-python/jupyter-events/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_events-0.5.0.tar.gz 55838 BLAKE2B a3ac815a28d2592a10394569726b76de75cb3baab0bab4c1f276da33375ba93d6bfed71fbfaca404a238b7af58ebd7e75dd7fdf6c8717141517c2f790eeb9514 SHA512 49c21f0d5dce18b137f73911b0272919a56c972561deceb228558ea369f2091ce219ac335eec002b22ca1465b2622330fb3d8973d142df4b76e350345cb6249a
 DIST jupyter_events-0.6.3.tar.gz 59393 BLAKE2B 0f747cc099e8b0e30024b7fa61007d4449fad1be3b4807021df28668969dca18087634606d6f2c453da81da9c107576133e13ec373cf34362d0182320e84e809 SHA512 a9b9c180f7b4759a3d2c99421947a837020149ec1a91ad0cd06971d7ae99ad1050652f01f78c9478ce3fd3f1a1ab6b579e90c279fcee0771546f3c346becd61f
-EBUILD jupyter_events-0.5.0.ebuild 1019 BLAKE2B 31be848e26b53dae919dbdb4e7ac5e2d28b42f35b30530f09f187ccf63eb1348ee96898f21a03c05d7f8e3ba92f50e3e38cc0580e4b659d08ac151d92e328595 SHA512 e45695af80ea00b0c152231cfbb186eb37e9eed18541cbfccf93aa543f06646d99a19ae7fc9ee8e8b630773dbfb1867f7f792cdf558368eb99e63464aada79c0
-EBUILD jupyter_events-0.6.3.ebuild 1041 BLAKE2B 01d844fddbde946ac9f33163379dbd843f5193ecc3196a2ec18b99a5cb3c29fd91e7295ad4cb6c08877a032d0c6534e685731d2ee65fa79cb665c27b4dc23096 SHA512 440795c72fb2e1bf9a5e2412d06b2f1ed3c03187e599b7d9aff7f6bfd1ef3e653d10faf6e910020506665beb8d03fb0f85493e2d0da61cb5c0269744c805c8cf
+EBUILD jupyter-events-0.5.0.ebuild 1019 BLAKE2B 31be848e26b53dae919dbdb4e7ac5e2d28b42f35b30530f09f187ccf63eb1348ee96898f21a03c05d7f8e3ba92f50e3e38cc0580e4b659d08ac151d92e328595 SHA512 e45695af80ea00b0c152231cfbb186eb37e9eed18541cbfccf93aa543f06646d99a19ae7fc9ee8e8b630773dbfb1867f7f792cdf558368eb99e63464aada79c0
+EBUILD jupyter-events-0.6.3.ebuild 1041 BLAKE2B 01d844fddbde946ac9f33163379dbd843f5193ecc3196a2ec18b99a5cb3c29fd91e7295ad4cb6c08877a032d0c6534e685731d2ee65fa79cb665c27b4dc23096 SHA512 440795c72fb2e1bf9a5e2412d06b2f1ed3c03187e599b7d9aff7f6bfd1ef3e653d10faf6e910020506665beb8d03fb0f85493e2d0da61cb5c0269744c805c8cf
 MISC metadata.xml 537 BLAKE2B dfe33b67ac51a46c9ad33d4b0e02ff39d5aa1780d70f92f12b7ee8ac336c43caa79201bebd42c461373bfdc7608580487ec000613cf92765fec352b70a8aec13 SHA512 689e8a1125b4da96db6d6c4495933ee29d24666ad9e7e3af891170f8da512ac388c005836402c74418476cb9838f278c19f5267840533cef0e02091d47fa43ea
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 aa7f35f09849..aa7f35f09849 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 01ada11cc180..01ada11cc180 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 0b3c9998d541..0b3c9998d541 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 577485536cfa..842027615a7f 100644
--- a/dev-python/jupyter_kernel_test/Manifest
+++ b/dev-python/jupyter-kernel-test/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_kernel_test-0.5.0.tar.gz 15022 BLAKE2B ec02d8a4a1271b2aa6a9c04820c54abe312f7dddef62d5284b858ad5d63ff8b6af12714cc93a252b2594dec713f78d70d0433bac26e34055c4bf41c33f708c17 SHA512 9b440e170a70fb1f505a6cbda1642c68e9d4462dac7fbf7f103c6ef6fcd4adc5152b2cdf7538a78a6fbc02c504108d766ae8edab6d7dce421ae92648d2142b94
-EBUILD jupyter_kernel_test-0.5.0.ebuild 608 BLAKE2B 10c625f1559b2ab3f966848bb3e4b7271a028dbc32237d3197c9fcf5b7f499b6ec2f44f2b86084d69492592d00576acf96d66c408d8d9d400473874ef450879b SHA512 edf465654b20e25758f74a184a89a111c8f28216875b91c015a0756b624dd0ef355771a4bcd1b118c161cc74c00eac525ed2a1b3f5cd62ce9aaad5862929e5c0
+EBUILD jupyter-kernel-test-0.5.0.ebuild 608 BLAKE2B 10c625f1559b2ab3f966848bb3e4b7271a028dbc32237d3197c9fcf5b7f499b6ec2f44f2b86084d69492592d00576acf96d66c408d8d9d400473874ef450879b SHA512 edf465654b20e25758f74a184a89a111c8f28216875b91c015a0756b624dd0ef355771a4bcd1b118c161cc74c00eac525ed2a1b3f5cd62ce9aaad5862929e5c0
 MISC metadata.xml 440 BLAKE2B a4b9e3325411a76f939b73cbff422b92265de8388ad53441421d93c26a8b7341694e4540f43a91aeec6e13af8a746f6f78b3b76cf7e6b4d253958f1573443e16 SHA512 71036118a1fb347f7d8733ed631a223655e58aa8fd0c0e527b4802b10eac8ce32fa1e30f1736803bd4b2a69fd0973546c4bc56a551c9b4b29e379db72bb7bb07
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 18b2bd3aa6c8..18b2bd3aa6c8 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 3161458dcfb4..3161458dcfb4 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 a8598e5e1978..6257dcb446ae 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter-packaging/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_packaging-0.12.3.tar.gz 25350 BLAKE2B 62c9f35a3008f8252f8ae8a55b2f7156fc98347b48dbe9bf08101b9c9b0cc892886cf248e0d916455f472bd5130dacccbfb9e206818c5f096eb759bb6149f758 SHA512 a81a4b41ba7b31b9d71aa338617ed8567100a64d999e6cd0a14586350bcd37bf9782cbaabad755c0303510bd342ec141af01157cbdc1e4373289700dfc40c3c9
-EBUILD jupyter_packaging-0.12.3.ebuild 997 BLAKE2B 12f0363e393e1f4091931112a9f144ed0a3fa20d0c311ed38e75ee25704df817aa793c77a596c433fd2f9351d673e9dea66b50386bf2fa232bc12312d517bb00 SHA512 40f0977ee9bb52f40ee612b9c2ee24e5e982aeedc7cb3873c7a8cb39e136ffe79a800562128bea327dddbd031f5cc596f5103ad388788c61f1c712bd0ad4f6d8
+EBUILD jupyter-packaging-0.12.3.ebuild 997 BLAKE2B 12f0363e393e1f4091931112a9f144ed0a3fa20d0c311ed38e75ee25704df817aa793c77a596c433fd2f9351d673e9dea66b50386bf2fa232bc12312d517bb00 SHA512 40f0977ee9bb52f40ee612b9c2ee24e5e982aeedc7cb3873c7a8cb39e136ffe79a800562128bea327dddbd031f5cc596f5103ad388788c61f1c712bd0ad4f6d8
 MISC metadata.xml 543 BLAKE2B f22c42fcc55d0a26966abd01c5e4fe480edff112a2e34ecf0214a2f1b50c120f937a6d377a544136e1cd55e89216efc0a9788ed6aeef8403e4e30a15d9d9af12 SHA512 3243614660159c0c7afed90cc084e4c0c7d85d71628f437ee1ecfa84c9a080f27cff92c5a40a134e579e03b93a1777232add591c7f36262d5bb3e7ec83b6441d
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 d9c5608e9239..d9c5608e9239 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 0160fed9fded..0160fed9fded 100644
--- a/dev-python/jupyter_packaging/metadata.xml
+++ b/dev-python/jupyter-packaging/metadata.xml
diff --git a/dev-python/jupyter-server-fileid/Manifest b/dev-python/jupyter-server-fileid/Manifest
index 73e759486aba..eb766c09138b 100644
--- a/dev-python/jupyter-server-fileid/Manifest
+++ b/dev-python/jupyter-server-fileid/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_server_fileid-0.8.0.tar.gz 51420 BLAKE2B 0f927734c45d36f67f61b0f7f32f3e5b42b0d9b9107cc8dc762f6d7e34014c976a5036058170bfb2d95188f0d3994524e3198a721f3cec75eff3b1e031c2a133 SHA512 780c4aaedbf979630792c04fdae1d79f6aab6b11e9cacf06003d4801c64701d64e0417d90a64c544f0dd05461032605812ffabb183396a2bdb8fc6563efff796
 DIST jupyter_server_fileid-0.9.0.tar.gz 52294 BLAKE2B fcaa279b0bbc9a2d4e7303dbb6cc6b72321c774132f346c9388552b55a713f553409b98970a80b9c966527b03f1430a45b7b5f838115140bac6b8a55c3433616 SHA512 eaac93995e52e2187cfc72cd7d3eb625e5b83f21095412b6eb466834561c6bff17ef34e994c4c3e743c07baa171a99a96dea66c653643df1f72a68bb3f3bf0d3
-EBUILD jupyter-server-fileid-0.8.0.ebuild 798 BLAKE2B 0de5b1a9098127e3689dbcf0c02f376177805e61c941ba121e6990ca8bccfdca5cf8a8b1c91c05c1dc79d807dc317a893c0fcc68f6eb1044278858f4382293bb SHA512 b748898b3bfc83153dabca1b88b838aaea663234b20e0a2d0e929a48ad1b5190f8fd92e103826ffc5235c079dc8735ada087ee2cab32cbbd913a1ceaedb71e8f
-EBUILD jupyter-server-fileid-0.9.0.ebuild 1027 BLAKE2B 83f6b8091aba7211a2e37d55f622a5212fd00ab02870a2443dcd8f500912ead3d1c6fae83a0c5d536cbb4db486af39a2b056993e7c7a94adac77b5f947f17132 SHA512 8fac88c27492723756195a1a374f88033d6dc5c626cf346e0c448152e314d13f3a5d3530e8924a151bc219baac5d8f70c86fc718ca65d640c31c3d310ea2857a
+EBUILD jupyter-server-fileid-0.8.0.ebuild 798 BLAKE2B 56e24e942e19d2501972272ab2526227228557ce4a97b8a76f650297d7887b5c8bd3ffeba2bb712e4165262b273786d761c45d02ffb039322cfa46c99974ae0c SHA512 bbfc773fae02808f4aee9e2f54ba960a29981d4a8391ffac823f9685e9413dbf583113f1282bb2d7ef2d0f7866923635072ae257162f690361c5f1bf1e9a0bec
+EBUILD jupyter-server-fileid-0.9.0.ebuild 1027 BLAKE2B 95624d5d846d234fbcf56af7e28a484f09bf5343f470916aa43ef2e9284b3a25af885bfba0a88c8fa7dfc850800c1bf43d48eafdfe40ba1e9f397e1107bab070 SHA512 222693e5e75104c086530fe1c7cb0bb69ce31e978279ab98f3345cbf1bd4e6bcb21a893dbf76abf7d8575dbd85b094fdacbb840f1bab98c2f3dcfc390cf969b5
 MISC metadata.xml 451 BLAKE2B 501da442ec086270995b029cd90bb3bcdecfe6a0dc7ba0f60d6cf505930d34a56da918e593702bd8597b8ea14f91fb5c23f18a2cf0a6987d8320bfd1391be763 SHA512 379e0af3faff9baa29d49cb8069d87b7024695aa3c6bb4c8f7f063b8046ad806ff775a3deb0d31ba910f57240403f6881f703f2935bb2c63c23d2275d7179208
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 899904151a5f..75eb11b45b1b 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 e3706fab61be..a3ce21ee9149 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 bc49e0a60125..c8339cba2cc2 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter-server-mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1079 BLAKE2B afe412755a290372f749590b8c04f3d56563b2dda398d14b270f35a0e6254c702be384f906784d18325e65ae282cf81d42d756c611c26110486535309513690b SHA512 02162cb906dc4b6f0dadf445340c15df01987644db2ff842adb48245f384112a38bfa245f6d3f7c3c922bb147978ade89b87fc76ea4b74b2d6250a23a5453803
+EBUILD jupyter-server-mathjax-0.2.6.ebuild 1079 BLAKE2B 78c21d681366a5fa90c72eff2edce64edc1c47aa64fc7a47c9e2798bbb1a080ac72afb27ad0d118fee76f966abf05e98c18eb831c2ca16e40e4a57ff2547b8a8 SHA512 62e9eeef1c5bba84817a770b2258b53e7c95323cc918e128433be33dec8a21cf0916452f9a7696cb124aa324d859e6a7b2a5e3463126492e33d8ca04c78d467d
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
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 7ffb38f69a96..a382f9ed85e7 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 7d03f215e7e4..7d03f215e7e4 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/Manifest b/dev-python/jupyter-server-proxy/Manifest
index 3516adc8ff18..e6eb9386f1f2 100644
--- a/dev-python/jupyter-server-proxy/Manifest
+++ b/dev-python/jupyter-server-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter-server-proxy-3.2.2.tar.gz 121353 BLAKE2B 4f7c8af14a149f13272ea2802e830b38a5167f1de80dab21e1d175cb96ba3b908bd268f6dbb02cfd4fb8991ffb3315c044405925358904f82b26d55f74f97dbe SHA512 320765a8a8b1c6f213bd9c8cf514aac44f40ce93fb27fa890d8c6a9ae158f92f1b3a7119b47067db1c4f38925815f647559b3c618a9a85553cdbf7d2dc0a3872
-EBUILD jupyter-server-proxy-3.2.2.ebuild 776 BLAKE2B e91b4206095e6f0b049c447c541e9daf2b4eeb1c3e4c126932f759f2da634294ab2a9574fd94cd273c231ddd123ec53cf860ab9d34da521f0d6c659dbc3f54a0 SHA512 5efd7646fe5a6ee5f24793095cb824ae6dc2376517d6cad17fd9fbe168a0552aea156566d8483b97172f5a90baeadb80ab2cb8f2867a6eb3a427e278e7099dda
+EBUILD jupyter-server-proxy-3.2.2.ebuild 776 BLAKE2B cb5a38a877d08064382bd95a2169ec181b7ab61e0f0679424ce1dd2757dc8f828b045e2e239d031cdd58cd5816bbf641a835b4f913fb087ab0b5cc5da4df6541 SHA512 5a45cdec792c3d8cd7dc1cef6d65fab44bf97bf7e33aac538ecd76e25ed958db2ddad387b3a27c93aff565c4393e6e8457385f95dd78385fe065560a0f071910
 MISC metadata.xml 432 BLAKE2B 971dba91e8277c9ac0d7a9ca3c42d8c550bb072442021c9e0a9d8ff7cdb8f5f61cecf995a249451a9c95ccc5ee53108c2093de1fb6f5021a79238b35caf4b15d SHA512 3989d322d8b9165a6e2463c970176b71eb6c924b9baa489019ee84ba4826f5d522ba715947da72d3dfa7cf19b3124c550acb26f53d5e00f9473aacd8d8b4fdc8
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 4233b55b9539..c03065003ca2 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/Manifest b/dev-python/jupyter-server-ydoc/Manifest
index 5e94c537395d..741979a19ef8 100644
--- a/dev-python/jupyter-server-ydoc/Manifest
+++ b/dev-python/jupyter-server-ydoc/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_ydoc-0.8.0.tar.gz 25769 BLAKE2B 72f9082b4c459474910e795ab94da0482f073923f89610a1ecea2663ecc94adec3979bd353bba45388a31ca1bf5918e061a7b660f37cefa34a4e09217c2e9443 SHA512 a09b099257943e30187c9b66d53a922b4b197f62af648d7177abca2c60f0538f4ef8a6dc330b2019f79848b0c8bd93645b8cf9eb657334282f4317cee93ab571
-EBUILD jupyter-server-ydoc-0.8.0.ebuild 900 BLAKE2B c4d1e5a64c3ce091f63523862402b1483c1dad6b04c5db55cb46f79be87b0eca7fbf9fc1713cd5152bc7acbdbd3343669037a9f94e048e13f81729d526f3e33c SHA512 e31f3a651218a735bd2aa990334ef75653a6bff526b172c532a66c303217856457c95ade18d8f1658611783cf9e82b34e34a9acc1905944cf0e35e4b2734eefb
+EBUILD jupyter-server-ydoc-0.8.0.ebuild 900 BLAKE2B 9ab0cfd8125271eeb93594256e0567e4920ee3ffde7a1d8fa02f83b03e3d836afc396491987fdf34a37a87e44cb1ba64d49a42d6213ec5fa58647d3840aaba05 SHA512 be5bff0819c89599464fee3eeb944e3001b331c8ef2aaf5b46ddb84734845527a89db55f1ec83aea812070752d98ae3072b08a41ebe65b2accf58eaf3fb64ffa
 MISC metadata.xml 447 BLAKE2B 66cfd1d1a59608e62bc7837cf0dbe48ca5a1e192f76db8e315b15e1cdea7b71d10dd8ae85181b1264e5f18bc5e58287c750009a7fa28de66ff2a748439459a6e SHA512 f558b5729e381952bbe9ef983221be36a9bfc79667921f63df978e6a3d65b57810e2cdddfc193ea6c789515b803ddd366bd56d70cee42c2b191b1cac85ca6cb5
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 42bfc2e7061f..f46dfaf11d98 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/Manifest b/dev-python/jupyter-server/Manifest
index 2399ff90ad22..cba0312b38b0 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,4 +1,4 @@
 AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
 DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
-EBUILD jupyter-server-2.5.0.ebuild 2174 BLAKE2B 0484e37ad5a7cc22015c3c541d0227103cfd5d71cc4a8cd4478edb92e3689a63079b034d7fc5aad693b0f4b0765111340c2deb2a4a96788881a466e974aa86c2 SHA512 2288447da7696c858c462005690c1631a8979d56663f5d87c52736574a01487765f6630ce8c18df2378d5e8d210f110a8f919d4fd10413c756d6edd0308bb1a6
+EBUILD jupyter-server-2.5.0.ebuild 2174 BLAKE2B 37e779787c9ef5ef9f502704272071f3f850d105c0be55a4acab1d96beff831764935118dddf63be6749755f6960d5010deb87297ff3ca972a21191b685e7a59 SHA512 7112d90c675357408ae451a4632201a644fb9b037a179bcdb7f316375d711c609c7522b5d3c131c5a18c96cc58d6f4bfcac61aeefe123ba445fbb0ad1c028944
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
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 30abc93f4dc3..4dd97b7b6f98 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 b6f925ae5bf2..d5659c6816c5 100644
--- a/dev-python/jupyter_ydoc/Manifest
+++ b/dev-python/jupyter-ydoc/Manifest
@@ -1,4 +1,4 @@
-AUX jupyter_ydoc-1.0.0-no-node-for-version.patch 846 BLAKE2B 11112ffe502a4fa87abb4955f082ab6beef545a4327bb449586f1b837c78cce2cc863e7b40d71690920da6bf1346c8aa84e462cc9f16c7b51fc6a539ccea5dac SHA512 e9d82e27ce628a1e96fade29429c2532637c89cc6ad1ce307d74f493096ab003f5a9ea35247976ff6f7da8af566ef69c4cd82cec3ebd8a2a6bb72d67148b53d7
+AUX jupyter-ydoc-1.0.0-no-node-for-version.patch 846 BLAKE2B 11112ffe502a4fa87abb4955f082ab6beef545a4327bb449586f1b837c78cce2cc863e7b40d71690920da6bf1346c8aa84e462cc9f16c7b51fc6a539ccea5dac SHA512 e9d82e27ce628a1e96fade29429c2532637c89cc6ad1ce307d74f493096ab003f5a9ea35247976ff6f7da8af566ef69c4cd82cec3ebd8a2a6bb72d67148b53d7
 DIST jupyter_ydoc-1.0.0.gh.tar.gz 985632 BLAKE2B 6e4456d3eb96f40e4703d7a1413d62d82497ff46fa15c3e0c6a9dd6544cdbddf5cb5b24d87e135170af643bc45b6b88a0a5f5a3fd03986d85f8428b5f12c4b85 SHA512 7cf8f37fb28ce1b0cf02e5e2db642e6fd5debbf5cb6a119b5291ea2930b177d5f17d7236e105891e828e2c0a4ced3c06cb4e78a1b6c2c318e2674fa5da2a8b8b
-EBUILD jupyter_ydoc-1.0.0.ebuild 1140 BLAKE2B 230664913c65c2147662820443c8b709e9e598121f6370c00dc6f4e34df39ba437d6431854d7fee0c890800fbb087ed2bdacf500486f8ca0a2db6cee7e9b3269 SHA512 8fa5ea3c07e952ed73ba0946b10cfdd5e7d83c8f4871683bdfd0407f00b53da0f3293ba5fababa4aefc16c53f85c640829d56b40db2576622152bed217441eed
+EBUILD jupyter-ydoc-1.0.0.ebuild 1187 BLAKE2B 1fdda133c2390b85886ebfb7cf205b07a520a20f60ecd742c084eac7c19acb0045d7021afb3114559443c0daf8c3be41461b5104511792a5ccdab210da3d36df SHA512 c6498682fbd2269be7be7ceea2e4c889383297aaaf3d88944e53d5758492c4f4e65958d0adf7f008b6d102f4b5542e368904e645f5dc2d31bcb0cae5f66f2f49
 MISC metadata.xml 433 BLAKE2B cf2579c7d85eefe97d8ec81f37ac5e10deee9aaf52b16cea8ce3649f6076a3afee9e7ce6efbf82cd7713421353b53c16ed4d28b03a9b6e8b5c029fc6f3615651 SHA512 1258a3f0bd2a959055312594eb72bcd06fd639cf777543b41919da60b4082d241ad87231bdfb8c2ef057c85657875ac596b732301d3fb0c9a10cea5d2746234f
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 bd7d147fe489..bd7415f0813d 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_{9..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 a7e33c55e1cf..a7e33c55e1cf 100644
--- a/dev-python/jupyter_ydoc/metadata.xml
+++ b/dev-python/jupyter-ydoc/metadata.xml
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 46b6861612af..96a881090342 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,4 +1,4 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r4.ebuild 917 BLAKE2B 06fbff6a3d6b22ca70bc0c528cd0c51ab592f15553d43dd449d39587dc787a93226b8f34565db703da64666360721cd51a0053e8ce923368fc95f6e5324dc515 SHA512 36cc3795fe32dc5a872781d91ba13357e65a96da3034c1e95c093ab771d8b17b175f61084308089b7ac4f162fce144376dde6109ba6b62df51b6e21ddffe7228
+EBUILD jupyter-1.0.0-r4.ebuild 917 BLAKE2B 10288bdf5afdb32aa6c2ddc843bf831602e802f6046186d49dd99b959bf629ea3483bc31be8bc8b73b1fae1f7cc272de50e526ec6e745b9b210a8f8535a104d7 SHA512 24a985647d1fb318f223001f812a16b026462d8ea7232e782f604c0db4017dbe6b71730b1794e808dd0cfc92df5dbea02c37182cf4ff12a79e27058880d844b5
 MISC metadata.xml 391 BLAKE2B af2c9f38e30fca600dbd7c482a5d3c10e11463e5359e59630126d2848dc776bff78c79deeba97e1d8a4074f5aa597acc1b29a1bf5007e213657a4e428d07e36d SHA512 090a9c06ac5e0a451769e99a92db93cc6880cfe76bc485d09c60f2f6870723c4c91f898ac6d28a1c9691b7e9a0e98568368ec3b7ecf2e51decef7728fd79d40d
diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
index d0c5d7eb87aa..fae98b2826d0 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 b91353df8bdf..1ac63bdbdfac 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab-pygments/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_pygments-0.2.2.tar.gz 132378 BLAKE2B a9db4c3bfea9e8e6f357c90e9b1861cf2bcb796fe5d7ea9a0f02677773b18dd5a02966d8555cd17e8314b283056ac9423948077d6cdc127985f34a5faf892ec1 SHA512 59d328522b11ecae6ae67ef8f9eb7168b0e4241cc6a68765096bf0ad26a20489f302179d50e7e46efd5b9de711520e2c67ab1e634cc583416277a98a5f663daa
-EBUILD jupyterlab_pygments-0.2.2.ebuild 538 BLAKE2B 5d2aff66535a2247cb3b2d3d2ec951f140a5efd21cfb827fd0972fde3bc464d789f3d9842aa57a12832d13d35e81fac5b2e346d3265d5a28af61c906b554454c SHA512 e2250399327bb6044890f817ae0bd69c5f026028757d91d51e802413929c63df2b14a1c8ae84bbc0edbbabfc279b5abbdcc62854c74c0df141187830a1515791
+EBUILD jupyterlab-pygments-0.2.2.ebuild 538 BLAKE2B 5d2aff66535a2247cb3b2d3d2ec951f140a5efd21cfb827fd0972fde3bc464d789f3d9842aa57a12832d13d35e81fac5b2e346d3265d5a28af61c906b554454c SHA512 e2250399327bb6044890f817ae0bd69c5f026028757d91d51e802413929c63df2b14a1c8ae84bbc0edbbabfc279b5abbdcc62854c74c0df141187830a1515791
 MISC metadata.xml 395 BLAKE2B 61c5b49ef1984252b5be03231c068df3c46d4326368f3d5166d416e20fc29e6fe8356d6e6f3767f61a05154d42f86407ebab060ebf01a742fd082e62d65469b0 SHA512 9eac2fc382341fec3e344fdfc8365e022b9890739419e8f63bdee313293acc18fe75e40234c26b649396f1e164c32e1a7cd43ea26216c24b610bf495db0c5318
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 b6b3444a36a0..b6b3444a36a0 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 6e6dcc6948ee..6e6dcc6948ee 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 582f4f95e62c..cdb468f5aebb 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,7 +1,5 @@
-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
-EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B 9d56d8393c51ac23d5564e935b0621e7afeffbcc510abf0cab42f971531ec4fe8a0afdb5e3d46839cb579b2e956f905d672e430570a39cf8b3f93c856921f735 SHA512 e8da2a35344d04bc458d628dac61584812fd25cec8da4915511d8014fac086443783f62c685a020bc573e086ee255521f0de6cea6bac011ab15e7280516c9acf
-EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 12af870b41a8c4e7021ccefddbb659c12e60baf85cb9af3ae640998a97c0edafaccc8fb957aa3875ce8df69bd36cc18370e7e30213588c884c5c5a9686550357 SHA512 bfd6127202e73a99c1f3e764e1674e04d5cd4fc91ab2d0d287d4c99b8521712bb56f868ffb3851d43dad3ac1befef9dbb09952ab6ff954af085ec77792dc3b30
+EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 9cfdab0afb8feff32c1eb0d4f1e641860ff59e72080448805cfc11cfe3a565a7c8fc18b4013f5b78ff83304b21df03ad939d81eac8d9afbbf2bd59ab75f778b2 SHA512 a5ff778dee692241083a51d970ce5025db0976b6abc4c14e15fe39b48427a5a27aee5f91bc6989b3a109ae11590d89e66f15b3dd573cc79caf90118d022ec71c
 EBUILD jupyterlab-4.0.0.ebuild 2566 BLAKE2B fae16c460f77211214d52ec0d1aa6fc681f8aaf2fb75c5bcea1daeb8688047a0cafdc4831f441a1b3337e1d2e821ed96383378e6e39d29125a16b18582f9ebe5 SHA512 f32cc330a126317a963b4b1391881f9ba1d7ae4154291b931fc4cfd22ff9dc5acdf2063c28e80018b88fe534df53b8ed2f674cf6fcb258c351ef2fb0b4cd9d42
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
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 8f983a0b58e4..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_{9..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 8b5eec54bcc8..a1e3d119fb29 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/Manifest b/dev-python/markdown/Manifest
index 0fa06f725d01..824cd198063a 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,7 @@
 DIST Markdown-3.3.7.tar.gz 324130 BLAKE2B 4ecf804b81181a9895e15d2f54881544648939f2bb772b036aa84dc8bf57b7976c6ebdf8549041b39a303bd7c68c16df3c126463a8da19b3c92f99b420e9ffb9 SHA512 39b9f45939be9e842e90470307c3aeec88d1389439b0c7a0c5b39f6e203b51d3a52ce431c4d5c278f399552c4218fc1a619b0efc56883de50a9f300f42120f4e
 DIST Markdown-3.4.1.tar.gz 322554 BLAKE2B fd7c8b930097f9b1a52d210e22d49311579b952f758d071ac3105badcbca19f798bcb195cc35acbe6224e1f7ac916ae5fb1baa35b30464e4c243b08168007be3 SHA512 73b0006ac8aaf281a2dbc2c14534853dbb7ab26a620f3961975279feb83334b6868fa4bbcd30767189201a0c84e502dacd16783de3808393699ace0cbaab30a8
 DIST Markdown-3.4.3.tar.gz 322175 BLAKE2B 628f6808f16299f22853116da94d7918d19b6195981f591faedda6a2ad15751df2d1e209eff922ba921dc6309cf35b7b82968a0c444544b8014918c73f8bad8f SHA512 9dec3f9e13ae73c45aa23a9ddd62d8103af83357e2c4fe447f079281bf3917d1ff43d9abf1903aa146baa46249e7f83b9e5f05756862f0de068304d2290e77da
-EBUILD markdown-3.3.7.ebuild 1010 BLAKE2B 5508c73fd032296e7507ebaf5a1043b9fc42e6216f7f91e5546eae5e114a2fde922f65439f54749155e34680ad92823bd80f721e503286599d588b1ec282fc51 SHA512 1096b1055b1de4a0db96a7608a0f512e83a1abd88f6b1e3863f97e55eb494500430528b420b9bc6692b02bd35eae63516b21b9a144515aa0d504d0baca3b770b
-EBUILD markdown-3.4.1.ebuild 1037 BLAKE2B ceea4c45ad9031b38308cbc85d30bdad4dbfc5a045e8d7799f300d9ad6cc6ff5a663e7d3d26d5edb3be059ed44b85ab2e9fcc128ad085f7074951a05c7b92c47 SHA512 06c8d78bca4b6b62fb6ebb8f1c557b18c205e03f96594c0b9fe6938a5df2183cc03a2823aa77b101488b659ab95b605310941e391cb76ec0cb74a205ca848ce4
+EBUILD markdown-3.3.7.ebuild 984 BLAKE2B be80e3f9c3503acbd374e765ee71a03fce428a91e9485f435a8b489c2a1a242c34a5f0a01c9769d2c06d58db70dc9fc861caab6002199d4e2989d4373cb210a0 SHA512 663738b04f47fcf719c20e738e6c08834bb437e63d0b9c6489adb57bc59e58161fde9fc36e88d790a58fbad636c6a9e39e707f39763de001822edfd1086e6b12
+EBUILD markdown-3.4.1.ebuild 988 BLAKE2B 437960220ddb7f9c7fa9709ee207fd072956a1489b1679630b7f6a54b3013d032d4eb5adc37fb0cd3230d3a3f4112e54d13825e1c495a353057f92346bee8dd6 SHA512 0a297ecf9a5382e43a7cdbc77c79f8a57f08ef90dc4261e7122aca08d4e60a9cfc74bcc66e2d93b5866f92e1d176aca48aafe4c9fa099cd0b6f150fa297efe13
 EBUILD markdown-3.4.3.ebuild 992 BLAKE2B 652b247864f10e18ccf678e7be30c4cc63d0dbf26bf75202c82755a531061ace1177fcd7cc35751951411820a45e296e4b2bba026ece445da463ec5221d79c33 SHA512 ffdf945d2fb0fca7b283332d11e0142ef24470bf138419a1e4778941a878dfb7324640fc840e1999d7e2743bd6e9421135d8385c727cda7c6427bcf130ac0227
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-3.3.7.ebuild b/dev-python/markdown/markdown-3.3.7.ebuild
index 8eac151196e6..3492db596534 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_{9..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 f4bf4a2ca9a3..9ed85ab27aa1 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_{9..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 52c8c9c920b5..99d43c37788c 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,5 +1,3 @@
-DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
 DIST MarkupSafe-2.1.2.tar.gz 19080 BLAKE2B 560cc052c105c3d9f2690c3e5a2a597dd36848080e3c7d6f8273dcd03bdb613ed54cfe6e53b9ec8053deb38d0d055123da7204a671c1fff3295596d44a63b317 SHA512 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b
-EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B dce56f5e67ff88af65a4d8a30d915f6e8b9cdf32acb3e3799abe4ae7468d630b880ee5ce67c34793ab92e7331972d54c4cad54d3667cfa4de8fef1928120c443 SHA512 b5470fd672ec70b43a953b9744e8028bfb01c1a1e42cafa78b941b338f55866c9ae2f9acda177ce03ee4da5a9ac68f8114ad905fb49e455e651816ec73eeca1f
 EBUILD markupsafe-2.1.2.ebuild 692 BLAKE2B b41fc9c0f801910ab212db824430bd34c2ac371b17e9482c37104b87fb3ffc98377396f0378e7b46612bd52ba590a47239557509abb32c7a04cfa4b92f4711e4 SHA512 02b05d3d3e519580b09875c38a24ae9427f71866ca599468c17fa4892773aef06eda7eb0cf47647fc69671c28e2f31646728d6c1f360308264e1d60df96739fb
-MISC metadata.xml 314 BLAKE2B 88acc343a3395dcf3833ea690d3e5f7992abf67c6ab16a53cb039d253cc17302b24da6751d5706ec3c3495cef37494028de4516a7b3f25c78780d23ace4a0f72 SHA512 f240b32e7c30116769eccc16b6746e29bc28931dfff65bb3020782be3abc7791c7464a3a686ca076ccf371ef6280c2285d97e55b522d88d07babd843a51b4fa9
+MISC metadata.xml 372 BLAKE2B 3b33895aa8873e3e611625633941ea35947ceae506ae76b57c4f1d6396f91c6efc1e12a6c6bcb63aab409ea3320f34017f438af51f3bc6923cf465900f6a4600 SHA512 50d7ca17802ec57aaa22a227f49f62551a593810953b4f5b63834d93cb45fe1831f4a04928a32e88434bc26cad749564864df9f1fa6d6acfe9973e6ad8fe9d5e
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 731f52bbd4f6..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_{9..10} 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/markupsafe/metadata.xml b/dev-python/markupsafe/metadata.xml
index 8686ebe8cc28..4677d7eddd8e 100644
--- a/dev-python/markupsafe/metadata.xml
+++ b/dev-python/markupsafe/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">pallets/markupsafe</remote-id>
 		<remote-id type="pypi">MarkupSafe</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index b2ddd10a6080..e5d9fa1c7791 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,6 +4,6 @@ AUX matplotlib-3.7.1-test.patch 9910 BLAKE2B 6efcec53fa1b0001ee6121233fcf3718dce
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
 DIST matplotlib-3.7.1.tar.gz 38003777 BLAKE2B a387d23b58e09011cd3ae1f8c0ebf5dd8c04c8c15c1f6453c92cd22b2439fcabcf384f39ae8d2d2c6b7d2645817cd57a60856a4c05728e8f8aff9dd163af5083 SHA512 d7db4213d5b38eba779ba06ffaa8e67a435192e4a8cf62f8e1cd4b8079cd257b2e83cb79926df012b7084c785c0ce8b03275035f68cfcf0a36b0dda7322f2e67
-EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B 40e9e41c4c038b05bf7f9a8e02350602b70d99a87c44a51f2ae4bfb547e3d2a21449e5eb60e72f093d1b644972f56d8c112939bb62b058ce1dfb3ec600ae6bfe SHA512 429b62d5c4f05dcacf8c105098c9d52007b8d01cca83a832ac68cf56c25419181f00835f8f65eca7c76e6f51e71701dbc6971e20b735331bc1b856608ee38eab
+EBUILD matplotlib-3.5.3.ebuild 7426 BLAKE2B 40a8f6c1f9b97a4c2a8be791b64cfd619b8d4e4e519708efbc6bb00c3722898c5ed1b4dd14ef900dff120b6f18a332ae9931aaedce8970410e0b1ca20875278e SHA512 24ab261e2c1dc3e1698c0b010cafba6e325b9db73a04c35b1671741d30bb25ec7842731f4cdd8e0720378c00c498cd60115282eaed5bb42b0c459530d3d8a104
 EBUILD matplotlib-3.7.1.ebuild 7526 BLAKE2B 13efc2325e22973c4b2b74a1c4194abb9b607731d6cf9cd557f1fe03855f2d6d13674592151977d442bbe3f206a9e9e2aa997e5fb3eb00047bf2be5acc655c90 SHA512 36ebc9cdcb169d50d5eedec277c37dfc8dfbc2ea9d90852677c8b27f9f23529123cb8a4d76ae6273ac5410a149bd9f43beef673e0138dbd296ec1561ed304b59
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index 868720e51388..a765b2f7d83c 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_{9..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/Manifest b/dev-python/metakernel/Manifest
index 689c8288fae3..5c773ebbe2ea 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,3 +1,3 @@
 DIST metakernel-0.29.4.tar.gz 189933 BLAKE2B 0fe91318ed0fd5e356c9f0e4dfd05d72e5aff33e0bc305a3c198b4718bad1a4c3d5d7a6c82cf0c4eddb9bb5873f8b6acdbf1c61fe9a5ea8120ac6f10503fa950 SHA512 7e7458baf510383765f788fd3299d0e5dccea7b1f79c15e1621a81e029ff48aeab7c67ed01d8e2254b806115935d7428d3dfc2f083bba5ff586f2ad819f96776
-EBUILD metakernel-0.29.4.ebuild 986 BLAKE2B 95b67daa3fbf3799af0065b7b51da3533d4c9e71c5856d435a083c962d76bdf4b12696c6a3018f80333de10cbe2ddf359b33b3ea0c8929a117d96c11a96c80e5 SHA512 7d0b87c1fd9f3ff3cdd5214361528fa922e84443c6d766c8b2badba8a57185a34d2dd8743615b676700703a2a599e9c3ce4d3ff288e3e17fe1813fcb74e16630
+EBUILD metakernel-0.29.4.ebuild 986 BLAKE2B 89e40ef414594c3275d8b52f6e42c3615d7790f8d93e36956193b3f678c1dbebef9ae1b43dc2468ac2c59ba3be6b22bb6df66c6a42c4704c47e0ea4e39795446 SHA512 83bf15b8119bcef73abeed3bbdeb6469dd5c7cb93a4d37e3d27f1ab2edc4d03b24d706d038fb2f5173ea7be9860c65313c87695aeb12a1ddcf2451c6390ca13f
 MISC metadata.xml 635 BLAKE2B 3f108898788d2cd20d5638feaed2cb9ecc32db4350f8ee5996c7d3724b304fae040cc4c9ec20d9c7fde8041bad1ff1ab79106adbd17fe57722daa7f191eb2dbf SHA512 d84bd755109e0d4b45a2e8dec6b7ed2a5ac9dbcbe9fc8453c599969c06dc3d4e7a9001382e37d1e7c2d0fec940cf636b29ebd7e6a2ea7aa2f1420d20a4194e1e
diff --git a/dev-python/metakernel/metakernel-0.29.4.ebuild b/dev-python/metakernel/metakernel-0.29.4.ebuild
index 47cedb3d0aec..e9a34ba42dd9 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/Manifest b/dev-python/moddb/Manifest
index 196ef28e0690..12e932850c3a 100644
--- a/dev-python/moddb/Manifest
+++ b/dev-python/moddb/Manifest
@@ -1,3 +1,3 @@
 DIST moddb-0.8.1.gh.tar.gz 68417 BLAKE2B e013c6a2c315eb3f36ace6f37eadacd50a5854726cb6cbcbc6d16170bc1af06bf973d9874909ecb6e70c5a3cb896ef559eb6e915eed41217069fc3c7f468e57e SHA512 3557881f9bc33c911ba2e3d845a8294116c5ea394de4f24ab05a0d0af07ae000e972db9077fad8a1a30941a66b7f560cfce0616df93f1bae835efb51ee6035e2
-EBUILD moddb-0.8.1.ebuild 1453 BLAKE2B f3381fd4ca75b93cb13b6a7dc9123c8ef20531b4e744b87c2613af8b5d0a822de8a09c0fcc4cb4c006216cdea5a80115015f464b0cf63eac12ec543ad2037ac1 SHA512 8f00473c104ab7c5eb03e8b4477758435051ba63f88e87494f26f5ce873e9d3b705c5a88d9ea69b966d4d9c459e1ebd05d92f3b621d3bbd2f2ab62753d9beb34
+EBUILD moddb-0.8.1.ebuild 1458 BLAKE2B 5b1fabbb87d5d7d964e70bc3f11ed2eca9f9ec1ffd6cafd53db525fa47b6f6f4ccbd98a9262b77e6dfc7293cd8ce1b28bff8f639ed41c996a4ed1282236f1613 SHA512 b41e8b0f939b9a491cfd8290659ea469e67fdf91b04b62cd9b5fc4632a7f672764188c881c6d00d97604c2a7d60d943167cf3110d6ee7c1347d30befa6853ed8
 MISC metadata.xml 407 BLAKE2B c1651872c2ae76f7adf6fd307c7b7b3c4ff5c9b7a193d58651648de31c63f9c24e35c178ac4fbed18c2bdd247cf2fd247e1a579a1dea92747f5545f155ef5595 SHA512 e24bb351e9a98d5c86694447a9c4007df28de831f4a570e998316d81688347f038cd802441f89ab9cdcc7b4ab7079096ca3c8ff590ac7bf5453e442186304d5d
diff --git a/dev-python/moddb/moddb-0.8.1.ebuild b/dev-python/moddb/moddb-0.8.1.ebuild
index 4d37fb8e9f73..6376ed6ed966 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 7071e8d07e95..f696884fac19 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,3 @@
-DIST msgpack-1.0.4.tar.gz 128053 BLAKE2B fcbaafbea57f87c949a43a6bd6f6507eb3a07ac5e4a9c44fabfbb7c07849f1edabb8dadcd99a547fed32bce0f900f965368c4ee744acd4e850cad5c27022f463 SHA512 dcd59bf77408acf7171bdcc46c4d6bf875d36e80b216b7721544855e6c2b20be469415ee768b2195e74fe4650621ee6bfaa7897e709ac0d8d59cdb30772cb90b
 DIST msgpack-1.0.5.tar.gz 127834 BLAKE2B 3dcf454630021e35d5c6d5ce850d7ac74a6d11d6fe7c7ed07040daa62585bd6b11dc0f68a5b4c4bf20346c25bc23017f79f2d1bad09f175008b184461d0eea5d SHA512 bc3bf27ca7a9204c5ebc009e4a03db4fb48f6c2733bef393aed16652f07ac92c9400258818743245598343c86494d39b39017ab70d7563a5844091eca11a9faa
-EBUILD msgpack-1.0.4.ebuild 1023 BLAKE2B 02ac41c76f53982fbabb4c672903e69ddd1b8384554db7f89f327387d973ce90fffdb1b6073c442b03a304f26f49cda322c92f82e4abbd0bd6786770de915cde SHA512 9bc624dce8555c02e2d4ef8293cc3cc6eb952e095e790450ad1a79635891283ee2b5bdc05d505e1fa8496963241a73a158efeb5932fd35204a60c7a444effa17
 EBUILD msgpack-1.0.5.ebuild 992 BLAKE2B d62ecc13a55b4af73861e70411c4b4c943e4fbb0004cc6ac9d72d7c8eb8c1ea1f4891ffb119e4d0347dc63396e012bd8d3cf9ddc3c855a9a6d3490499c226502 SHA512 359f84a81cb3e0e1194efb538b64492e13c6ed230fa0bdcb59e53ba86110735b61de91c683f81f2fad56d71437f1256def3417c486bb1200f86a93f932d6de22
 MISC metadata.xml 520 BLAKE2B 5facc8e5c11591c6010fe5eef4030e23502b890d15a896ada0c5625e63179887e13206f28695af92b358c56a9f9660767d8b4234c2c8b489cad41fec01af289d SHA512 a62502d0b2ec3da1b21297f4d4e5fee86c206c8d6a2c19d7bffe2a64b4a2fa990edb3ba07bbacccb59ed79efd23fa713a37b8adffa7f0cbc811fc0fa249d9b63
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 7df088f85e01..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_{9..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/Manifest b/dev-python/nbconvert/Manifest
index 08cdcb53dea4..c0364e18b0be 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,5 @@
 DIST nbconvert-7.3.1.tar.gz 880064 BLAKE2B 0bde4a65f27a880fdbf694dc6501ad1d0f78bf72e6010377faf89d8b16d5b24f82fcba93c51d9421a88e5c554bc0fb6d002f913886bd2d2f1a7f17a834755d02 SHA512 24d8d0ff35cf09d095d01122386439cf0c40eb9af7c88604f3108e5831a270509e1302370dc40eabc8bcb28fb86603d9d7a4a104346122deb8471aab7471e62d
 DIST nbconvert-7.4.0.tar.gz 882064 BLAKE2B d7e7d7dca63d84dc1e189b4922e31777f29a3796c93a47c886afb9bb11bfdead29bfb209d1ebb17c82dfad91dcf145cee1ca4db9b780d676daabc28001bb87a7 SHA512 6421bde4c6b6bbbb54673a0bbe3e7902c825da8b0aab113ea285b9c2d2a59447616d6f3ce9ac15b4814a2776e03fab2ca6135d38aac694ef366b32cf3dd6d988
-EBUILD nbconvert-7.3.1.ebuild 3070 BLAKE2B 4bb79d9f4cc2f96baeacb8264761df1fc7acde08cca1ef9e3327b11d2e0837112ca224545935129caa5eeb9bda7d3b396db1ac0b0ecaa614679a8ed86f08733d SHA512 36c433c88aa5751cb0951a70f0917bd953131957a367dc3057ca21bbfada9248411a8f947366f0cbfdf94e25f6f6c4a523132f7ef14128c3af77dd003e62d88b
-EBUILD nbconvert-7.4.0.ebuild 3079 BLAKE2B 71988908a8c4c450b749a53e2c2e22a39bbb449f4109dcff4924d6d9e28101c09e1aeae95be46160e3db1703039a711d1dc21502300fe1d8e2dcb03ad9c45611 SHA512 286e7c942e772426ae171cc4afddd64d579a89fcf1c69d3dcc2ec57aca6656d1a648da304411299834cede056676a2959cb45edf4f4135be15367505bd9c1120
+EBUILD nbconvert-7.3.1.ebuild 3070 BLAKE2B 18fc1b06ffae855b49a08b227e5e88dd0d8dc4209a2b4fff7385e6c92b0ee57297365cf60956fb5243fc362fa2ca0c94bd17e171f93b5ddf5c420aae706ba9c4 SHA512 98e08d86d6bcb09e7eac65e9f5b0c3903f05981f5432e428bab8f7a2115aa706e879f8f8a9e064f49c24c29c39780a6d8c46538920774e3a6b9dabd1beefc335
+EBUILD nbconvert-7.4.0.ebuild 3079 BLAKE2B 7a18dd84085a466395e589ded7e82d048290016e3a843781ca0e2f3c83faa524274946459f58e53250a69e970f53a941fca7533eb46c17fdc5db6f19a6de6337 SHA512 0f6fe28a0f42b74bf024e0879c66c7ba4355d4c257d70fd1b95f7298fb8cc292f0546487021eebe50e784188e168b1a62395fe85c34209cb3fcdbd82610b11b0
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index 4e91a60187ac..f7fea0d0ce0e 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/Manifest b/dev-python/nbdime/Manifest
index 2f44f0023665..ec5260c22ec9 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -3,7 +3,7 @@ DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
 DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e SHA512 875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1
 DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8 SHA512 6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
-EBUILD nbdime-3.1.1-r2.ebuild 2940 BLAKE2B 5898be5c4aa7202810b776dcac8ceb31e2c6a4d08b4d96dc3d646bbf4c505b1692bae7279fca5595a4e6ee10a41c6f70b97c39168ed026c7fc46511837165ed6 SHA512 9da57d1212b580c0629ad791b133ce6b0baab353aaabd6e3230fd9d53ee58ddd1215d41d27b0dab1e2f756b5e36a7d9a46e08cfca9f126cbfc56a84a144cfd86
-EBUILD nbdime-3.2.0.ebuild 2370 BLAKE2B 5ea10a6c8c459225e5de6f28b1c2d16cca2b0ed0bdcadbfb0506abc71d4d2c54608f6e99fa41a6a65c3f3d66c8f0ca9dfcbcb7b4d46252e304b1aaeeef98e732 SHA512 04ddccf118bfc39dbeb5ab9b3b7d222c62f2179374c3f6e3321105ef1a4a0aa955ce7dfea3cddbece5edbb07b4824f297e920f53c078ecd1b75767da8bd077dc
-EBUILD nbdime-3.2.1.ebuild 2370 BLAKE2B 5ea10a6c8c459225e5de6f28b1c2d16cca2b0ed0bdcadbfb0506abc71d4d2c54608f6e99fa41a6a65c3f3d66c8f0ca9dfcbcb7b4d46252e304b1aaeeef98e732 SHA512 04ddccf118bfc39dbeb5ab9b3b7d222c62f2179374c3f6e3321105ef1a4a0aa955ce7dfea3cddbece5edbb07b4824f297e920f53c078ecd1b75767da8bd077dc
+EBUILD nbdime-3.1.1-r2.ebuild 2940 BLAKE2B 8976831a96fd2ba7a8fcbe212e9329db4e072ed9599012e56a40f86dfe4707eaab320bf19df087331e9f9fafc598c5fc2b3fa3797259d1c1fb9537880d3430aa SHA512 18754be4ae4620bf674adebb8b450df21df73612a1c5e05ec0aa9b60cad0f5dfb39719e9c9aa829d906c24df1506eae93c28a657be57390a8bfd1570af223e6c
+EBUILD nbdime-3.2.0.ebuild 2370 BLAKE2B 01016922d580df252fabe78d12fa2e7502d26f45a9bdcdca878767917b4fff5447836555ac101c9a160bb7d0fd73f7508e4e029964f043c3a307dfd0a391a3f8 SHA512 364ddc2c8f1a7275adaca9d0808af36e19653087b0005ac18e066254c29ce0918e6058f66b098dd07df127d55ff42ea734a82a721c12b7f7ba18a34836ea3f3e
+EBUILD nbdime-3.2.1.ebuild 2370 BLAKE2B 01016922d580df252fabe78d12fa2e7502d26f45a9bdcdca878767917b4fff5447836555ac101c9a160bb7d0fd73f7508e4e029964f043c3a307dfd0a391a3f8 SHA512 364ddc2c8f1a7275adaca9d0808af36e19653087b0005ac18e066254c29ce0918e6058f66b098dd07df127d55ff42ea734a82a721c12b7f7ba18a34836ea3f3e
 MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 1089e0532526..10139140e53e 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 b771305df768..bbde7615968c 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 b771305df768..bbde7615968c 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/Manifest b/dev-python/notebook/Manifest
index f30eae4ce5af..a153281f023c 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,6 @@
 AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741b11354fa19c46b4d96c04da150793ea9e825cbf0922e152c7eac010ac4ef95d4fd16057092967a12873744fe45e6fbc4b6 SHA512 eb72afff71ab2589afafc735dff50651f9bd55aa8bda520d6d9ed8769373db8b557f79d69e4f2a0d95863e3c9f4d83e09a3a915390e6ad89d6d3bc558101a44e
 DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
 DIST notebook-6.5.4.tar.gz 5785832 BLAKE2B 28845c51c244d08b12e6a2853d3407a2af9e351f1501db8e76ff4f069e656d9bf27c3d2893b38f3f2bb51cedf38658219be3843a3397a588046d55bf445d3222 SHA512 72bf4efa4d553a6265c72e188ad0ee085accbbc05b0af182531c892303149d83f38f6d410f1bcb2c835071f713cb4267d58324b982b4087caabf9b46b8d77cfa
-EBUILD notebook-6.4.12.ebuild 3119 BLAKE2B 8dd0aa38e59057cd4528b850af42dc1a377232b342fb69d3e52f157e4520753e92ccfa3817d7463721de22974d70a8065d2a177d5adf2d92c1f31c80a7ef1ffb SHA512 ea6a235fb6b9c1e9170f17a8730e8ff6f54800089a2d4117aabe7df84b1bec560ffd0ab976e54da7e280ce43d3010e1359ebb863efd56e4d2cac6971cae185c5
-EBUILD notebook-6.5.4.ebuild 2852 BLAKE2B 797b9dc4a20f7ca0d867e7c3038068df62675a750806c8578b58344449af1e2e68ca4ccc8d1c4c3e818150eb9b34580599e0f48b659e63b46c99c333e29bc36f SHA512 33378df1b09df92042c84839a5b847282fbf4da3e7de1539ccd6ea5927275043db83ed9aaa621469c2c7a5b607cbd43bffa6627a5dd379b0e705e8aa21355bdd
+EBUILD notebook-6.4.12.ebuild 3072 BLAKE2B aac5121118c0cc18da90027b730c182ed9be52ebddc8a143586d207c36e85ee2f90ec2e4b42dc0d1c845f44986844f93537e7e2640de31664354481319de3588 SHA512 c7e923028015c98043e1a81d0baa9e7d6d9b81518291712f9f679ca58c9cf9f760dc58c1fcd57c9089f022eee4e591ce9d935982249184bb0777d621cd67418e
+EBUILD notebook-6.5.4.ebuild 2852 BLAKE2B 84d01cdc616b976fa4f0d7e220698c0126e9ee69741a7eec6ac719f4b5d00c244ec7db8ec7618427ee5bc82f28581b1c036595225f39cdcb336560fc8abab751 SHA512 b3110d159fa551f2fc31ebbfeb18d744183b61603c29a6fee0b3b952dfd6f556c66ce11ed6f3bd090379c8a99e130e85c0e41eb60c4e899fc9094761ff35d4e1
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index f5a42631edb6..d3487026e7dd 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_{9..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 ff2983e97b13..323bc55deae1 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/Manifest b/dev-python/numpy/Manifest
index 29fda6325e6b..14cd49e6205e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,7 +2,7 @@ AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8
 DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7f6ce9bd641bc4837776465ce9c41c34f19f92bee55d4bae6245c1d2c84315b359ef0b089fd68d31cd7e7ec44b1 SHA512 3b4e6255b8d39e8504a50ecd3c2ba09d5b16d3f6c70b23b67e4dbf03d1fe390c55030f46090341d39a1ee8228c61ad6212fdc6e4579fcec9e26b4dbe70268661
 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
 DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315 SHA512 d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1
-EBUILD numpy-1.24.0.ebuild 4274 BLAKE2B 57ebcd94b9c33477d87500f8b8e9c98faa5a3ec00e855a3215863249b2c7810eb7198e9aa13db0859abad4c4f6b4171419e62022c73144011bfd143bde054424 SHA512 84c221d759a2c80e9c27f34d10b17b82e845d40d0213a73a65957829e38f78b86fedaccbd28dc0d94474976363d5fc1e6b2faab0807fdcfeceb09efa1ce2ed58
+EBUILD numpy-1.24.0.ebuild 4224 BLAKE2B 6fbcab5d5f5262ee6d3981ffba93c82fd5de9843a78dbf96c922831fbc1f19895eb8aea4fa0a9f37b161ed41ad5918acbff98fc397a96d92906cb6353fd3e6ce SHA512 f0b8d18e76da07175cc83c5c8324ee17399a872c625c360d8f2f96faea76c48dabbf0f9c0156ceb5c9e6acd86e611e3e5ec96c4703f9e7d4c9e91f921940f784
 EBUILD numpy-1.24.2.ebuild 4394 BLAKE2B 1758c449500cb32a84330cb76786c9c001a8964e34e0db8d246593aabfb66034c395bd17f7b2225f385c57e0afa99d026308e89e37d8ac676f78d72cf8602491 SHA512 85c6afde93b34ce58e90fb44963aac842505017da7fc29345595131fe7f7339015d14a4d3bfbb7a668f56984150dc767c4829c7764c4b6882d0c5ec36b84decb
 EBUILD numpy-1.24.3.ebuild 4548 BLAKE2B 1eaa7f8c56213e8aa6a9c54b65f337752cc9643b1e0da99b8c6c38fdf5d94136c9c59bb26b8bdc21280df7961130762d08f4913e8395a1723c3985b124810c44 SHA512 0b3e10c3e8e9f756dd22808dda7ba91c27b33176bf833db30c191c31fad0ada5c04a904c682e96b12827af523b8d06ac9bfd98bda620ccb09461f2cd0fd66a38
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.24.0.ebuild b/dev-python/numpy/numpy-1.24.0.ebuild
index 4fd3798cde38..f5328932d6a2 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/Manifest b/dev-python/octave_kernel/Manifest
index 10c2c6577b8c..36c4059f762b 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST octave_kernel-0.34.2.tar.gz 258320 BLAKE2B 13d96afafab4b0fee2c9ccfdac61b269fe7929c5c004fb675f8a0290f8681e7abc509776faa2e066b21de19ad1e988cc5a11429685344ca59a4ae8248bb01177 SHA512 ae57db2aa366b47219bec5be8050f9acd5a0edc37e4851b05ba4609df45f225cbe767078e7390e29dc97ca003feabf5e7bf06bb84e5900b7ebfb576735993506
-EBUILD octave_kernel-0.34.2.ebuild 866 BLAKE2B da2711152c11d2dd256046ea2d2ee0e22fe134e6d9fbd4b837766f33098390d05a7027b9ad0ff684e0b86a46e41ac0af29f3695e8a26f74daa0c62f7aa7cee2b SHA512 6e9e5af9712f326ccce1386b6160766ac78876c578ec0b765b22c835304d19823f1847ca136fba01bcd735feb87af5dea1b195a463dde7d58f8826224e0f80f0
+EBUILD octave_kernel-0.34.2.ebuild 866 BLAKE2B 610aa529c5d68fffaaab8ed0097dcc2c166e56370b3a4f364a0003e045d6bce81f913e5d35a325683043af8ccf29a90bc7c1838e463602f5aaf660ceaa84cead SHA512 f19ad0c6357f1d66160d75f4ce4db173608445fd4e5dd0c2adabd5c84f64c2359f2727e3bb19823e1ecab24bf8634a2ebb690dfc955f105cfce41666ae1f47f6
 MISC metadata.xml 444 BLAKE2B 12156b480eb8f067e0607890a8e7268d4f1af4567642a313ede0af857f16842d9340b1151e599da72545d2e0b10d7dd1b395a7d842428d66a4eab03c98643a79 SHA512 e550005af502f75a213bd9b12f08a00d1ec10774f32023b1c4fd1d244f07a8b8ca78dd698dd926ab098ee39ac7994cd12b0e31cc031ed4d38dfe83473af57abf
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 e317306a3262..d1053236e267 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 a0373680d271..22f2e8c603c1 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,5 +1,3 @@
 DIST podcastparser-0.6.10.tar.gz 31717 BLAKE2B 19ea422b78c7631fd2622f935e292d5bb14a31ab749db36a9a19e356a5a331246e7d853412bf913522588ce6446be2070f2ad4e6c1b50d245058eae49739519e SHA512 55b822a80f8fed56feb41d5f9a39c04371e4e11dead45b8ca6aaf666ecc26dc3c94673331da59e2ed6665f2a9ca367b6daccb24f987b1763b6b3ad8b302ee783
-DIST podcastparser-0.6.9.tar.gz 30399 BLAKE2B a1882cdb298b3e2dccc0aa821ffb97863377b51b6dd78bcd09e00d9170b88c94298996ca20c7515ab761f9ff0c73b371b7f8c9b3c4fbacbcdc2215004e3cc137 SHA512 5e28b361b5fd0aba22c8c34318d3c8f575d82913f7de0f8f62ced9c8d904dcfcf40282b8b832867998f820de6bd5b793ce6be4657dd04b4965a151e32f2f0131
-EBUILD podcastparser-0.6.10.ebuild 434 BLAKE2B 26b71d82a43d7b5fd5c6dce56f43cd6f4b24bf8a3121d2c556e62cb4b82e95533ec2c6b83477947bc2f86ac769f26de4428bbe9316205f71cbdd627f2c7fb327 SHA512 f1d73442ebbd9277c388346e88427c85ec7a1d2e601b94821b31fc84337c594bd9b520ac07c2f145df7c3d894b227cf5e81c9ffd72f928d2a4d72e647e51e2fa
-EBUILD podcastparser-0.6.9.ebuild 432 BLAKE2B 0426235c4b05881f79037b7d58166cbe512bb71f2d3ed2a30c480af7e02079662f7e9a257dc5e222040ae95968e419cb9b9ceebe150212a3f28e627ce9f34a6a SHA512 3f93f50bf221de257c5be2f0a941b9e97d4a44f966a42c3f1cdcf4ca4141f64d0961c3c6c825814e76c1d79e6438d2bf30a68a9647f01d45e4fbb946ed02b992
+EBUILD podcastparser-0.6.10.ebuild 432 BLAKE2B 0426235c4b05881f79037b7d58166cbe512bb71f2d3ed2a30c480af7e02079662f7e9a257dc5e222040ae95968e419cb9b9ceebe150212a3f28e627ce9f34a6a SHA512 3f93f50bf221de257c5be2f0a941b9e97d4a44f966a42c3f1cdcf4ca4141f64d0961c3c6c825814e76c1d79e6438d2bf30a68a9647f01d45e4fbb946ed02b992
 MISC metadata.xml 516 BLAKE2B 2cf902a3f89e91ef879ae5a9ece9dc5a3991ed06c2fe4542a330e5e52f24f850728a8d1588d02481109974c6cb400e6e53952356075c42cc4b0079f383fc4119 SHA512 947c15724f072eddd93600a0c47555c5a191a0c6bb28d1fad0149f6ac510b932678c494faa36a959d4639213c4133b2a9c28037177a6fddecc171b728f561d23
diff --git a/dev-python/podcastparser/podcastparser-0.6.10.ebuild b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
index f6fe3dc39931..efd0a5d7400d 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 efd0a5d7400d..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_{9..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/Manifest b/dev-python/prettytable/Manifest
index 2a9d3c9163be..bd56ade98e36 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,5 @@
 DIST prettytable-3.3.0.tar.gz 54305 BLAKE2B 4d131c16b6c6a0fd64aae1f9f54e286bf27b562888af56a6944d192a24c05d6138c3bdb8f298dcc060db7609d72b8d86ab9664bf6bcf43cd2105bdd433bae3cf SHA512 e190717e2ea89e8faddc7015fd5118e0d93ac5f5318641ce5960b22b4ea3740ff12c4d15812b33655252f258c96f9e848f554d1e678d39761c28025ba7772609
 DIST prettytable-3.7.0.tar.gz 47169 BLAKE2B cc749c6a42ad45359ccb6195378526d7c6da1be932770090cdcee565606131eaa1f83a01732781e3cf39719b4cb42824865b4855e5432e7517cbead139361e2d SHA512 4fe83cfc7f3fa4031191e0c9b4a70eb550c189a0921d3f85d1be5b8fce8c917034f8039861577a447b6705c4bbe49f6b18698605ffdef80e2f9bc81dafabeefe
-EBUILD prettytable-3.3.0.ebuild 782 BLAKE2B 5f8f0e50ab7b0d12e6b17a28e0ca95583b49765164041b39f46edba4992c48551f1fbaeac842468e1c510edf9c3329ca2690eef335721dd619ffee193f8c6888 SHA512 a01ce3f9839ea51a06d02159a9392e30816819be5e194df6386220fd05762a7d9702d03b8352768dd591a7acabe7a3780e66c3ae80c50cbd06d5ffd56316c921
+EBUILD prettytable-3.3.0.ebuild 735 BLAKE2B 77201d9427ef644bc9f2a0622cf7526b64bc9d9279fb6a62260fe96db07418423c7e82126af78db770147c33277d1146001542cdadebe78479416869ee809ed3 SHA512 6c0706ab8bade68517f532c09a6c286a58e4a6f2bc8d546082053e1c13dd3b70cd443ba19187392841f059c5089ac20be0c7738d0b17d4e4e8b2aaecb09588d0
 EBUILD prettytable-3.7.0.ebuild 729 BLAKE2B 436a9340ae5c5ad202e4b73de4a4c8c17fcc6121ffd4766cbf2e2bbc6d1c654d7a2f134b0f738e6f9d8e6341dfc877a3971f8422621786e5dc211b86fc6db3f7 SHA512 c3ca8903531bfc886555a0133dd009ea1c3fc1d20d98ad236a0cbb14daa13117f1502dbed69b47775019e9f805900fc9777e11cd799a79b5cc797bfadce07e25
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.3.0.ebuild b/dev-python/prettytable/prettytable-3.3.0.ebuild
index 5d298c3ae27f..5c7d8676e95e 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_{9..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/Manifest b/dev-python/priority/Manifest
index a55d029c4a19..2ff65545eb35 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,6 +1,6 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
-EBUILD priority-1.3.0-r1.ebuild 763 BLAKE2B 89a9fd8c2cde38f554f5996848194f469180e30cc1205636b05cfa1c3e00db3e693af7d79ceed094678ba4682a699189231934edc9b74abcbe5f86f98573b36c SHA512 b63994aeb12fdd52dabc94d8437d32dd92d998c2486648d604fbc4e6ddfd89717742c707a6e0fb21fee288bc656f6d57ea5ab2755f162ed2ad586a0ba104498c
+EBUILD priority-1.3.0-r1.ebuild 717 BLAKE2B 02d135cec7828e6415e6c17a312fcb4045b43a0969b38d47ae8056f9189b8c891eec0717b1f2ef0bbf4223a9e09c3078fd5cd54031425ed0865af85790a81f8d SHA512 0f3a9186d2f1d280038046bff195548d5496cb4c8c1ceb3854b0342daff818a775513a1a43619a069a0f7060b33c72b6d789dd54a0f40e1f286192b7cfe02cfc
 EBUILD priority-2.0.0-r1.ebuild 655 BLAKE2B c47dc89d934baad36429e4a4b0faada4b9301792d5d71388bbd56679a8f3ad07fd1e5f753c5bb10119f36789b6c5287859c3670679f29e1d2c3cefcef488010e SHA512 aa1de639eae7593270144f552357e1a6744ea4fecc6dcd05fdb0c8f95fcc20985a202e13184beeafd128c3036a3415ca1d04c521b2042df3d9a0dd40c1c55d13
 MISC metadata.xml 864 BLAKE2B a4d4d8f4f8c2f4fa5223060a708f5ce75d8cb8c9bbee43e3c9a71eb4d06e0ae675e8864fb3538c971617f138cf4f548e2bc2884f930a0fb40bdb270aad0c2736 SHA512 4c9a614833f2e769551cd584cc80601ea7bd5a630afd4de760a6a219cf50bb65fba9db137dcd8ebed52a0a00e606a24288f347785a3e2fbce4777ade324e0080
diff --git a/dev-python/priority/priority-1.3.0-r1.ebuild b/dev-python/priority/priority-1.3.0-r1.ebuild
index 4830c16b82dc..8ec5649ecee6 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_{9..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/Manifest b/dev-python/pushbullet-py/Manifest
index 0cd7ec8ef33c..2fc233bb0b42 100644
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@@ -1,4 +1,3 @@
 DIST pushbullet.py-0.12.0.tar.gz 23769 BLAKE2B 096c5995bee7dba65b7f385c2cbd70d839b22a07b26dd1ad9c1ef64244ba97e3c2f077c9eb0ca46a2ccd7df6a27e3ee3d4d55522986e832ca109d003e77fbad6 SHA512 5394fb8e8631ba00c610c36380e2c917231207ecd25bb4e2f1f0e44c232f4dd33b99ce5b1973467844b7f46f275ea812620e6549afd42915ee8fc13e1650f758
-EBUILD pushbullet-py-0.12.0-r1.ebuild 1073 BLAKE2B 7446bdd5ef4ae8ef903368cd65e32d3fc1c00dc54011df96cc4ccf7e806d8ea7873d797ae0586dc700ed0142076c5d5873acc0b15ae6d727cde42718ad03ee84 SHA512 f34c96c330559d954aeead2c17d92c89e69e24b999ba898bbc8388fd7c1a5c98aafb9970ff72d81bc7e14ee328d9fb7e85af708b577a1a754ee75532f5992af5
-EBUILD pushbullet-py-0.12.0.ebuild 1041 BLAKE2B f391cbf8590337cfa6d89ffa2299ad535dd2e7015ef2ef71fd59e8eeb86ce09debcedf646289c2b07284a69f2fb92903e967367683022b302bcf6b9a3f33d640 SHA512 d9721cd08a4e61927981f5f6753abc977816f341a116a2d9a1dcaa4ed3469ad476d8baa9e9d5224e1017cee51b55659deeb8c86afacc9a04d3e9f1b66db3a455
-MISC metadata.xml 460 BLAKE2B cf0170e5833316876451e151e558f1022a0665041322e8c9c4da9bb0cdaa4c51fedcc99b25ec70b5e7b049ceb66fcc7175a07b4758fcb2e8e7b27de9deb43381 SHA512 a7a832543b0652c9667962959d1defafac26e9a4d23a1f829220270f142f9ea43bd4b27a77ea14c81d3cdd4f98c136802f0d3e5f227afa258c1455b1bbc58dec
+EBUILD pushbullet-py-0.12.0-r1.ebuild 1056 BLAKE2B 8ff5a3ae3cc0b660d4efb29c0c99c4377110552512d69ae5044af891c11b22d8b6886a2170490b3a7239bfd7ec4ac2621b5286415e248362d187ff6c683f9748 SHA512 364fb4fdccdcc051fd9fa0d3483868f90dd5d90083d5b6491720e19a4f05e953feddb5893ce1cbfbe9953d5edb29ffc82a4030f2665775d9e2c9c1a50220e62a
+MISC metadata.xml 466 BLAKE2B f7555c99af2fd7fc2cdf9fa169dec8196f7e2241f3a6976fa934f7b8578e748231360dae27b115c0052178e57eca08bdfe37e36fbb6a9cdf5ea9fdb49077b7b2 SHA512 7e35666ae507b2fcdda81afb8297d0ed5eede47afd0620f699372f6b6df9f7965d86ef4cd66582f26dace6e013ac8916cf2eb31f4c3a62d61211918e4c25469b
diff --git a/dev-python/pushbullet-py/metadata.xml b/dev-python/pushbullet-py/metadata.xml
index ccb534d71d76..78a1ad74cd84 100644
--- a/dev-python/pushbullet-py/metadata.xml
+++ b/dev-python/pushbullet-py/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pushbullet.py</remote-id>
-		<remote-id type="github">randomchars/pushbullet.py</remote-id>
-		<bugs-to>https://github.com/randomchars/pushbullet.py/issues</bugs-to>
+		<remote-id type="github">richard-better/pushbullet.py</remote-id>
+		<bugs-to>https://github.com/richard-better/pushbullet.py/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
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 4557f22d66b9..20621dd4a6c7 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=( pypy3 python3_{9..11} )
 
-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 53c34a84b140..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=( pypy3 python3_{9..10} )
-
-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 21f8e8f9af55..7dda255e6ecc 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,4 +1,6 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 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
 EBUILD pycryptodome-3.17.0.ebuild 1343 BLAKE2B 1894998cd9e2efff5628bf4fa133c27b3c4e0afdbd692d5ba724a0f3c285a2dcb1e79a4bdfd08f7d53be0aca7c0c4d022533234b508157888dcda600614ecc1a SHA512 595f5b7aa7a3ab31b7269fd96416a5affb5e96734cdbfb077a16b59977956098f5e9fc517afbce6eb0f6e5b25e33a1432c66252fe1527d81602e8f8ca8f6e245
+EBUILD pycryptodome-3.18.0.ebuild 1392 BLAKE2B 3b8104c06fe0561cf1ec2ac242293d078889566fdadb203f9102259e611d9228c347e5a923c7b97fb3d08f305cb1b0d94588998c92ee92bb8b3b90c94dabc10f SHA512 5f06e31ca0310dfed68eaf7bc62fefb59e5662935a4bba58a6322d584c2e5bc65f0dc714860704451b93f080bb8f1098a51a50ed7da4fd0268316ff805d3592b
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
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..be14aa3d8dbe
--- /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_{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/Manifest b/dev-python/pypresence/Manifest
index f3122f481511..2b13fdf35d1a 100644
--- a/dev-python/pypresence/Manifest
+++ b/dev-python/pypresence/Manifest
@@ -1,3 +1,3 @@
 DIST pypresence-4.2.1.gh.tar.gz 375948 BLAKE2B be3f654bc9666b1fcc2ea4bbb7fc337b1acf41754750407f0f2a6a29bab39e3a5fa1d3c4076fe68dd31994c8713234aab88b085248e05196e3683e0b0c72c5a5 SHA512 b01714fe33bc470aed7ed0ff501ffdb50706e2d9a5610d594e55bb2938c670a55fb42312e67b0126bffa0bc9e04a3c1aeda445769764c2fefc8888945209cb2c
-EBUILD pypresence-4.2.1.ebuild 537 BLAKE2B e34c9dd0a9a428787708e7581dd05d9755654e8bb625be69f3cf3a1e0075aaa20ec630e4cddbe8aa877281de347120753b3d072c226e1c0c95fe74e7b8d656bb SHA512 f4d62a86de66d694281eb151a6c1b19fc5765d07b9ff8ace6293f5d4c1d45e16187da600be8599657b4d8245a517cb77e8fe77e6df7bd20bd975478bb6eac505
+EBUILD pypresence-4.2.1.ebuild 542 BLAKE2B 5d6a0ca3fadc49744e523ea6b5469038c138deab6a3f93e19058c5bb61e3ffa25a45293e90829b6dcdcb679da1ada0c7520cbe7a1a603ae8a142a8dddfb85fb4 SHA512 823b0a743eccbcb32776232262878fb1051867eedc7752ca82594d2cc8dfff716aa3a03b3e66fd6b6eb112840a810a6b537ceba18237d05965b4c8a120e05bd2
 MISC metadata.xml 419 BLAKE2B 94a6c995283b89ca96a57166b3be7540e825d0c64b5916a27a13186d07d4449592f2357001c5943a290f7fa5076d80f8540b26c8c2b3e08e7dc6a8aea72145f7 SHA512 a8e04a1a1d7f298c99b39caba8cafe3fd6c930c86bd0f2fc24c9128c33973758c929dc0d3aa2c4b5c716af8839a0e8629bfd2e76622af9bf6412d8ca1860dc87
diff --git a/dev-python/pypresence/pypresence-4.2.1.ebuild b/dev-python/pypresence/pypresence-4.2.1.ebuild
index 42e135f8be29..4d42b99931f2 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/Manifest b/dev-python/pyrate-limiter/Manifest
index ccf7c3ed9dc1..54b4477dc106 100644
--- a/dev-python/pyrate-limiter/Manifest
+++ b/dev-python/pyrate-limiter/Manifest
@@ -1,3 +1,3 @@
 DIST pyrate-limiter-2.10.0.gh.tar.gz 71838 BLAKE2B 3b8fd16684268870991c3a731c5497802c6f7be51e57bc983a14a7484fad2d0983613304fa061fdb70a3e6645d17fe37fbd68e9ddeca57bc7bd97fef4a5d8585 SHA512 b0090b2d80d40ba2f86ac7b5c5612a35fa885b52a87d783aa9726782275e79ca8d54a9a44b1f0dd43c98bf2355f4c17e1686d7c7f806934ea492b67f66b06ffe
-EBUILD pyrate-limiter-2.10.0.ebuild 1610 BLAKE2B b95da6f9ba15e454262ea58708785aff8174c607095423a3297e917d4ca6710a06c05bc6fb5eb20377384aae48d0fa14d64a5f8707a67f5a2e53d8a2f5483d11 SHA512 61519de9a023dd3ae9ed7037ef9a3878c70ede531622249393c0002b6dcdab7da1c38e80850880959fed2f840194e2d0ea4bd7f371d9a3202cea47df2aa9c958
+EBUILD pyrate-limiter-2.10.0.ebuild 1615 BLAKE2B 85bd937723135a1872b6c8bf17165cf85beb314eecb8d58f8feea1f24a6ebc241fdf571d76f38f335a41d25c6563659d0975d35e7ec999a6e9d46f8610e10975 SHA512 6c0bc76bf00a2d94e7e4293346fb19734a2fb5e3f252d3d65d802ca709cc475a1b1f1f3923f0a0f70a513ee2940141f8cedd0fff85972db821cbe50ff9af0418
 MISC metadata.xml 525 BLAKE2B 8daa0c59b247c8ec215a3868315f383614b24bf36a80950f3a94968856a27ee2eb90cedba36784355926c509a26b530f3de44be729beeee0f22595cc0b9467b5 SHA512 429e23f33cd2889a7e989333a03ee374cbec2e264d354bf1c299263f2c9167059eb17f1c975b67cd4af7011843c3478d5296033666566bca97749ca85dfcab44
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 ea03d5cca205..b1634af6b4c0 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/Manifest b/dev-python/pytables/Manifest
index a3df8865b31f..751340194c9f 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -3,7 +3,7 @@ AUX pytables-3.8.0-cython3.patch 1443 BLAKE2B 064d0175ecd337d3e5628da11c784158d4
 AUX pytables-3.8.0-optional-cpuinfo.patch 3185 BLAKE2B 1e5afa906c427408a81b477f4d6aa09ee903d73db3cee048464b277a69ee0f96cdc23ca660d4eb68b49ae4d88386711e5340cb4deae4632a8af0512ca5b64437 SHA512 3f9da3a9f2a95d80b2af458744a369a45725aa72fa64a316f6e281695e710aadf0d785cc80fd25639a032a9b3bf04a3f06c73c21b1812656251e8ebdaf842032
 DIST tables-3.7.0.tar.gz 8227955 BLAKE2B 0d5b7b765375c4787f1210138e5fd02e3c0ce429ef209a3a8d4fd3bc094f68486ab6f4d0a960ce86efea6991ed691ef2a3e9e8f37a49fe91cb8d6372cadea80e SHA512 eaa368d063b5fad87e6d0f9ab6f02da0b2a3542740a52fe8c2bb58e41121495d07b6d2710ad402a28891294aa61a11238c6a7e2cf2933a1bb11391b79cf4fd13
 DIST tables-3.8.0.tar.gz 8014052 BLAKE2B 28d120ad609ebc9ae8cd97286bb3fb9c484bd8a179edcf0de1b96e4400b7a21b4db835d94fae3aaee84924bd46b84b84da12c538b39517362d805651e7aa3aef SHA512 1616c00787a2e88ff3dc2aebe3a1b2ad428b5a8ea48fc94058b49c509f1c040b540b3f62551b16b3246d2fed58e0b33443cbdaaf1dfcba5a6eead5f3e8028029
-EBUILD pytables-3.7.0.ebuild 1645 BLAKE2B b8e46514aad26f9f76d120700e0cd2633dffec035b04205fd3d6f01264902608fae5a09a53d323b55fa6d039d16aaf1b7cd5f970aa7da53c72b3358219be2cdf SHA512 6b70999d5972c851b7dcf77ba1b6966c0d35638524d3fda1a83b1ff1d6cccdb56ffcb48930121e331919ff442289fbf9f3b52fa94146f4cab9d5994c1a987899
+EBUILD pytables-3.7.0.ebuild 1566 BLAKE2B 9d6a421ee6b96df708902e340510eb8a9faadf9df329c7742208bc5b7084a98eb873e61db57441f594439aa3a1c6fa1c8cf92449d8ee4c5df67a96ecf6842be6 SHA512 e1032680684c5c0c2a9a3d7799832ae11f77f464f777801316282ebe219e5b675480a80e596c1fbc63650e00bdd4c267cff7a10ba3e0baf7f0f7d4a99f67f711
 EBUILD pytables-3.8.0-r1.ebuild 1670 BLAKE2B 2ae2fa481476cbf77389a33aa1acaa4c05040a1567264f481dc4a1dc97e95b966f076e4b0e03fd8a341cbe85fa77ff6201709d1b8bb68c70fea62cd25db54015 SHA512 9d3d9ab8c322165ce5b81d91d55fccc3ea4526df592d5a1c9afaa7ed9f5a9c8fb11785f44b33a8c60f740015087b6a4e9c7a5cf95a8b22234737ce28a995c111
 EBUILD pytables-3.8.0-r3.ebuild 1872 BLAKE2B fc2cca33dc258b4585d86e2cf9eb58e3ad9b15d3c356c1baa42c1805e3e3cbce3e958c58501561f55d5849cc72b500ee194a00d132fe0112b9f07eafdd439938 SHA512 d13ddcd55d35b073e0e19e764852f15c9b9f7b12a14cd19bcaae07cc935e522aae07bdc124bbccc6c1d60723522d9425a03edad7ca060aadb9cf9031d27e962a
 MISC metadata.xml 1090 BLAKE2B cc213079beb7f2888b5eab4886711fe8a4b7a4bc3cf13ff4d2247bd04edc05fdaed19c464ae28beac27de511ea997bcc873866bf9d544d6efe8cacd095e8640a SHA512 bd322eade443a3b1b610d262a0a6a30088246b3f772624fdfbf6eac85f240deb3f9001be1e2e20e334e65701c24e1d57100c67864d14067b1ae16e99f2136e8a
diff --git a/dev-python/pytables/pytables-3.7.0.ebuild b/dev-python/pytables/pytables-3.7.0.ebuild
index 7a9cfcf16d80..73dfc29cc404 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_{9..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 73d9fb8156a3..3f4439bd7abb 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD pytest-testinfra-7.0.0.ebuild 1454 BLAKE2B 99d367bbee7868a9b20bc690ad8398ddce1c03c6ccf4ab78a53e95a704f1d2a7054fc7f123d7fbd66db0d668b30fb4bb25c8bdf1c829287ced0cdc34071210f8 SHA512 4a3d9f22069599696f8c594057a793e4cc87b9640a96a2290baba54fd11aa435efd0edd4e7146d9bb76f62e6c282158ce45466525fb02a3729a3c0222ce6bec1
+EBUILD pytest-testinfra-8.0.0.ebuild 1261 BLAKE2B d936c56d8662461d2d05629cfe95557fb3cc87ebd9ae6c03ea29ebdc88da0f8fc10708ff1bc72f80d5c3ff14dc94467ad25384c629ee311f570dacc21989dd61 SHA512 dd0530b7e16b2aeb569d676c80caa9988064ee8763f7cc7b98e489d85e64ba3d95ac7e752a1286e5929dd9b72d2152e12a2d3cd8f141fb16131e1f36fe4385fa
 MISC metadata.xml 781 BLAKE2B e38dd6fa967258affb201d6474524e22124a1b8848cff08f3da88e97ff3e13597770c494ee040481967028ee4d82112fb3d38f1034cb7982288d859efe540a21 SHA512 b6c868e77d1202622086340ae284071eaf1b95948c84a8a00f06e819e72325346d7aa226931d1bb5a3f782f23656c1e65f4b21a74ee0cb70deabfd602f774e99
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 c72fa935cd0d..bc4a8f594762 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD pytest-xdist-3.2.1.ebuild 1096 BLAKE2B b42416c7d6da43b546ced93b46208b071688358cf3a201c5d9fd0689d5a6189c139842fd11c47a6226c26ac6f07752392c59239ace24b89676603bc45e1eddfa SHA512 239d131fdf0d4c7d68d522ca10b77ae3626421d4da5923fb12bc8998ab1b92e2fcacaa26617030bbd4aac2adfd33fc481c919c0f55175a22541cfe9ae423e935
 EBUILD pytest-xdist-3.3.0.ebuild 1104 BLAKE2B 18604032d8eeb812e4a005794eaeed43a3ac6433df75f877cae01929306eeed51abb17f55dbfa079c759f34463cbcbcb43fb0851328e1c24136594c314d0aa8e SHA512 22094bc669a552acd1677e16e398db1d64bb57f6b82a826b3ddff86edeaeebdd9de53ec787baeaf8d1125d676e53c4d98fc6b5c083b3e327aa41171a5738dc62
+EBUILD pytest-xdist-3.3.1.ebuild 1105 BLAKE2B b03322987d4127f83864a1acdda2f3d5c78736dda7368281d41da22377524be14f99b6d7449e7250857d91b24ecf768bb2ed9949562fe20bd7b64bf7ac21d276 SHA512 d2504547d007815a6f634ba58ebf23da2d53c59b9142d3155cf9d1631a2a3f969f38d5f1d5f107f39fdf1f9a8c07487f8caab6ff1b0103482520fcae74c4e19a
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
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..cee4b9457782
--- /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_{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/Manifest b/dev-python/python-ldap/Manifest
index 4f76e812d1c9..4ddf708363ac 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,3 @@
 DIST python-ldap-3.4.3.gh.tar.gz 378215 BLAKE2B d5c165e668ed8bf1415e06e28e306bb757dea71ee7cc1ad380c35a5d911767fd08e249577aef0e5e888c1e9129072f93f499560e8b70e6848fbad4d7f9bb95a6 SHA512 a52403b7d9fc4d114b995640ff34f5aefd313d36cea5ff6de73ea9f46036694ebd43cd9d11382daf3be9da887f62c6675b49d684c05a7d5f0c93d446b16d1981
 EBUILD python-ldap-3.4.3.ebuild 1720 BLAKE2B 49e2da601de4b8215889a303447f639c1fadd1c1682d88319f5e17b4f8ac8cabfa2ac23851b27fb7d5d23891959bc9d7322b52b853b38c0b9423ec33dd74a032 SHA512 cafbc3566df40bb7a76fd32169da2456d3ace4367937425edbd008bbcf3d2c5103f8eaad2a5471497b70673039cc12e4429af0aed0e5eb9f14bdba972dd26540
-EBUILD python-ldap-9999.ebuild 2000 BLAKE2B b3afc013a6bf60000d1dd28b01195a9c5f16354cadda0ca160b7b38fa26234330f9e615a708a766e4ce6444d36a97696efb9cbdb2944ce5c7d5bea991b59baab SHA512 f02f3e1b7a342dd57e7889c17f72349c3c6a44c4d1fbe762bfef25999a32bc5038e10d9e12ef46d987c45e257008bec25ca2b7886c04ab3ead30a05a5daf8222
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
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 0e12e7bd1eff..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=( pypy3 python3_{9..11} )
-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 07b5eb029e59..133244e07cbd 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,21 +1,7 @@
 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
-EBUILD scikit-build-0.16.4.ebuild 2019 BLAKE2B 195961eadbd48ad1e2a52f958833e35b9067452633389486027016a6a540e61d2e36490386c33fc13c9be1bc8da9b6346c4cb68f3b9a3f373ead0b61a6735436 SHA512 1a2d36f67ed0d01e05b30d3c5f477f191aa26ee428a86b2a06db6b662daf540c626b44886630a02ed94853b3b81308d1fee212ad4cb4b56afeceb24c96ef691e
-EBUILD scikit-build-0.16.5.ebuild 2035 BLAKE2B b67bce0202e5501bc3c9e6943501bc62443c5237769c60940d970eeed613a77cbd16c19c62d7d29024155c4c74a3aa0ef0773920dad2c6a715294414f3292de5 SHA512 196539e28b4c5522d6d84fbc7c221a05eb9450ec5d8afbac35ade23f1d5250d244ee829fb90e21ff0fde9277571ea4bcd6942e85cef49e80f98d926c8397fe13
-EBUILD scikit-build-0.16.6.ebuild 2035 BLAKE2B b67bce0202e5501bc3c9e6943501bc62443c5237769c60940d970eeed613a77cbd16c19c62d7d29024155c4c74a3aa0ef0773920dad2c6a715294414f3292de5 SHA512 196539e28b4c5522d6d84fbc7c221a05eb9450ec5d8afbac35ade23f1d5250d244ee829fb90e21ff0fde9277571ea4bcd6942e85cef49e80f98d926c8397fe13
+EBUILD scikit-build-0.16.4.ebuild 1993 BLAKE2B cc3de0bc11e45c9d4ca8ced7d2239d18b71a62ed089fa73d36da0298d9fc66319f7743d809c8a001b57a3b3c5fc596835bcfc560e4e1bd9eaf03b7d10901ddf0 SHA512 9b5961baf199665bd9d854006d02ab2e5f3cb0a6601e6d39f05df8db4b2c551c5f215028d51ee0b588a09b04951c206a26bccf4f6f854bcf3f931379e61dcaf5
 EBUILD scikit-build-0.16.7.ebuild 2087 BLAKE2B 4514f714a41c571c431d2d9fff4abb426ddf9a7abc4d6476f2ffce28b8c7c0ca5418b1416f2969a0cc14af96aeaabab20c2b0f6a0befe323e963b07444c4a19d SHA512 c13083c11b93fbe3a11011c764f13547c5cf804739f5aabcf9c28258e3f18c0e98a4825648a5e70f311e65ee5a77a62ed54c2cb917ffe9cdff2446e70a661403
-EBUILD scikit-build-0.17.0.ebuild 1558 BLAKE2B 69394e39ca9ea6aca31b8c13763b930c759076387bdfc319f9a995610d6e082426151bcafd4afb709bb032723bc168961231baa9f042be297b9b8382ee4fb63e SHA512 4d767bddb4d87b2233f177ffe40e7056f5b38f530d5f1a21756d3c66e04f813fee1d0e74f3d82d41a456c357d258d37771cdc2a2c86f50df2e22d34e7715fb52
-EBUILD scikit-build-0.17.1.ebuild 1558 BLAKE2B 69394e39ca9ea6aca31b8c13763b930c759076387bdfc319f9a995610d6e082426151bcafd4afb709bb032723bc168961231baa9f042be297b9b8382ee4fb63e SHA512 4d767bddb4d87b2233f177ffe40e7056f5b38f530d5f1a21756d3c66e04f813fee1d0e74f3d82d41a456c357d258d37771cdc2a2c86f50df2e22d34e7715fb52
-EBUILD scikit-build-0.17.2.ebuild 1558 BLAKE2B 69394e39ca9ea6aca31b8c13763b930c759076387bdfc319f9a995610d6e082426151bcafd4afb709bb032723bc168961231baa9f042be297b9b8382ee4fb63e SHA512 4d767bddb4d87b2233f177ffe40e7056f5b38f530d5f1a21756d3c66e04f813fee1d0e74f3d82d41a456c357d258d37771cdc2a2c86f50df2e22d34e7715fb52
-EBUILD scikit-build-0.17.3.ebuild 1558 BLAKE2B 69394e39ca9ea6aca31b8c13763b930c759076387bdfc319f9a995610d6e082426151bcafd4afb709bb032723bc168961231baa9f042be297b9b8382ee4fb63e SHA512 4d767bddb4d87b2233f177ffe40e7056f5b38f530d5f1a21756d3c66e04f813fee1d0e74f3d82d41a456c357d258d37771cdc2a2c86f50df2e22d34e7715fb52
-EBUILD scikit-build-0.17.4.ebuild 1558 BLAKE2B 69394e39ca9ea6aca31b8c13763b930c759076387bdfc319f9a995610d6e082426151bcafd4afb709bb032723bc168961231baa9f042be297b9b8382ee4fb63e SHA512 4d767bddb4d87b2233f177ffe40e7056f5b38f530d5f1a21756d3c66e04f813fee1d0e74f3d82d41a456c357d258d37771cdc2a2c86f50df2e22d34e7715fb52
 EBUILD scikit-build-0.17.5.ebuild 1559 BLAKE2B 6d7370d0358d5a930156a7025fce99173b033da54da4cabe84ea94f5cec11722b06c740760b0b3dd3c24290f55bcbcf3bb88453b4995da05886173986ebb3bd9 SHA512 ccea1eb1ac6eb6dc3a7f01940b223bd5088c56d280706f43fbf3684948ddf905242f094a69980667d8300264b90a759d4a34ca1758e15b17c8f3a25ee18a78a6
 MISC metadata.xml 473 BLAKE2B 9d02a79439618fa413f74e4a617b8af042879be7a44c8f1c33e254e985d4f24057321fb2ec0b73074be1f6b67af3984190e48669e19985d6297411c0c5b61a79 SHA512 afc398c6287ce67eb85402832684fd006385e70d28a738ca8c5f1e2d008526621121cd9107a7fbc217a1a5857b54fa1dce3de69c47db58fc76990764b814a36d
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 730a4e8d5cb0..748a4a515efc 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_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..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 839201d44672..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_{9..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 839201d44672..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_{9..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 a0aa5f26f381..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_{9..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 a0aa5f26f381..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_{9..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 a0aa5f26f381..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_{9..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 a0aa5f26f381..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_{9..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 a0aa5f26f381..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_{9..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 a6d90658bc6d..dbd4f1700f9f 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,8 +3,10 @@ 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
 EBUILD setuptools-67.6.1.ebuild 4433 BLAKE2B ee7aad8ec1b5ff9d90c6a9e13f608d99b027b7a9e58b7dccc60459304637952c751b4bb6cbece6ccd9970540379bceccd3b8928fdb30065aafe193a4d4438122 SHA512 57327f340317249f788a008c73da4a1016886ed93cef877cf98d1eaa743cc4c42e05adb633fefb1d5d5691864ff27fa1b9a40885a1084fca21e523e0be6f69e7
 EBUILD setuptools-67.7.0.ebuild 4441 BLAKE2B cfa4d721dcf277a97abbc33e5dd46160bd7f19f96da61569e8d7da81c00979de8ceb1e460e61827db8ff14682d04db213905342171ccf09ec87a9e5b33a441d9 SHA512 fda509a1bbe2f468ef2c6601ab9484ea1139e6593f6c33d35ad5a8a51e27f42904289617f552072a3022ca946d71cf39ecd01e25a52d623ca7274f21f0d979ef
 EBUILD setuptools-67.7.1.ebuild 4441 BLAKE2B cfa4d721dcf277a97abbc33e5dd46160bd7f19f96da61569e8d7da81c00979de8ceb1e460e61827db8ff14682d04db213905342171ccf09ec87a9e5b33a441d9 SHA512 fda509a1bbe2f468ef2c6601ab9484ea1139e6593f6c33d35ad5a8a51e27f42904289617f552072a3022ca946d71cf39ecd01e25a52d623ca7274f21f0d979ef
 EBUILD setuptools-67.7.2.ebuild 4561 BLAKE2B 260e913d17acffa1ffc891917b245171c38842d5e05e67004e07ef24ef3e1f1eb5d211ac8d9a6415310f9cf47190720d399294713b0568a42fd9fff8d4789627 SHA512 88ea48c4393a961832babfa4a8cd4edb56e3332cb77d0fa54f4ec2fea9b14b224f98bd14cd47f5c4580db9b2ab367d1bbb914792f089626598826ec1902e0afc
+EBUILD setuptools-67.8.0.ebuild 4562 BLAKE2B ac09a28ba50a886e3b2e22e428a9cce4efde02e8dfeac50a91d92d1033f215c92aaa28c48e3ae97ae06b2a5973d7d462cd6205dba81f6c1049aa6a5ea6f09d03 SHA512 0b994c4015f2cfd8372130247d13f1d015cfcfade71f0de5a6c36be198a6bbca527b5ffaa1f3d9f7c449f4264ac78cf618b9e0332a9dfe754450766d528412d1
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
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..d60048548d3a
--- /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_{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/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 97ee2d4cbcc3..3f31714e497f 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-autodoc-typehints-1.22.gh.tar.gz 35429 BLAKE2B d871de3d3a37b2632e6b43dcb4ce58fbf61bdfdb225650486fdffbbfff4148770f40096815d3e6807f4d3f789c0f7f7fdfef841a3d087f0b12e65671597207e3 SHA512 9fed312b5b63dcbf0b39e226486abd687e68c26eeb7303ee3049251c7007d7c364ceb196672ac16101b1a76493e0a0a4e1d9532e54eec250720a37f0c8f77fda
 DIST sphinx_autodoc_typehints-1.23.0.tar.gz 35945 BLAKE2B 4af9ddd722a1fc59d52009ef46ad7af828d826cce61e0bce260b68045d4abe3b184ffc0368b29f60eba210def8d8b3b37a5455442c156b326d4b9956c6afc32c SHA512 990db1f042913088fddf56cbc9ad5f401f7d886164c348aaf19fd1541fa1566a2d58d1c182e52d839d1dd32606ca3da1191b7062a6ed9c8f04dc6a47efaf5488
-EBUILD sphinx-autodoc-typehints-1.22.ebuild 1077 BLAKE2B 2301b19ee87db876d9244abc8d479c18758029116c155ba8489fdb61c6ae715cb94739cd47fac40ae29444a625e7d5fd4fa7d66aa6ea1423fddcd1457f1e475f SHA512 30317def3dfe5efb8d9c26d92d666f4ceb7b3ab00157b90a66c1cf05606cb2d54be0990f779c23da821f4295b6dd5c70ea10a0aaea8d73e5585e7d7efc912286
-EBUILD sphinx-autodoc-typehints-1.23.0.ebuild 934 BLAKE2B 6a9113b8067e84f69d1c54f5a43329d49416538ecb8aba0e35309a86dd97f58f06d95c9b2badfe1ed4fa6f1e7f37903eab07fa16dd137c4e4fd94d00eba2127c SHA512 629b53201c089965a33991835c42c178ff8da660529907cb2a14f9297d8364463b9cc90a4b5fc28226b035b577db95e1526890ba8bd1fb07f6ede33465636331
+EBUILD sphinx-autodoc-typehints-1.22.ebuild 1071 BLAKE2B e730e47467cf409a1eae7e6aa5e203a986ecd9cc22be43fe6617bfdbd075766eb4577d2812b9456a37f11440f5dbac792ff394b5b847b7ae888d426bf972cc2c SHA512 c66835c68ce571d9b7bee6c57105fde478c26ea7a1a57e2d4173ad6a18be0e1c623364352e6cbe7cc7f95c67177b737d5827e5e6df49d86b351738ad2d0657a4
+EBUILD sphinx-autodoc-typehints-1.23.0.ebuild 928 BLAKE2B bbefd07f74245951b46242b01f26b7e1ac878069e791e27a4ee9aea652c50d6b2aab6131206639f6b29deada8e047a097ad6ff197a3e5c20387d30fdd944a110 SHA512 20117f8a36326ef677a74034dde671e47ca0e8c38c52a985963d1c60705045962ccfb5c3d88d8cfb7e051e4c5e3bdbfba43731f38ee358e6485250bafdd4a845
 MISC metadata.xml 682 BLAKE2B f8b48894f28411a17c73956bb75d43906c893b33d3dc611dfcc46e7a71ac43824aa54f660ab4f49c9870248b2b9ff405a2a3229f92975337e69201868eed3378 SHA512 87a0ea2b2e4cb2b5f0d1593b2c4bd96b46dabb8baae71a6ba18cfd83dedb2a1d5f0ae0f8711144967a5d44015e9ae7ca013dc0aa54e20604633ae062d95649ef
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 0fda833f7698..045071cc5362 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 1f838103f447..b9b671fc562e 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/Manifest b/dev-python/sphinx/Manifest
index c1066e31bc81..1def027fbae8 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -7,7 +7,7 @@ DIST sphinx-6.2.0.gh.tar.gz 6729874 BLAKE2B 6bfa538d01687ebc72a29ea89061362175f5
 DIST sphinx-6.2.1.gh.tar.gz 6729925 BLAKE2B 621ead516dc17cc632e9e752b56b5432547b6a051ede353d690dca0769664fc1c1335ec948f4035cb8c4307a563b4928d2587de3f3ec8d89dacf829a8fd5b95f SHA512 ba56fb9672dc2e156b6cfd0fc2252a989d44b199946a371ec5f1cda5840836b3a58e267ac0973f522479b472dbb07c6c2d7ae6b0c63c9adfbe82d36bd59a9465
 DIST sphinx-7.0.0.gh.tar.gz 6712995 BLAKE2B ad60fba88a25491c4d545767edbcf2aca31c2b11181904bbcd10fea3cb27dc983add3d72e6fab9b0eb68e4fc0eb62d2e7d3f126d2fd8ca70d496921f1149d3a5 SHA512 35fb03b11b9a9f7fabe6d774b6fdb2290d80f8bfdf2b474d8adae92345e29bad0d8506c3e274a3c1e249a1690ebac3135e99ecabaac8531923d5fdbfc296e1c3
 DIST sphinx-7.0.1.gh.tar.gz 6712916 BLAKE2B 7e30804eb5c24559c8ca30e5d8943ad78b426f94c3008ec74de6a541a71a7835d4e83dd69d84df04778f6246840209847ce103863b4dd4109e01bc3a5a50fd84 SHA512 6489778c4953b2c2d9972fa3f07fdb3b361b441e2c9f47282ec9c47f70446e3df66e434690ba816cc6f98838056001d2518f9bd1235e8b07ddba3c1d03a57b76
-EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 412695ce12bfd153cd94fc8041464abccec5efdcea79331650ec8aa5a7637bf51cfa45a2390699e0fadf925e29098d4ff12f686edda2543addec7c89daf81696 SHA512 a3bfff311b043c23e21785e29aec10ecec9898478c0fcf6350a4e10a3db5455b037f5ae173c4a5007cbe92869e7f444971d38b1485dbb3cf10d5804d75743b1e
+EBUILD sphinx-4.5.0-r1.ebuild 4268 BLAKE2B 2e230b059aa2ff16293e2a29c5065ba7b17645791321d9c9bbb07ded6871f627ce946c855baf7272c55ea37e642a01b6d3bfff37d4341a125c4e5be00b3699ce SHA512 fd2fa10bfb9776577d9754dde5edee0d89c892d74de47f23d68698357c1dc35449ba5986a0824ca4231135054c06b7bee366b9a0c4aee10c4dbd6f5daf75a8fa
 EBUILD sphinx-5.3.0.ebuild 4159 BLAKE2B ed77635323232e55afa4a4defcdfaa9b6cbfc4e12f2f36fc3a4e503e740946e22d0e5955306bbf4c78b9be39bab25753f134a246b1ddaadf3f249cc7dca13d2b SHA512 d471fbbf2cdc89ee3df738f74c9d6b2e9d940439aa6a6f74d6ab1fe97edac8d5b8bc256a6c42b194df7dc9197200c969062c3922c0f6de7e70538786c2f69f02
 EBUILD sphinx-6.1.3.ebuild 4248 BLAKE2B 839ade1564f76388f19c66df1f636a80de91039caac5b0100ae594a385a5f5da69d46f199266ae138fdbeea57b1a11b58744545ab258080f69aff1815db0f015 SHA512 5679f036f926b49db0fb4eb6afbc6e5fc1d67092e9a1014b4f5d3da805d2bd73f21f280fee0d0243cda6e3be3b56850431c07e182bb2e7feec7e076c524491b7
 EBUILD sphinx-6.2.0.ebuild 4340 BLAKE2B e02acf740b0998f0fd2ec194c2ec4f2a00ffbd4e981dca97159cb99079422c9f38a84d78e1de287690310686ad48399cf0bd089acc697c73c533600a060e0ab4 SHA512 27518afd58e1ee4f6f801430458df2ca764876fcd51941727341573131d71e55a98603c6a20365c40d93322cb38e63f53fec888887b7150f721c624befefe501
diff --git a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
index 97e87fe600ad..0d56f2330c9b 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_{9..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/Manifest b/dev-python/sphinx_ansible_theme/Manifest
index 3b69113de9d5..fae1fee5900c 100644
--- a/dev-python/sphinx_ansible_theme/Manifest
+++ b/dev-python/sphinx_ansible_theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-ansible-theme-0.10.2.tar.gz 49652 BLAKE2B 76f91af09976c16550e8257698
 DIST sphinx-ansible-theme-0.9.1.tar.gz 34505 BLAKE2B 533e665b30f5aa450e4a2240c55c4992340b9f6ee03d27758bf119dfe2eef987fbd4b98136349af376557d8e9a78e5391a648b9886136995d05410b0c26561f2 SHA512 f78602af8affe7be59988f466cf6a2aa67e174086f338cad855369a7bbee5a76d07bcffa8406dea5a819127b26d69e29b0d90dab38b82524b3e317f9082d0379
 EBUILD sphinx_ansible_theme-0.10.1.ebuild 698 BLAKE2B 81d681edc9881b0d1655cbf0cb8be29c74eabbb8e1bd070e7e7b21bc902caae8456b0e862c37399ab3f31c52ccb35f8036fc8bca8d30deb60e254095ff33ac0f SHA512 540aeb4f837dface6af7d92514dda23975f7c502c1cb1c5175d69edff30b1a321895f7982ebb21c84f7a07e7452663d4dcf4acdee637c91b959f337d91ddc945
 EBUILD sphinx_ansible_theme-0.10.2.ebuild 699 BLAKE2B c7210dce29b2938d5e1987bcf6ff754d70e149a7777bebc9ad78a6c4c791d4c9cb6e0e74c51f2379bd6ccd2ee36c8fce5df4efe55a400861f92882d688caf333 SHA512 1007d3a17840c35aa9de5e15fafdd4005f062772955587c0c8cb94cf5356508a4511f9994ad87fa3d40c24e2c3836b0c363b9c4c4ee75b9f604d6affd57f9e00
-EBUILD sphinx_ansible_theme-0.9.1.ebuild 779 BLAKE2B 0649900093ba4076437645d06a8821c2a086419bf39f8471dbdf705721ef4f103d54ed93da25b183db0657d342a77635b4110d07789b0c2672f088594c0ae898 SHA512 c388741ff715e41dd8a6797663e0a87d2e29f8449460eebb9c7c754691896b12240cacfd257574d62c38b1fa73bcbd7724c317873a815cb2d81c6acd06420c2d
+EBUILD sphinx_ansible_theme-0.9.1.ebuild 713 BLAKE2B b874204957fecd95caf78afcf4d3f5d6f5c791da2cfb5fb8c0ac3e039537080a36e02e820acaa59ff4f5fc4459477ec9c3db9553cc8f0465e6b9cb80a69a8629 SHA512 faf1e4c14faa7a757bbc5cbe6e987d74ab6f3428da0c146e250cf984b58689ec0528c8b3706e888188fc9f870a046b1a7d71230d414fa8ea7ce1039469e23312
 MISC metadata.xml 532 BLAKE2B a684e40deb310344be8b988f801674872c61052843664b13ce22e08d0c38f629a32749fbc31661fe56c997e2d8ad84d0bc689cb671d047025b8ebade6ed9b8c5 SHA512 6562c3cedeae7bf0097119c2c13dd6c6fbb230c5be33927fa101b8daf4f759c8356d2c760cb7fbc880c2b385a60aa314857d656cf02250c62232cebaf1787a15
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 6b2e14dde2ce..e7a356b0bd46 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_{9..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 0045d8272257..ef420c841ec1 100644
--- a/dev-python/sphinxcontrib-log_cabinet/Manifest
+++ b/dev-python/sphinxcontrib-log-cabinet/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-log-cabinet-1.0.1.tar.gz 4072 BLAKE2B 6e237bee5ddcd13dfa0cf5151446a1d3924534009cf8c4b11c064dc454e0687ed03e9b09052332bf8c299d340a3522718704d65ac0fd7bd5eb22d18403b3b369 SHA512 c8529872c4ee783330738babd5027e64a813698ed38fbc693b23e65e5bfa2be815a7e6acfae42bbe003e542002d7d298ee446cab5dcebb3b65d2a25691bde18a
-EBUILD sphinxcontrib-log_cabinet-1.0.1-r1.ebuild 735 BLAKE2B 1d14d52ffbfe0456981798b0f2f1aa886e3b69c288c5a4240161cb0ed289c694067a02991d3b62777a91b57847a04819c26cec45308359106b93a9827cf1f323 SHA512 a5340d6dd32fd8de42b789ae43444194e01337e4d83df7b1b73db0144ccd511df36791816f0f2b0248a69f4c870f6bf6fed97d50283935cb087078cb97d33c4d
+EBUILD sphinxcontrib-log-cabinet-1.0.1-r1.ebuild 680 BLAKE2B 228cb8794ba34bfd4a44618903b285e54bc682105c1ae7a4a882654d406e151eb010cce5e260a4cef15cab215da4058127c6fcbe8100109cb9c888a1f4e86b14 SHA512 eb888cab8af507ce4672e656835b038f15cdfcc8674effd0e0f169954ac9cd339201f1d39d7ede9ead56d5f72f3ef59350a1f94d354725254db583720c11d4b2
 MISC metadata.xml 427 BLAKE2B 0eb6089bfd52a11b5ba031d7e6808283a373543844809bde35eab1a8320ab885531d516a09793c39993bebb03c1cd9bc6fb0bb40d2d425a0f213d9b6e5db76f6 SHA512 a58d1124d0153095c17bf1a1e002d7f3b25267abbe82b8fc7830fba79be8a01fbb83b708145672459f92b144fbcf71cc754f1990327feee1ce28dce48d32a8e9
diff --git a/dev-python/sphinxcontrib-log_cabinet/metadata.xml b/dev-python/sphinxcontrib-log-cabinet/metadata.xml
index 47fa29e551ea..47fa29e551ea 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 a19a6fd4461a..fcd88400478c 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_{9..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/Manifest b/dev-python/sphobjinv/Manifest
index 45aeb5187321..bf4a221636a7 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,3 @@
 DIST sphobjinv-2.3.1.gh.tar.gz 1345653 BLAKE2B 17752829028d2dd249be0afa1a1420a4b6e61afc508f89377171aa11f528f62b15022413a8e665a213f95f3a888a85c5134e1cc7ca27bc3afd6f90bff18ce071 SHA512 7253b8b21e2027ce22013edf76a6cd397dcebf652e235a8af8b82349fb19a2f7df15d33f9f032f195a4b471f5bb5321c7de0fb195a5c0c2ce3847be23da35862
-EBUILD sphobjinv-2.3.1.ebuild 1444 BLAKE2B d195bfd8dc61f5ac8e11d705aff10e83577ce77e3959d9313a497c291debd4a8dc0e8e191883c92eb062e91d5188d4528f58d9d718da84a7b2b2ebd685cc339b SHA512 4f7f270344434bbb832804fdc7675f5a822fc3ad9df13851ce68dc61829a91dcdbd2006da1877617db7804ec5f13302b21b715fb23ff2ec0a311324797881bdb
+EBUILD sphobjinv-2.3.1.ebuild 1438 BLAKE2B a913315da12cf277c4a0dd64e2bd0085d1f7981f5a1eaa548d4debf0a33d32e126eab5b476a60a8c719053238cbf3a593942613abd35d72409b3d2a63f8062c1 SHA512 d01bdbdbce8a3ee4db8ccea889a9d08c9596ba8ab2a4f71e77fb52e7053557f949aa37dc98e6a547c49a3b561240f4cba2a20e8dfac75d808bd643c9a75b5f17
 MISC metadata.xml 876 BLAKE2B 2f3e0b8f207c9c872e7352b3b7fe34b569ef19ccfcd1060e99e71ac871185bffd079d93a2284380658faaa3542440433b40797c86a8b942cfef32eafdcdfa8aa SHA512 7906dda0e70f9d2e92b7e616ea7c79a9cb378cf3bfb58f7c1b7a261feebf587edf0ac76d3c7d18865f9d0e2ea6458667296847d3a9ecad4ae863441c2ee42028
diff --git a/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.3.1.ebuild
index 641fab9eaa6d..b077acbbad71 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 443a247052ec..5767684b9e4a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD sqlalchemy-1.4.48.ebuild 3011 BLAKE2B 927f8ccd0d4d29014dc78e5edf9a12c55f68f368facb6da3bbb44bf16ff7f8b17f379638fa45f42fb69cf9662a67ff88b76830e009ec3574f278d4bd64b1207e SHA512 8323e28bcb86267ec2e6914324238ec0f5640f2434cdd1bb7bde8986d837e53ae42d5dcff1c58cfae30e9064c8b436db53847b8103f121fff2f02271738a5eb4
 EBUILD sqlalchemy-2.0.12.ebuild 4279 BLAKE2B 918997ed54427c9eb4c4e93c134ab1c3d0a9aacfa812fe78f3d05d7697ffedf344610a69c1fe2b1775ec4d661ac320962937a02ee4795670324d6eed34ba5405 SHA512 cb5e3da91d49320229f34208157a3762d5a9a6ed96402b44191e5e9f2eaebec69b71be51e25489fd30ed2931aa9d1e326813c0420b71728403fb8a56f4a9c003
 EBUILD sqlalchemy-2.0.13.ebuild 4287 BLAKE2B 72aa9fc5fcb5eb120d1c472f4907d0f0c0f7ffe2cf6d5f0e598bafc90c9e83bb55abd47a86f6b50009ca77eedab3a82b7c450e3dbd2e193f733556ff5f4df561 SHA512 c401a9d73fe819cadc5827793bd9bb36cee3052c89ef8fb8b2fc20eaf1ca1179c621e6a24a43d8db01654e2e583cdcc58cac767ea8b182093b2641d59aec7fae
+EBUILD sqlalchemy-2.0.15.ebuild 4288 BLAKE2B 00a306c4bba0165a060e5ee8e173ea77466e814e74d815ec32f25aa88f7f14e3c598aeef85df2e89ba9f3f1cdad30740c0ecc13cc8d8eb4bcaed5f7497ce5ab1 SHA512 7d4b7885d47b6c23f236bf39976af3e135a20a465325f3f6b55126f0e7050b5895e718554198d8e2e004b84a63eb19bd212268fee62bba5c7b0617d97b3e560d
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
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..70532f43ab3e
--- /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=( pypy3 python3_{10..11} )
+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/Manifest b/dev-python/statsmodels/Manifest
index 08475cb98537..a51cda49358d 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -2,7 +2,7 @@ AUX statsmodels-0.14.0-test.patch 1156 BLAKE2B 2c6cf40e402a701ea7d49948754e35080
 DIST statsmodels-0.13.2.tar.gz 17874260 BLAKE2B 93f7a308217ba938b3cd2e11d75e8f5ad19e2d4e6ab2abbea702143129bb53e7b9be54864375dbfec805624538bc73850357eb944d6c9a4c1252cc8a7606b904 SHA512 79d8dd63f667d4019e462d93e007a5ef8e11972fe35fb4d657931d6d68f3e35d29978a865682133db12fd6742f3362c2d77dfb5735c82ae454570388dd84d59a
 DIST statsmodels-0.13.5.tar.gz 18364957 BLAKE2B 8357416b015b152612aca88a9ff42b81db4d97f61b1c255bc2baf8978440cd43fa1a5301d1c60e92b3a634008c5c001c00770685864d296587ff75e37d29ff4f SHA512 9aeeea80c69f52459140179523a0155429834b2951325c9781b28f8c4cbbd0593ff1867e2212078f2b898e4da953689c2fe78183d3c7959caa874e9d758b4ea4
 DIST statsmodels-0.14.0.tar.gz 19374614 BLAKE2B b24c8c146ea9ed393da8e839e3c9a80b1ddaa6fe319204f4440b3435c756911bc1b6405544c6ab8e4370fd378ba26715da743e4d082af7774b8cefa8649d6c58 SHA512 876cc45eb4b5badee2ff859df8a45ce7c4f6ab2973d481f58c5b7906ebcdbb56a64769d5dd7a38c7b7415a4ee7cf98cf300b8c623bda9df001b982ff6844d1fd
-EBUILD statsmodels-0.13.2.ebuild 2152 BLAKE2B 05aaa56275a93ad4c9de506af011e167ee2fa84de79554a560fbcf6a80c6be5c4d6352e43faa0a367ac5683fc4332f4af37edfcce33c1a05cfde1163718dbf16 SHA512 3c240d249cb98270ef3eb2c0126efee07ec1c4a7a55e245bce2f3521701cbcda4108a2e93565c13cefef89321ad75838450baa68019096d9f017934b10f0e524
+EBUILD statsmodels-0.13.2.ebuild 2105 BLAKE2B ebbfd31de26ca4720e0f48ef3280ee26947e9709732a052de6b1659ea331fa571b098c778d75c3f92f61955cab105770253f69c1ad933ffbf8469e35778ac7f0 SHA512 baa9718f1f8fe2366057974b7b350b6c34b740bf7a1ddebbf72922c58b4b62f5b5a25560252d9289ab0a128cd136913b99a247c8aee5552982c47060513da237
 EBUILD statsmodels-0.13.5.ebuild 2159 BLAKE2B 7b479f317f1bd94181399ec7bf7c9432f4644210a1353c6fb380aba5381340341ce9e16292f7e1a28df0f3177347a2394bb76ebae634f0016da77d984faef34f SHA512 23b87a4265dba79c50d5a2957cd156451d30bfde9b2821a8ba5132482dd826bcba5a27fb58db74a781e4597779ea88b837f4b47dd03c5b922349b497ccd2aff0
 EBUILD statsmodels-0.14.0.ebuild 2242 BLAKE2B d3298f9012a8ca2cd2f51ebf49712dddd6bb02253c0ff6d2c2eb12879eed437110c49fb22dc6a6938311460742ef0c0eb47631e9895526a31de12a3dc99bbae3 SHA512 4f558f313dcb2abca9d81184088e7f20ce3805e4b44a100f3ba2ee15bcd9060d3c8c19d7c0c81de18934e75eab13ca1815ad33b418caf1ffed426b30923e0909
 MISC metadata.xml 1088 BLAKE2B 285d326203e509fd04364777ffe96f085951fdb7be661e6773f329392c0fa0fc16b1527239586b3abb80458359d15ab00d5eb402b739f947b78dca612ede94ca SHA512 35192e332c6d2aecd1ac611a96ebb13cded9a8f8bdfdd7f0c10b50654d1dda411015444511a69643ee8450742c8f02f5e0bfc5e4ab4ef4da81ffce9231658f4f
diff --git a/dev-python/statsmodels/statsmodels-0.13.2.ebuild b/dev-python/statsmodels/statsmodels-0.13.2.ebuild
index e547b685e3af..95a03c640665 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_{9..10} )
 
-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 ea0375c54081..5c96dafc29e9 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD sybil-5.0.0.ebuild 691 BLAKE2B 34f8a0aa568e148eb6709be3ceabfac4e4d974d9dbfc961ee4d13c8f126ce1aeb5d5453b82ee19c02b7411fffb27ba5dcfea2cfe0224d3646f180e8d8bc34815 SHA512 8b02f6a38c5b4281eabaa5a95e5376770e1629c1ee3c200770e8e7c8628f454ffbab741f343e3330eff0f3237f6a2647f798f6485581dbd50182de41eb0639bf
 EBUILD sybil-5.0.1.ebuild 736 BLAKE2B cb8e1702e0851e5e9bef2d169978ff6e17ae27bf073f0a893b52765e5fa93358abe0fa680de6a051262adb27f05913dd5726570f3218c71eb611f24943ebec2d SHA512 c64655d55d7e9af469da855e88717e3731d410e738a836b7e8f3223d1763f7d067b6888e7e28549c3f064e0831219062297cc7b6c85a7281b5bedc835a257fc4
+EBUILD sybil-5.0.2.ebuild 737 BLAKE2B 39526ffc904a918d85d327bdb9a8cce6a3909982e506ff856b681dc5d34c68812a822c987fb9fa84bc13eb5b24f1c5fccc6960751bfa80851ac7c27c1ad7f943 SHA512 4cb9c09e843ec3d2828fa07e76740286f5e5f47cb845a70cc9a6b5fdaac9ffdebe2a14d04bf36a0bf0a5611c0d356604904771d21d40c2a244c7c833b5964b1c
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
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/tldextract/Manifest b/dev-python/tldextract/Manifest
index b18b2d0ef251..7d362533247c 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -2,8 +2,10 @@ 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
 EBUILD tldextract-3.4.0.ebuild 805 BLAKE2B f572853301263e96298f36fc83fe5bc2b32f28980f6f1bee9e936663f98fee48af63bc1fb46b2f592feed76a6f704948ab52c80c0bdb2250c91db7a08d4f8ae4 SHA512 4baac3a4709a29d92a90b4b20473d9236e98c7540b29a7210485652c0b99f118007d122a1cdbbf7cea63e617473efcd80c5def827b07cc07d53b75d8fa43c686
 EBUILD tldextract-3.4.1.ebuild 806 BLAKE2B a02cfd636006b8f9c691eb025f1848d95f31be6bc64038c27ebab159905354f42d5dd74e442b8c00aa8175d0db30bb3ba24b58db67b13941b095252fd5723aeb SHA512 167c7c382fc28a76af036d1b044989482dd1a78b44fcc7c65728d55ff1d570e0fde799f499cd17b86b875cdf03b43e56bcb69721420abf230fbddad8a2c96e58
 EBUILD tldextract-3.4.2.ebuild 807 BLAKE2B 6c74f9908b049534cc924499695f5043c3660c380e8a0a545e4f0568411a83584fffa88e64856f306df2fe5aef6dceab8b78dd7b249591bddfcb833edc9796b2 SHA512 e9ac62047f33f7790faa925e8c558392807a198ad972cd73b100832f2032b75b4020efb765d824a0a423a09b50892961cb1fc6558510a55dc02c286d6356530d
 EBUILD tldextract-3.4.3.ebuild 807 BLAKE2B 6c74f9908b049534cc924499695f5043c3660c380e8a0a545e4f0568411a83584fffa88e64856f306df2fe5aef6dceab8b78dd7b249591bddfcb833edc9796b2 SHA512 e9ac62047f33f7790faa925e8c558392807a198ad972cd73b100832f2032b75b4020efb765d824a0a423a09b50892961cb1fc6558510a55dc02c286d6356530d
+EBUILD tldextract-3.4.4.ebuild 807 BLAKE2B 6c74f9908b049534cc924499695f5043c3660c380e8a0a545e4f0568411a83584fffa88e64856f306df2fe5aef6dceab8b78dd7b249591bddfcb833edc9796b2 SHA512 e9ac62047f33f7790faa925e8c558392807a198ad972cd73b100832f2032b75b4020efb765d824a0a423a09b50892961cb1fc6558510a55dc02c286d6356530d
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
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 c3cd663f8f1c..314be0d969c5 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD trimesh-3.21.6.ebuild 1870 BLAKE2B a563dea7d00401f901d5551ff43ebe8abf7de18b74ab906c0bf55a7819132b57903270654c48f4694ba37fcd64c481482548a9bb4aa3e01999196de2659d34aa SHA512 0a4c0d01cfe7322d508ed8a0839f4ec42f4d0d8411f7f7a1c30696999e8424e2c4cfda76645dcfd809f2ae1cd4858484ff2bc5d02b565ace1a30571f115a75d8
+EBUILD trimesh-3.21.7.ebuild 1872 BLAKE2B 7b70e6481b5ae896d35b3af6d04ce6ff0e7d41ae0c934a80e071ec1ca51a922b350d1ddefb467ae45ffb91ea2dc14c005dd0960e69d85664c58f8585a37a4089 SHA512 ce661aebc60fdacbf8cb23d0adf3d101f827a3b6e158ff761cc5400b6215437ea74736e252abf757e8853e9110d790851d34dc3b79df25b0e419655ec0a3409f
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
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/Manifest b/dev-python/vdirsyncer/Manifest
index fb86c3d5cfbb..2a98b4cf69fd 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,6 +1,6 @@
 AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590ccef68bb9bed8c84c6682471ba53886bc80011990086c9b51673e272ce15fd9096847dab6bb9a6087670e5b01417cbc981 SHA512 00d4f334e1def6295f2b1aacfc2a7fd33f250a0bee39957288fe83a5179c0461f71273051687b53435b0cdd78a3ece618b1dec5a8e253cec3f3c3733528dba10
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
 DIST vdirsyncer-0.19.1.tar.gz 122699 BLAKE2B 31fd6351046f5e668312594fa698a647e67f4b66e989a60c2bc6312748f09ea7971d3b5c04ceacbedbb7618e75febfdf175a82f286ca9425f14828ff044997d5 SHA512 2b0917bf69cfa298600b6b35b50db12ca57e1a963baf2ea9839a3c2f9f686f2f83f47c01e44ad2e12287ecfd470fe1a9ee4a756c0f8985236c2fe8d0454b6a15
-EBUILD vdirsyncer-0.18.0-r4.ebuild 1888 BLAKE2B 83a9878edf7e5ac50914894a4c22465fe17555ede231c2a1d64d231729579414aa48444781d1fa5d6f07c455ac4ce2b549bcb2b44f7fa25e22e2019ac5e8f493 SHA512 488356f5c62424e7ee6c012c4d3063e01bb3af2a1300d4091879825500f8a65f81aafc1be0d3c7ae90892660dbd8477d041f94db9ca04ca1878008935512d1e4
+EBUILD vdirsyncer-0.18.0-r4.ebuild 1841 BLAKE2B c14dd8e91c0ae6248bd650ecb48652e9d2e395b44935b1b5e99d2cd68129ff36d06fbd93ed51fd1c864c500c1be79f230e896f95f4dd37d599390848b4bbc57e SHA512 f36826d85cec50eb44d2a101db2e949519d9e53a55db90280ef3ddad0276ac52bc72c8b1ff33e2e1b2b8cf307a0252e4037b011558739a65eaec5f21d3b310c1
 EBUILD vdirsyncer-0.19.1.ebuild 1799 BLAKE2B 21a10bd8c59fa705ac7c43d3d28f7d61a84842a0beb9d8d6fa16b048af0df78bb77c08eeac0001d1241c1e54d5367bda4b5b0e5af36994700e2f4497b34f624e SHA512 03a078310bf86992fa3e7ac6d1ed106e364829839eb96a14e8e42cd4908aec4190034e36ecb311387ecd321ba50ac6ce36d105c96bec61edcf78534b646cd2ea
 MISC metadata.xml 475 BLAKE2B 368524aa96e63a09f0bb25a2d2cfd0a20fd80a7723faa3c076e0a3a10f4fc0e06be1c0521afedbcfd39fc99e2e726627c7ad13622ceefa2fd90d317756386e3e SHA512 5a4150a6e7f0ad92c1b80291e5700f875e619b6b155903189a97ca7f820fff2b656309a27fcd7bae94d5fe6a7cd36cb93633ff0cc0ae7fcaac1399a3f132bb99
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
index 1e6f44020971..8a9cad263bff 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_{9..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/xarray/Manifest b/dev-python/xarray/Manifest
index 6ca010798f7f..5dac25721ac6 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD xarray-2023.3.0.ebuild 1218 BLAKE2B cc742396dc3aa27380543fafc60fa90d7ba5213d32e837d2437a2718aea432a9707a8f8e77e427e677377dda5ff9759c5d316dddc12020bb9aefad42c33bf4b4 SHA512 adf4a2ec90ba9918f658e9ee935e82441bead229879a961287a29c7a946c18dbbf75f320528e1e05b64f68d7646e58660affe457c3775d9556a55dfc2da32830
 EBUILD xarray-2023.4.2.ebuild 1823 BLAKE2B 4bf1e3d7abaad1fd66db35eb0e75596deb8587a52eb0503d023f9b3ef7f31bfcc895da241323849b0a97adfbe8a00b1f89b212ad30adc86d2d53c333bad6b8ba SHA512 b57d14a46f5efbe17d1806f69095d1cfe99c5eddd08beac80635b8ee0e2438ae6bda0af4c08baec26766a7755fba828c3c2c2a830ae6f24db745c65a797ef390
+EBUILD xarray-2023.5.0.ebuild 1824 BLAKE2B 1d6ade565018e67ef55e6bb444a0b2b46a0147d47896e058f47a17969480af79ed74e0f65295832bb91074bb3050850597073cba3a600dceaa76eb33ac4c4a7b SHA512 b43dea73b156cf9439dec5648ccdd6f3f86a68f77769e77940918d2fab6b3e1209d63aca67508efa3fcb13a332fbfc8b0e78fdfb215ac2f4fd5f37de642ec200
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
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	V3n3RiX <venerix@koprulu.sector>	2023-05-20 10:17:50 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-20 10:17:50 +0100
commit	399fa07bfac673a8846466b16c76549e329b55b8 (patch)
tree	29af17ef91f1bd986b8e615a96b61db7fad5df14 /dev-python
parent	388a0747e5972613060d5ca13955b5cd7132533d (diff)