gentoo auto-resync : 21:02:2023 - 14:24:25

104 files changed, 766 insertions, 1720 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b21dcbc34bde..ac08c82d7a98 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 0be5a143f32b..633bb2472684 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,7 +1,7 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
 AUX aesara-2.8.10-fix-tuple.patch 649 BLAKE2B bfc2b2971fdaa452c5d14d75f68af5931b979dcb2951baf8bb1cf759058b4c0f341233b33d907722302ea8374cbd965e4d09e87f069ee2b1a558bf4e9a7309c9 SHA512 2c5846c723f214a8f623593f518194edb113f0d7c64ab1d69d6e4c5278125910f1c775cffdb46871d23ddf5332bbd84f252ed58e2560663c0c36520f1fb72372
 DIST aesara-rel-2.8.10.gh.tar.gz 4342183 BLAKE2B 3e6dcb362d613ce9fb621408d3d7c6f6d3f30e52fe39f484fbe6c9d834d59b428e736b13275d99b204774c719cc532fc42e877685b0639b344fa5b2965dfe602 SHA512 360419a79eb0571d431bb146e5fcf2d63a9c8b40e3ee0a31d7d38aeeceaa47da10ab3f640a4b4011f0a9b28438f20a0feb3ea64d07289d0e9513cb32d066820b
-DIST aesara-rel-2.8.11.gh.tar.gz 4680102 BLAKE2B 856a8a37d148ad657c463fcf3792cabb41f670b67a00e691eb9cde0c615985080fd3c8019addb4b74c0595611930b11d4aad7faabb60b5d77a71ec7f9258f5a8 SHA512 83b19c002f6acf02cba6e08ca02c9166251473a3f913207800644e62e14c2309a7bdf691e0f55023d093c5c12281f5cfc4d1dea7022617753519f00b7011ebc0
+DIST aesara-rel-2.8.11.gh.tar.gz 4680093 BLAKE2B 29409c49d2d31e9a51d0a2d09a50b85ae3195df7fdb2722abcefcdf36dcd429f4e3b5c483e4bd8a0789eeefdcff3ea8f057583e69cd7c216aa6c5292dd3630c3 SHA512 58298b9cb94e4e9eb025f151de7352c6c8b91e8946ddb98384dcae72977107607e101ef42c63a44d75020b40175041e1b7fdd030b733d80b6a102a265532d337
 DIST aesara-rel-2.8.9.gh.tar.gz 4351952 BLAKE2B ffdc3d33caba5cf5edd3dd15e62cd295dd23f944ac6d76461e9e43717a4126669391dadfee51c6117911dc4236e8787d3e9ab712a0fcbd1dcb137e64f9f994c4 SHA512 3fb4374899ab71366961a07c750f594505467cdab01b6851b36d1dd924b816117ebe488a6cae548650df393c8447de69e21ce2cf6eafe34e951b98f27c3a4f6c
 EBUILD aesara-2.8.10.ebuild 3575 BLAKE2B 3db001cc8b897038082f9da3993fee3cee6365c6b48fb0e1cfb2d4d6e21c709aa188859df49dc6e178dd3f69c3abbf808f513c70d18c45ef2e7e698d86961db7 SHA512 95ad769ad42dabbe16097bd9484d318e03022de4d975295ad9f0e5532cd39b9c47b89f99cbd0edba713e2a36b44dfdf1dbc9e802822494f2062a3d5fef2d9104
 EBUILD aesara-2.8.11.ebuild 3468 BLAKE2B 1e002e2237754f13aa42f9f80f382ac562207965ea1e2a78226308add5fea9afd6541f80e116980dd99d019e92b202e968ebb1fe804dda2e0dc4ea3a71203e7d SHA512 6dd5533c230103be15377f6df0fec914dbfc10ce42dd50a4a54d47ef25776fdfcf3d33bc17df8c164ee627863d0ccd77b32310d1819bce538035ad67d485fe1c
diff --git a/dev-python/async-lru/Manifest b/dev-python/async-lru/Manifest
index 45ed9f14b0b5..c9c051c208cd 100644
--- a/dev-python/async-lru/Manifest
+++ b/dev-python/async-lru/Manifest
@@ -1,7 +1,9 @@
 DIST async-lru-1.0.3.gh.tar.gz 10709 BLAKE2B 437880c419d0d8df5c790ff9b93d0b608dacba1847fc0974d35f89ff97bdd07589edc5371c729889791cb05cd8ec684764ecedc6d0d36b05ee930f885570095c SHA512 530c6e1f7a1ecc8a78cac927ccb9dfc2e394498a6ed3f54e73e4e9af48ef26ddeaad56a056a50b3c3974324af69b393cd94b1f4d20e3a2944b217c03a6bd6394
 DIST async-lru-2.0.0.gh.tar.gz 11119 BLAKE2B 7bfc174ec68ce8a3ad7de94c6eb555aa53be5561c7376bf8149e91f9d8f08361f4b51ba45cecaa77cc89c5c7fc4a225f71fd56878cf64647f7cc82a06ec76b02 SHA512 dbbd4f63d488bde8d4e15b205bca2850c8992d67491c5c0d2c245ed2bc1005df523f837c736db96b6cdcad22c9cf409111040e9d3a86a38c5b627aa256a6b5a6
 DIST async-lru-2.0.1.gh.tar.gz 11150 BLAKE2B 034da5aee6c7d7177c9c878d22617aa0aecd143271319fbe5c0fdd346febef73b4d4e3b2293dbf6a522474cb95cde574a0250bde93c4749f1b4c93bb1db449a5 SHA512 8bb4698320534d722fe1978f0d3402c886dd391caa974afc2be70eb323855b37b1e5b5936bea14b118b78d5c18363306996530014a0ea010150ff464a6531b68
+DIST async-lru-2.0.2.gh.tar.gz 11040 BLAKE2B dc1dfb12189cdcf8283b77d2b451031e691b1fd833e34df450ce87fd496b57d5a04a7f6ca183bb07d7e820f68cafade44237e626e3694d732df40dbf38f22baf SHA512 ce1f9f241200dd05d44196f06e688c2852fbe1bb2356f5611dbc9ac8109e1313ecdcccbba70944e936aa6bc59864d9cc339daaa58416ec0850f3b2afd17123d3
 EBUILD async-lru-1.0.3.ebuild 808 BLAKE2B cb264acc1a5776f543125d25df9c631c1ee10031f89a97527cdcf486cefd39cc0380a8f16823836b0621d9ad61fa8d75b882b53bf85e2e0e2afb2a9565c99d01 SHA512 8bea72c4ec78e9ba1de2a0a4789c3e5f5dd8fb05adeaae6605faabd4c963711558ef6d0f37150d909af15255523fd699804d6b0b466685d6882915b721f6867c
 EBUILD async-lru-2.0.0.ebuild 876 BLAKE2B e42a6411f9781394078d78e2f628591b3dd1e897d275fb3766494cf7cb94f892ce761ad9d5a2c1b8a1c8fa35cb7e50211a183163dfd1e4d9f74b3a2ca28932f1 SHA512 70c6ec17ec4e02d0bed480a471631c2fcadcdcb28bc1800a391cbbf2fce89f24098fe8443f2b4f1fa4b3d59a176ddca8d9ae0e5b8825b83574f20d08252e47b0
 EBUILD async-lru-2.0.1.ebuild 877 BLAKE2B 3ce4b9506cb4653cce7f00937d0e119eac52c4d19de1816c8e5659fcf139af0bc01e320c6ad340cefebdc44c4970ef68448ac3ed7ee27a41e264360a0b6e1415 SHA512 b5a2ad9338fcbe04c2106c37709dbe4edf59591a0d9b7ee3beb9ce1adbe2ec40f5e4fe9868bd8594e35544e7d2a6d1779c50cc1f493ae861886cc7866c75acce
+EBUILD async-lru-2.0.2.ebuild 831 BLAKE2B 0543d3017ff3f4a533c9ec7ae3e9042bd4d445fa8e80e0d1a7515cadd1817ea5cd85348ab03c8a62d7c46fd962d5f2ca103037b5b25047600484ec29af95ceae SHA512 3841b31813581d4fcfa3f589a785ad5930e74a61e8369af42eda6064a3bf0c72b822fb4240eac5de647f3e3421c0d6b7e8b636ba56d4924a600076626b7f0762
 MISC metadata.xml 373 BLAKE2B bb8b67d9df0a86ac3a7d834e79bbc8a907d467e567f353b29427c9a36b11cc79eaa4d1b6f8cef9a43e632f7d333af72dcc1bc579922a1aabfc47cdffc7bd922a SHA512 c6c089b381a5c572b6ecc2907f2e90ee2f581516ac66a6f901d32990db5c8086eefcc97f80a90c9b83504934489c3440cac86ebbc0cbd76801510fba1a9f0ed3
diff --git a/dev-python/async-lru/async-lru-2.0.2.ebuild b/dev-python/async-lru/async-lru-2.0.2.ebuild
new file mode 100644
index 000000000000..a248775df733
--- /dev/null
+++ b/dev-python/async-lru/async-lru-2.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple lru_cache for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/async-lru/
+	https://pypi.org/project/async-lru/
+"
+SRC_URI="
+	https://github.com/aio-libs/async-lru/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cache-clear::' \
+		-e 's:--no-cov-on-fail --cov=async_lru --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index ef73900b8396..572862fdd1f6 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -2,8 +2,10 @@ DIST bitarray-2.6.2.tar.gz 103565 BLAKE2B 07aef624bc7d36e0631082688f9803f7fb3d4c
 DIST bitarray-2.7.0.tar.gz 120536 BLAKE2B e8e518a8293a22c81decbf3bb8ecc83d3796023bc6e3e5b75617ccc6c13b291d27d5a707d9a88e361329fa36e6f0363f4330b382b35236079f98052154bd5750 SHA512 762628d3b24315619176bf7ceaef95ba83fc87bb49c0daa23503fcb5dd54d447b4950b75b4923fbeaace2ee8a3037f228184ca5978fc8c782eb9eb3e7dd65d8d
 DIST bitarray-2.7.1.tar.gz 120656 BLAKE2B 3daeb4ad02aebbd22929cc755eadcc5bc0d7bc779c269d5e2e9de3dcc9349d3f73179cc5d5a27679dc9682127b89c32af18fd3c96f5fb03fd5325db34751e479 SHA512 ead010745825ee8758a3028267a975b92833c2d5ec76d8a1655c11ade6a76a56df8887e43342be5d4569dcb8e8c0f6534ab70bf850b0ae5a07c0189ce5feed25
 DIST bitarray-2.7.2.tar.gz 121846 BLAKE2B 542a1b3e7b7f3c8da42db93e5ee516c6138386508044ce81177bfaa2ef60713e3768d8e08e90c6619e30f685f4b5efb9fe3eabb2b8208ee0570203e94a4d3c7d SHA512 42bf4d43fefcf5d8500a004c83261b533c2e4ed486c3fa79256b99b8a0ce00873357621edf9270ce2c7ec704242ca96226e33285d9620f01aa5175d5d7cba00c
+DIST bitarray-2.7.3.tar.gz 123574 BLAKE2B 9a7a1b0025a7853434ae5e1c6e7bc5302668016f3cf8d569376644ced092ab1b3c28eeaabdf9d51d604e98a3f68f8f8d3002a87cc4dbfd897e30e6b162adf4aa SHA512 4ace2bfe78e06723bedbc263c7b2b163bbc5c35bde84f286390cbfffc8c513bbd4a4f5f775e6d0a863ded7b24cb555c7784e7dd067c3b9125abd8d62863ac684
 EBUILD bitarray-2.6.2.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
 EBUILD bitarray-2.7.0.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
 EBUILD bitarray-2.7.1.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
 EBUILD bitarray-2.7.2.ebuild 527 BLAKE2B 41ec3ce94745aeb01f709d248ed029fc65941054feb60451187904740bf83370ff8e2925c50967de5cf7639f588fa368a950620aa64bad413907bcc2abf065e1 SHA512 9a76abb06c1aae677622f96919ad4c0f9af82c7d25f56c012b04317c9ff6d5950965d4a802870a0561ecb2326afa25d365cc6e6518dd56afb162e71abdd51f0d
+EBUILD bitarray-2.7.3.ebuild 527 BLAKE2B 41ec3ce94745aeb01f709d248ed029fc65941054feb60451187904740bf83370ff8e2925c50967de5cf7639f588fa368a950620aa64bad413907bcc2abf065e1 SHA512 9a76abb06c1aae677622f96919ad4c0f9af82c7d25f56c012b04317c9ff6d5950965d4a802870a0561ecb2326afa25d365cc6e6518dd56afb162e71abdd51f0d
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.7.3.ebuild b/dev-python/bitarray/bitarray-2.7.3.ebuild
new file mode 100644
index 000000000000..fa92ae1db01c
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.7.3.ebuild
@@ -0,0 +1,23 @@
+# 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="Efficient arrays of booleans -- C extension"
+HOMEPAGE="
+	https://github.com/ilanschnell/bitarray/
+	https://pypi.org/project/bitarray/
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6c15dcf06d93..7931ce770d25 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,8 @@
-DIST boto3-1.26.59.gh.tar.gz 594565 BLAKE2B 90c5fe950da7fabc46a4c34e0a77997cfc643273f6b3c1afed6caad3415486b25a6610c8fb9d3f3450b4f3b73e45cfec5d6b1f02666dbd2608944e2db81a955b SHA512 e4dff5978e41a9f4c29ef131d7b8c1f0ec625d9fc77a8cff9ce3c6d5a00d68e75b62da34b418252ddfeedf6302332edd8a30d88401ea393d0de3add64ab5cc40
-DIST boto3-1.26.64.gh.tar.gz 597913 BLAKE2B f3dc63388cf4055c58610eaf980c10ff4d297c6f00f89fe0b46e6b764fba502b7fd85b71421a9d21f1930b668f95aaf2fa174389e5067901d749babf582a8033 SHA512 17ed0e655706f29ed34e1d60a9913d74ab0098ba8085ea76bafb5fcd1bfde91c2efd95d2f3f3e6bcd1b6ef7bed85f9001ba484c01a0251219ea879543a8f2b47
 DIST boto3-1.26.69.gh.tar.gz 600296 BLAKE2B 8c37d9c818e29617defed964271436be2ffa54f8a634661d6a9fc665d1b77a041d83bcba153d5c0dffe90c4185e0a163e9141880cd8147964f7ed479b975ecb2 SHA512 8635afb8c20c3534c36551eb6004676ebcee987836e494b8a67673ae16f4dee8d8efb83e632c6df2e0f07827965bcc9b8e72c159657ff72f1c9c1f52ccd49a16
-DIST boto3-1.26.70.gh.tar.gz 600798 BLAKE2B b55125e70865f73b8ba5e7945eca6a975f47cf5e80ee876bb757adb72f611a2a18a33dbc619fe8f76c40e63cadaf5f6ea923c8310225b4f662c5c2e300aef375 SHA512 80961a68437a32cb0d7bbfd3e24942fa939d0e8a62884d525e4cea6cc9e152749b1481d0c8cc832ec26407cb2dc46a1a40eec81539e7c55c635c810c595108d5
-DIST boto3-1.26.71.gh.tar.gz 601272 BLAKE2B ca2feb8c8a733033338ae50a7a9bac3779afc233fbd8e55c75a1e9bb87e224c789d22b940b68e1f90405886cceef60f860c33f7d99a64b288a29f8377eaa8815 SHA512 ca4eeaa29f0d025a6e0d7e55680f8c6ca231cd8616a373ca60a84d51f271750b05640b71ea97bebd539e762efe7a714f86e1f3c142620996240df02ef7cfac48
-DIST boto3-1.26.72.gh.tar.gz 601919 BLAKE2B 7a0d7e1e2cb2a2085e641127807aa55677c778aee7a86daded4d6c57cf430ae9a610fbce03527911f9c9be775cf5229451668c6e600635e87d5d21690e52e8ad SHA512 859c2a5260805eaf86ca16d94f1b58d7047f1a1c911b9c553c4a2f8a0902e1b5cd96885eed64865f1a8795552744b9f4e39382ebe0c681939ea6e4119a81b474
-DIST boto3-1.26.73.gh.tar.gz 602354 BLAKE2B 2a8a617011e0a06dcf488c44863489fd3486650e4b4f349af505571ffa2e3beaa15147a82f22316ed7942e3b9f179e2cbf3249203bfd80dc3ca3a3789966958f SHA512 21ee634438b29d03402f9776f982331806c0dadf7186f28556a9aa0a4e1fb47730c280bc50a4fdf92c50ce683806c979339a7ff4b62e654b8314b26a9b483743
 DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
-EBUILD boto3-1.26.59.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
-EBUILD boto3-1.26.64.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.69.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.70.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.71.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.72.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.73.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+DIST boto3-1.26.75.gh.tar.gz 602878 BLAKE2B 8bce90fd5b6474316922a6da571dfe27a0d5c15743f05c184314d74ae2323635a71d0b7adf02ff7c8ebdea1cfbcb8e730c1d97de96b29fcaa4d178645c760748 SHA512 5d5cbb5e9606aae1a90c5766315c120f799a1cae528b1cc5d052c18b70c276524d9ffb077a662273d30ffa3fff86405c00ec35718bc510505c3fa6f7edc01ad0
+EBUILD boto3-1.26.69.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.74.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.75.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.59.ebuild b/dev-python/boto3/boto3-1.26.59.ebuild
deleted file mode 100644
index d6d605bdb0c6..000000000000
--- a/dev-python/boto3/boto3-1.26.59.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.69.ebuild b/dev-python/boto3/boto3-1.26.69.ebuild
index 9523f65d5fb9..d6d605bdb0c6 100644
--- a/dev-python/boto3/boto3-1.26.69.ebuild
+++ b/dev-python/boto3/boto3-1.26.69.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.70.ebuild b/dev-python/boto3/boto3-1.26.70.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.70.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.71.ebuild b/dev-python/boto3/boto3-1.26.71.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.71.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.72.ebuild b/dev-python/boto3/boto3-1.26.72.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.72.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.73.ebuild b/dev-python/boto3/boto3-1.26.73.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.73.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.64.ebuild b/dev-python/boto3/boto3-1.26.75.ebuild
index 9523f65d5fb9..9523f65d5fb9 100644
--- a/dev-python/boto3/boto3-1.26.64.ebuild
+++ b/dev-python/boto3/boto3-1.26.75.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d217f60c65f6..723ed008d3dd 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,18 +1,8 @@
-DIST botocore-1.29.59.gh.tar.gz 11131182 BLAKE2B fa85e1f8dc3c366f7a7fb3e9b06dd298b1ad62be882891df3414289aa9e88bff72753690a1438e6040aefb7cafa1718a70c940e8cd2b4e743df44013b5748ef6 SHA512 9a4811b44c67652cacc899d1d84d4db1305cb60e73dd47d7f543b85ec37f921cab00a51d67b48ab6a215be8f7543e30c54585e0fb337085e1b75774b053c4bf3
-DIST botocore-1.29.64.gh.tar.gz 11141125 BLAKE2B 955c7ac0630bd8df8004a0a3d0ec64a7491aee7d68e63a65c62c9fe7a4362aed7bd74ca967cd8550ead458e42a858a428f0db8922a337c83cd680fcd1d1b62c3 SHA512 bb8e177f335e600389123f26788711f4a94c4943a4d80c6195db03bb3cf9489b2a8b0e42d429635c6c8c501df6c27b4177e9ef71e748b0c63874e6682bf2e8e9
 DIST botocore-1.29.69.gh.tar.gz 11140109 BLAKE2B 5a91e6d425f4a5f424f95fd9bcd893c06fd42eb2a34ae870a76f0a28ee59771a8e1759a8afa959592a0ae7537229d791805539125890d17d3f4a33bb0618e76d SHA512 30d538591b25aae82e93352f4eda2d76eda6d02604cdbe822cd5f7559cfa268e2245b5cfb8ba6875e5e3a35cad2bef7210bbe03276236871441515cdf6ff2ece
-DIST botocore-1.29.70.gh.tar.gz 11145631 BLAKE2B 9f1d65e7ecb0c2b436a6260613f7d7cdcf3a01b563042e1dd6997a308f0b7179582f11447b0e3785c2cf8c801bc920f3a850c9b290a78a183bf910189a705732 SHA512 28b375ab94619872d0e9d4331caa687ddaa24c6cce8a66af887dfb308583ff8ad1cb5d78cadc50eb69fcd5ddd50fc1c94b70f128f9ae83ad166596140c45ea81
-DIST botocore-1.29.71.gh.tar.gz 11142820 BLAKE2B bc33e29023b95e1482e094173898952bd2e3335ca641416ac4ba5e608b2146333e347aa7fcb7a23dd9c3d5dbc8a092fd2345c91a74b49a9f8b08477e64798c18 SHA512 48a851434e35391e56bb3a8a803291287535a7d15d3b5b1a83c253b0bba1ca3621bd6da5e027ee0485f52eebbce523d1962fb660850663a6b19814e17be443af
-DIST botocore-1.29.72.gh.tar.gz 11147118 BLAKE2B ad72456166933dcb540ed7f4fc622c7e1ef1601846b102372bc990e9985699de82da5b629043fc975e287a49cc65383c0adc97737ff831ccb4ea569c148593bf SHA512 64af7f0efe667a175119030cf30524ad09cc29c8447026875286ec2706e6f3fbb2beb90f300675dac27532407a5439d5a0e3d967841b5a58d76f079cdbc99577
-DIST botocore-1.29.73.gh.tar.gz 11152779 BLAKE2B 5324b720e9cd00f51a8722679b2c0edd98cddbff4c940c864ddbda42804c45b7b0f6b720d1ecdb2d41b53c37c19cc2894d93e4906f1bc9bfda07dffa721b5fb2 SHA512 a226f20eaafd3ef40264999e6604475a86b6a538f5435d12c3f0474363288e6abbe0a2e8068296ce5afcdfbbc24c56991718f7fc12edbdc399938d57a70003d8
 DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
-EBUILD botocore-1.29.59.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
-EBUILD botocore-1.29.64.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.69.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.70.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.71.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.72.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.73.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+DIST botocore-1.29.75.gh.tar.gz 11152953 BLAKE2B 69c9c520f1caa97d931bc535261e14fb07ca1cd8ae5ba8edcb25eceb97c2dc367bf93de7aa19f87c042c69ece36a87efddb5b7495790ab5d6c6ca48bc99f7d2d SHA512 9778771373b675f6d6f0df04311b3b9bc53268a4628e0cb88737e70346a3a18efdca3a6d3325e2b99bcf0054d5486000fb28d3ed64cad181f8df80d2a692f24b
+EBUILD botocore-1.29.69.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.74.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.75.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.59.ebuild b/dev-python/botocore/botocore-1.29.59.ebuild
deleted file mode 100644
index 5afa7a9459c5..000000000000
--- a/dev-python/botocore/botocore-1.29.59.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.69.ebuild b/dev-python/botocore/botocore-1.29.69.ebuild
index 0f4daaa48e81..5afa7a9459c5 100644
--- a/dev-python/botocore/botocore-1.29.69.ebuild
+++ b/dev-python/botocore/botocore-1.29.69.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.70.ebuild b/dev-python/botocore/botocore-1.29.70.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.70.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.71.ebuild b/dev-python/botocore/botocore-1.29.71.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.71.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.72.ebuild b/dev-python/botocore/botocore-1.29.72.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.72.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.73.ebuild b/dev-python/botocore/botocore-1.29.73.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.73.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.64.ebuild b/dev-python/botocore/botocore-1.29.75.ebuild
index 0f4daaa48e81..0f4daaa48e81 100644
--- a/dev-python/botocore/botocore-1.29.64.ebuild
+++ b/dev-python/botocore/botocore-1.29.75.ebuild
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index dacd0a9a9f59..e8613b20519b 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,3 @@
-DIST bottleneck-1.3.5.gh.tar.gz 118989 BLAKE2B 5b9338a77cb3f0253348f45e641dca9fce11b50fb632e697272203870dd604730c08f1adc94ebf9c6c21f551e3f06b5492bcb036d6f40eaec8853d08ca298873 SHA512 9a0f224337fd9d5c741a1e469197be26923eaffb143eddfe0969128ddc233c799da6a5f2ba4ef22f6267cf93e7f748c140fbb16f57149ad327c47fe87ffc3346
 DIST bottleneck-1.3.6.gh.tar.gz 119180 BLAKE2B 8ba4ccb260731b1583eb62249fa0bdf8d25b96c978f5ff91003aaf965b0f5f5d000fb2a049f70e86266ebeb6e748cadd8e7d0ccafad1ed1a50f6aba18452c97a SHA512 0c0af2ee5ca77f86f855800748a4ce4c0fe85f9da445aeeaaffabdcdc0e2c47b18c5590b208cb8aed52d4ec4a1aa9c023588d11d1c5aa581e2c00d3d4c1ba73c
-EBUILD bottleneck-1.3.5-r1.ebuild 913 BLAKE2B 94860efb2383691cc7e58920fdbe4591e3f63366fd703a46527bb5fa740d704d5507e87d5d4f22af64c40759f28b840bdbd01419af2c68691fa3e9f77cc925bd SHA512 592c0ed4e137c9199d4370bb7d725c04ff3eba9a6361c9e2885a1ef1dbf2a7e4c7c29172c07d8d487642af206b6e691219ce04bc863209f996eab58131b9c99e
 EBUILD bottleneck-1.3.6.ebuild 923 BLAKE2B eeb0b9d516c32e8185cd23df2cd7ee06752e1ce149dc1ead6ae3243d4fd3d2d8d7ec0fa0766090c7a622150c182f527fd7397704d3f7bded83d2e80c52c2eb63 SHA512 35152cacf70d904c16bc9b0ce1a5e0e247e0d656bd0ea9ab1dff00643bda0345f49ba20f5c0ecd897b0dbc79b2e1f95570ffd3690b48ed781a8fff57918e384b
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.5-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.5-r1.ebuild
deleted file mode 100644
index 340803ba62a9..000000000000
--- a/dev-python/bottleneck/bottleneck-1.3.5-r1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
-	https://github.com/pydata/bottleneck/
-	https://pypi.org/project/Bottleneck/
-"
-SRC_URI="
-	https://github.com/pydata/bottleneck/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# don't overwrites user's optimization level
-	sed -e '/extra_compile_args=\["-O2"\]/d' -i setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest
-}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 22f39eee1517..02f254f21b2d 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,3 @@
-DIST bpython-0.23.tar.gz 222241 BLAKE2B eae70242323534dacada4d3d181ec4fba5fd384dc124bec7f28db887d2f1fb5b49ec6bc169d4a93db9de88dee82d714d502f2b2b1de5d9d01073f7504430cc23 SHA512 b25b68a690b838fef0c5dbb05565db4373ebb3611278b9f94db792ef25a43f59e3e9b7ac1ad0f571ae442948748b6c5e28888c6aa0f592cdf8499223cfded217
 DIST bpython-0.24.tar.gz 222879 BLAKE2B d74276c2da25e4c9f4440af3c26bd69b08baa3f6f8ae04f55ace2a159c5d839711b6f969dcaae831bc680273bc6f4f8e7f9297751534ae14d76fb06e6bc4be48 SHA512 f95e853ad5aaba476cf0bcc197ae1d322af4a458637f8445372b54b75d315d3caae7a3f8b7d8c6d1bd2c4307c36b21cf320b22c367990bd0b9bfbf42a5e02267
-EBUILD bpython-0.23-r1.ebuild 1159 BLAKE2B f9d509c1a96d7c276a8d994ccc2f87425daaaa3fdcf7e5acf4d02a3695f663d6676527d9ea4711e9d3dcecc69e3adfeb487f43ad6b84037b098db2167699d759 SHA512 4c9fe7309de586e467fe8519202b5837748285ea6f62d83ac68a3879792eb2949de7a536eee199a277457bab3cbea03c8542cd1832bb80e83adb38cbe5a59d8e
-EBUILD bpython-0.24.ebuild 1193 BLAKE2B abf8e36060ee1b9a1ad5590d62ade97536cef4b2edfdcd0812f015de18aa4e9f8d60383f2d017c64c53ccee231e54a9903106c19cff7d863bcc1eacd5d8d6ee8 SHA512 8ac8377566f36d4bdd21b060e0bcdde10e30b622d056fab0a75c7f5009f61f321c300994e87d6e103f27dc46d3336f2e6c96db342616db6fa63f760584970bab
+EBUILD bpython-0.24.ebuild 1146 BLAKE2B 3656101eb7be4ae64a338049c92ada9299365c16cdf0273955411a514ddd2492624f7c2e79c15fa46e0cfd13dd0083acf95bccb32db2fed0f006998686cdda9e SHA512 bd904770fb8afeca60b7f7d46a20c40d2c213f6f2a3df8afbaaf681d2d08aa7759cfd13dc75df8897131a643c05ee19506909e188f15ef6ea092108eefa3c91e
 MISC metadata.xml 785 BLAKE2B 2f68f309d497deba0e9db97d3c8eff7b8e8dcf39843a232e520c11c0dc574b9c9e1dd071e4af3313e538306d2674331358a216a08dc1605ce07c18853fb12fca SHA512 19d74222a46ed207c1c75668e56bbac30dbf42cb013f292eade90dd1d87fb9e0f57ef0fbabf0eae1c29b277161f75b2f8c7e821e37bc9708262d88c3e9d2c8dc
diff --git a/dev-python/bpython/bpython-0.23-r1.ebuild b/dev-python/bpython/bpython-0.23-r1.ebuild
deleted file mode 100644
index 15e026aa65c0..000000000000
--- a/dev-python/bpython/bpython-0.23-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="
-	https://www.bpython-interpreter.org/
-	https://github.com/bpython/bpython/
-	https://pypi.org/project/bpython/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="clipboard +jedi watch"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/curtsies-0.4.0[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	clipboard? ( dev-python/pyperclip[${PYTHON_USEDEP}] )
-	jedi? ( dev-python/jedi[${PYTHON_USEDEP}] )
-	watch? ( dev-python/watchdog[${PYTHON_USEDEP}] )
-"
-# sphinx is used implicitly to build manpages
-BDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst )
-
-distutils_enable_sphinx doc/sphinx/source --no-autodoc
-distutils_enable_tests unittest
diff --git a/dev-python/bpython/bpython-0.24.ebuild b/dev-python/bpython/bpython-0.24.ebuild
index 790309a0cbe9..b055ccb53387 100644
--- a/dev-python/bpython/bpython-0.24.ebuild
+++ b/dev-python/bpython/bpython-0.24.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/bpython/bpython/
 	https://pypi.org/project/bpython/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 5fe0872ccbca..f60f26abcb79 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,3 @@
-DIST cloudpickle-2.2.0.tar.gz 59630 BLAKE2B f1a7b1c8fca6978701354fd1c72273de3591e7ada08ebee04cbaf59d6b20ef4503342a52a521c9c4d86e023694df3e87b7f8f19170fd8e6c2adef2f0526dfdc8 SHA512 c3f7860bb6cb3ff2acb5657fad96dcc9e26870b8728333e0099086e27907009cff95069581df42e7cff6b05929d91341bb87c307bf6aa23bd54e6fe7d66ef657
 DIST cloudpickle-2.2.1.tar.gz 60800 BLAKE2B a89fb7b53665ddb328235d00f6b7a311815d740eedfef65552c6b782bc8339ed96bcca98eb28ff1dd6205270a44c90de22acd47df9304c11644bbf0956ff3e25 SHA512 a0174a382d531180704a90a4da4f83e1d1c90ebf4ad181778bed073763bf43104b7049ced12abc360948343d105a4390cb514585a1b493217a53a5b2c45cfde6
-EBUILD cloudpickle-2.2.0.ebuild 855 BLAKE2B 18c01563fc9f2e1f1c0a530efd4c42d17788825373b9991e3f61730bc887ac5ea0fe85e3d17b830dd5c1df096d2739fedaccf7badbb6d7265340036d3522bd19 SHA512 bbf3e76a76bc1e57f6c70a56114f7eff12a3442e2356f36b8d7ea82916b5de17ce47c9075f8f34617ebe9877c5d4592f454d31bf49e737cf96ec21ed52d69e35
-EBUILD cloudpickle-2.2.1.ebuild 855 BLAKE2B 18c01563fc9f2e1f1c0a530efd4c42d17788825373b9991e3f61730bc887ac5ea0fe85e3d17b830dd5c1df096d2739fedaccf7badbb6d7265340036d3522bd19 SHA512 bbf3e76a76bc1e57f6c70a56114f7eff12a3442e2356f36b8d7ea82916b5de17ce47c9075f8f34617ebe9877c5d4592f454d31bf49e737cf96ec21ed52d69e35
+EBUILD cloudpickle-2.2.1.ebuild 809 BLAKE2B 26ec02138d3b5110a4802c969711e98f3c018c8143ce3ec01d045a10c428b2fdef374dc2e5138b94361e72538a05b2acde70f2df7b6067d39102baa44ea490c0 SHA512 f4bfbe7c4187d41ebc66889d58a08471d22120e85a1328c1fa96d5908a57382a72d73a24a641f7f543965afa7d16d472fee724bc984cdf44188ea15b1bd11285
 MISC metadata.xml 400 BLAKE2B 6b8036e6fee459cd45ff48884ade7ba9471d948ff06e46062584e5953fdaea8197525ec02e2dc44d4daa6326c7a1859680340e616f27d72ea1d98fe5c011a5cd SHA512 70c88c748d18923d3205c9f2ebc683e6b73240d4f8215f1bf3c3c91bb5eaac259066dc735f10806c43375432df581545831c616ab3aa7218981193956e6c0450
diff --git a/dev-python/cloudpickle/cloudpickle-2.2.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.2.0.ebuild
deleted file mode 100644
index 5bca6216cc67..000000000000
--- a/dev-python/cloudpickle/cloudpickle-2.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://github.com/cloudpipe/cloudpickle/
-	https://pypi.org/project/cloudpickle/
-"
-SRC_URI="mirror://pypi/${PN::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"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	epytest -s
-}
diff --git a/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild
index 5bca6216cc67..c33734046622 100644
--- a/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Extended pickling support for Python objects"
 HOMEPAGE="
 	https://github.com/cloudpipe/cloudpickle/
 	https://pypi.org/project/cloudpickle/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 6d88c580d6b4..d9d7848b2e48 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,6 +1,3 @@
-AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
-DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
 DIST configobj-5.0.8.gh.tar.gz 99071 BLAKE2B 61fb8622f3771f56f3a67511ce0eee11b9022a47a6a48858fafad966dd7fb18387d18dc0c32984bec064c2b03a7c72570248a967bf428f871c5b8ba4353a71e7 SHA512 26cdfec9f4d7adbab579191b29e6642f4f2a6fc73353f877565b76682d6087748f466f9cbb82fccfb2d409bace29c377c2276848179f5cb396e6ff1375c8edf2
-EBUILD configobj-5.0.6-r2.ebuild 765 BLAKE2B 88bcf1b917ca3fb565da4e73fd8171f759610b6d6b9b33cf01215c86f61f93e732da06eb1bad5e5a1d041c116e0615a4b5f3019c2bbee26e7d29524755a7b02b SHA512 13c3f95af63f3c75668b7f7f4d0578246d5ab1cc3577169666c602f47093ac93faf06d5c0f66817ba0c191798f493e6dc61e249a2805ca768cf6f430c753460e
 EBUILD configobj-5.0.8.ebuild 716 BLAKE2B 1ef1f7aa77efa66879b836ea18325fd163076cb6a0f5712d02160235dfd8da3c09f3dee285452007c0bc68c9b37768e0485aab0e524cacd5d6dae4baa600b3f2 SHA512 1a9ee8868ece67472519e9177a456213b149ffc14473d45dafe48cb37ec0a52340106dd36dacb4e38c5cd62393998cf3ab7c0b7439a0c053f2283194bf0dcb63
 MISC metadata.xml 691 BLAKE2B b55c32b8504f208b9fca68e01432e11b1466bafe1d5a5fe2c9b343c08d73913562f8b89f0ffff66ab8e653955dda18aac542cc224cb405c420b4ebc8999eda16 SHA512 1251e43e664e40fb3f4d7525eddde5f624ac74fea11d6999565ed9de991da801d7730477755fc9d51db0111084fec2561bee662f9c7cdb374594c467de4cfc02
diff --git a/dev-python/configobj/configobj-5.0.6-r2.ebuild b/dev-python/configobj/configobj-5.0.6-r2.ebuild
deleted file mode 100644
index 944ed672f97a..000000000000
--- a/dev-python/configobj/configobj-5.0.6-r2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
-SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-py2-tests.patch" )
-
-distutils_enable_tests pytest
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
deleted file mode 100644
index 49576b4f43e7..000000000000
--- a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/tests/test_validate.py b/tests/test_validate.py
-index bffb0dc..c7d57d3 100644
---- a/tests/test_validate.py
-+++ b/tests/test_validate.py
-@@ -2,7 +2,7 @@
- 
- from configobj import ConfigObj
- import pytest
--from validate import Validator, VdtValueTooSmallError
-+from validate import Validator, VdtValueTooSmallError, dottedQuadToNum
- 
- 
- class TestBasic(object):
-@@ -161,3 +161,26 @@ class TestBasic(object):
-                     'test3': 3,
-                     'test4': 6.0
-         }}}
-+
-+
-+class TestDottedQuadToNum(object):
-+
-+    def test_stripped(self):
-+        assert dottedQuadToNum('192.0.2.0') == 3221225984
-+        assert dottedQuadToNum('192.0.2.1 ') == 3221225985
-+        assert dottedQuadToNum(' 192.0.2.2') == 3221225986
-+        assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
-+        with pytest.raises(ValueError) as excinfo:
-+            dottedQuadToNum('192. 0. 2. 4')
-+        assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
-+
-+    def test_boundaries(self):
-+        assert dottedQuadToNum('0.0.0.0') == 0
-+        assert dottedQuadToNum('255.255.255.255') == 4294967295
-+        with pytest.raises(ValueError) as excinfo:
-+            dottedQuadToNum('255.255.255.256')
-+        assert str(excinfo.value) == (
-+            'Not a good dotted-quad IP: 255.255.255.256')
-+        with pytest.raises(ValueError) as excinfo:
-+            dottedQuadToNum('-1')
-+        assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index 49ddb750cc43..2b0f5f843dfe 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,5 +1,3 @@
-DIST contourpy-1.0.6.gh.tar.gz 12154065 BLAKE2B d0a621e10bc465a0ed4a20136e813435bb4d79bdd39b64d60676bb794430f2ce15b247e13e163e8e2f89c69ea6a5880dc8f3c8a49750c15e7bcb554aeefcbac1 SHA512 3b6301b414758d588015b745be723642554459df14277aa2eb2def7b5194e0a2b73b73ce8409bc40cda34095e13984d7a2dbc1f3a1dcf272766df92d1de1b5ef
 DIST contourpy-1.0.7.gh.tar.gz 13357940 BLAKE2B 740214d68eb95c2d80dfb4008fbf82ae1bbd7135476a7f1a45863e2fd88331c959e80dd56afde67789e95325fe4613a6404c24d4deafebacfabbdebc0b199dfe SHA512 64edcfc911b3d7af9b422058d1f595c05d64f7fca8511ea199d30fa52854aee53a7c7dd95e2f47964f57e7764ce6b7b05c8ccee5ed0309eb5daa822d488ce0ff
-EBUILD contourpy-1.0.6.ebuild 1087 BLAKE2B bcb39aa80fe45654388e4561579b655b63f0dd4503e4f36fd9c031c60b7d2acea6c8915bfc909aef82bbeeb58dcd1549b7ec015321b619e062b8fb0188f958a2 SHA512 422413fc7f7892421a6be4fcb1d52cf3ca9d448dc5376ff4ec9222093600f2ffe3d2b660c596f578bd8b4dc150e9c9bf4592e525d65fc0febf2399783a9e3acc
 EBUILD contourpy-1.0.7.ebuild 1087 BLAKE2B bcb39aa80fe45654388e4561579b655b63f0dd4503e4f36fd9c031c60b7d2acea6c8915bfc909aef82bbeeb58dcd1549b7ec015321b619e062b8fb0188f958a2 SHA512 422413fc7f7892421a6be4fcb1d52cf3ca9d448dc5376ff4ec9222093600f2ffe3d2b660c596f578bd8b4dc150e9c9bf4592e525d65fc0febf2399783a9e3acc
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.6.ebuild b/dev-python/contourpy/contourpy-1.0.6.ebuild
deleted file mode 100644
index f05ea26574ed..000000000000
--- a/dev-python/contourpy/contourpy-1.0.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for calculating contours in 2D quadrilateral grids"
-HOMEPAGE="
-	https://pypi.org/project/contourpy/
-	https://github.com/contourpy/contourpy/
-"
-SRC_URI="
-	https://github.com/contourpy/contourpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# linters
-		tests/test_codebase.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# threaded algorithms are known to be broken
-	# https://github.com/contourpy/contourpy/issues/163
-	epytest -k "not threaded and not threads"
-}
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 41867aee1078..1668a3f95c08 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -2,8 +2,10 @@ DIST setuptools-65.6.3-py3-none-any.whl 1233963 BLAKE2B 2bad02cc00293c9b6615cdce
 DIST setuptools-67.2.0-py3-none-any.whl 1082973 BLAKE2B 7769ebdbde59e47cfc9f364ab28fada207e0b0826e0a40ccdec4ab4c8536148f8a8e071d688f74464a74dca6fb62ca840f3f54a48ccae5c016dd476634b99d2d SHA512 3987cc21a40b55f3aaae1ec643843dc473f8a3b442461892cbc77cc78f056c7e3736aad8624b68d8061358fbbeb555faf62c498df259de63fe3feecdd0d786e4
 DIST setuptools-67.3.1-py3-none-any.whl 1085336 BLAKE2B cefd6b4d5434a78263c2b21557d6fd4bd31c97ca2997f8410127046ab370c5b02b47aafe4cbcdda6376ac07af4481836d828d716367254d65ebfa944181b30a7 SHA512 5e3859d3e09b09ddf60add608ffb937243a6e303683d3f2ab857920239d656ea1475a8a7e8590550ada8c64d6a75c7c77ac2b4a662008e16bfcd4f71d7509114
 DIST setuptools-67.3.2-py3-none-any.whl 1085356 BLAKE2B 46528b14588df0b4301cbfb72d334f69b91b7d03e85866bd2d900364c784517d443bc9ce922f8e40681680662bc853ea60280250d2dbeb22f975c4bb1cbad67f SHA512 0f35fe23243852b5fb6ce3c1753993564cd258a504934a996d16110116a4e8e64c71f670fddf7cfd9daf4c6790423c9f1902e3226efc72303d2088aec7173fda
+DIST setuptools-67.3.3-py3-none-any.whl 1085363 BLAKE2B 697c2864398fa3680610bbecf437bce9712ded33c6304c155c77309788e5cb5cdd35d92e3c3960a29507a7a5e10cbb5cc68fe5eafd5769e4b665b8bbb026815b SHA512 bac8e5b24ba6aaeb9222e94f1d762bc00ba4129b9e6f9daa4de1aa644d9d605257225f060b77283e4c7ab364244512e49010f37dd20a7eb98de2416d4efe9a42
 EBUILD ensurepip-setuptools-65.6.3.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
 EBUILD ensurepip-setuptools-67.2.0.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
 EBUILD ensurepip-setuptools-67.3.1.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
 EBUILD ensurepip-setuptools-67.3.2.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
+EBUILD ensurepip-setuptools-67.3.3.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.3.3.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.3.3.ebuild
new file mode 100644
index 000000000000..c13c3370cbbe
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.3.3.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"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/environs/Manifest b/dev-python/environs/Manifest
index 9de7d01d376a..58184bf1db07 100644
--- a/dev-python/environs/Manifest
+++ b/dev-python/environs/Manifest
@@ -1,3 +1,3 @@
 DIST environs-9.5.0.gh.tar.gz 23614 BLAKE2B 118305f7d6d2906beff69aa028449f8a5f6eba7815ec63972593dd43930802b5d1bd60457edc9803ed8ad216ae8feaad0d77fc03cd21e9883c40dc6656b1102e SHA512 8a73f9f89efe4d72b9a7a5a48b21ccaafcf32d59a6153c7cfa1c91d90a3a8a75e6c05d0ff0fecb94f593008dfff4c3534195f258391cee8fb720ee93c4f42812
-EBUILD environs-9.5.0-r1.ebuild 790 BLAKE2B 7aa49f011e82b89a7173f32a184c7c5fdd3d390a2fb367ffbe41642c41d330ea188dd20053bf63c67d91dbaa2e5bb9f6b6d10e2354dbea824aa6e10953d66225 SHA512 158c72a62c148accac898e00ad75c58ff19c4983c4ff90fcb82fbdafb5f04d1b3d54fade5181da9318e9de849597e969ece175456d0177a2da2d67c434d2d7cb
+EBUILD environs-9.5.0-r1.ebuild 835 BLAKE2B 05ae7f26077dcbe1ca3d7da34b70bcf3b591146e53c7fecde622ce5fbae851b8a2d4efe80fb2ce80a75bffa01593ff9093ea747804ed997021eef71c90176c4a SHA512 c8239466452c10d1d317401ded21d482873609862c9bb150fb4aa141b445524f20fe7945550ebdd559de9e8ae3b0b793012ae021fc2a95c46b8921a5224c339c
 MISC metadata.xml 496 BLAKE2B a44f919cfe291f826a91438c9170dff83d39a184a192cd6208cc91eb50596a739d94335345f7289b8afd667a24b491fea5c9387721dd160031deb6ad5cf1aa6e SHA512 a3744511fce7b1a29b682ea7d384eef72bf08ef599ae88f01c9b4485abb1abe89f5731c40cadbe724cf8ac63726199128bb51e88c5c770196ed6a4326233f520
diff --git a/dev-python/environs/environs-9.5.0-r1.ebuild b/dev-python/environs/environs-9.5.0-r1.ebuild
index 6fc4aef974e7..d991b41a7421 100644
--- a/dev-python/environs/environs-9.5.0-r1.ebuild
+++ b/dev-python/environs/environs-9.5.0-r1.ebuild
@@ -4,13 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library for simplified environment variable parsing"
-HOMEPAGE="https://github.com/sloria/environs"
-SRC_URI="https://github.com/sloria/environs/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/sloria/environs/
+	https://pypi.org/project/environs/
+"
+SRC_URI="
+	https://github.com/sloria/environs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 5966031c602c..8facfcd6b46b 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,9 @@
 DIST fakeredis-py-2.6.0.gh.tar.gz 151925 BLAKE2B 60538efa5de93436177aa019908f02affb9df9b2aaf1349e933da6f066f98aaa255bbdb3297645ad1dc3b67a57a61bb8081e476f451799b512719f5779c1218d SHA512 19a23be7a182f962e66686f3c4ec3a5b9fbc847d97e48f19fde11ae268f4a70de567ff2ca302a9fe0e7080de2215698cf5b2ff2febda5eef6748f3ec8d601720
 DIST fakeredis-py-2.9.0.gh.tar.gz 165442 BLAKE2B e71780b273f1847454d0e6e89f3f97a9d4a81d86345857fced39413521202f299b90c8a218f12b15d79a3bb7c865d7b0280798920cfd93120a553511b3a343ff SHA512 2ddf2570e7f00647834f8f07a3fef6ec68d630ff93ddd5375dcc47a14a5a7bf430dbc4a1abfb38fa2b5e18f1aa1f4ef5413b39c4bb3ed9d167aa1729edfa9870
 DIST fakeredis-py-2.9.1.gh.tar.gz 165449 BLAKE2B 6d0b6937a460d5fd27270df5e2d88c332f4ab42e97430fc7efd5777e35051fd44f6ab01b013637ee17bccada199e126075e2efd5fa7e3fd0112739e0e14f3c31 SHA512 bf18454ec2ab62e49b4b3f93d494d7648b1b82d9ec3720e7418767dc4acdfc89e86df8ec1b9814ac69fb4b6fa13d25f2ed3a62f82f479d6614a994904f97f249
+DIST fakeredis-py-2.9.2.gh.tar.gz 165549 BLAKE2B 351e07976ed6a4d11429c83aefe3a0e2d4397a97fdb2904ab65ac4d2717d129f5ac018f071b8670012aabe127d87350f3285f6f86369bb4b7eadbd61da5774f7 SHA512 6e9ab0851f74ade2325aad88b86212b4052ca53a7510034cd888ef4080eec4129b226ab8c166ab09fa6e3d3b2c3c70fce8adafdb4081a4d3501fd4d9d5e04b84
 EBUILD fakeredis-2.6.0.ebuild 2074 BLAKE2B bbef8fdd31c1f1ba42a628aadd8688c2f6af4cb5894a1a68ff9313fb43ebf11edfdc1a878969d4c4fb94c553f6925a58504e16bd9cc34acec54c0d6629a78577 SHA512 d32ac3244d2909c5746190b7e0a66599ea0ebed1f3f59b61894674410dad70003faac790dbf794b77df665879b644d0a7990033d9077a9a065f11d451855047f
 EBUILD fakeredis-2.9.0.ebuild 2010 BLAKE2B 435a9873d94081fcf3cda01959f4349d998ed02d986511cae95e700693a9dc1f4d7b002ffe75d8ec708856899dfc735c1fc5d567b603b0570c41c5ebb7165ef7 SHA512 a7b51f37fc01717d64fea5d00d3c2b9544b2d7d278ddee8c098f9bf56135288052beb357560f130df355b3367effc6eb7102116b61b4f0b08abb026bdbb39740
 EBUILD fakeredis-2.9.1.ebuild 2010 BLAKE2B 435a9873d94081fcf3cda01959f4349d998ed02d986511cae95e700693a9dc1f4d7b002ffe75d8ec708856899dfc735c1fc5d567b603b0570c41c5ebb7165ef7 SHA512 a7b51f37fc01717d64fea5d00d3c2b9544b2d7d278ddee8c098f9bf56135288052beb357560f130df355b3367effc6eb7102116b61b4f0b08abb026bdbb39740
+EBUILD fakeredis-2.9.2.ebuild 2010 BLAKE2B 435a9873d94081fcf3cda01959f4349d998ed02d986511cae95e700693a9dc1f4d7b002ffe75d8ec708856899dfc735c1fc5d567b603b0570c41c5ebb7165ef7 SHA512 a7b51f37fc01717d64fea5d00d3c2b9544b2d7d278ddee8c098f9bf56135288052beb357560f130df355b3367effc6eb7102116b61b4f0b08abb026bdbb39740
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.9.2.ebuild b/dev-python/fakeredis/fakeredis-2.9.2.ebuild
new file mode 100644
index 000000000000..11e604ae7bad
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.9.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/redis-5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 05a3e219705e..6e61fad78838 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,3 @@
-DIST filesystem_spec-2022.11.0.gh.tar.gz 341250 BLAKE2B 690528af9882cc8a23f78d215efbeb4f9c9f6f0a04f6a0a6f75d55a5ed8f84f92f988824921f2b26cc4cc0e7a6406d322affe65c9cd99cba7bbe4a6c01ed3382 SHA512 b52af1da0afbc686d288954ac596d9dae23c393c457fcc5ab6a11c7bd8d6a20fa1f631e1837f1d0054534a9a1231afb0cb6f8f899cf169789146309f03699e75
 DIST filesystem_spec-2023.1.0.gh.tar.gz 346962 BLAKE2B debabc938d2725b0c6e0a5aabdd6033a14655799a0b4ed98f171cdb3761dea6f3f85b63c91ca5461341e75c50aef53e4d09c6ac3582020247382c5e39a8d4791 SHA512 181e5dfc05ba664d9464246b2398c70a0bad3f274dab462a2432eae24ecf3307c49af46674f8222fac87964fbf3666bb7ad9e709484dc959b0333447b9a82a2b
-EBUILD fsspec-2022.11.0.ebuild 1368 BLAKE2B 08f69f4622abf25f6162a037bf6f33be5133c4f044a41ef857c1a53802ff7a2c5402c4ad5c26225807a5cf7c7babfc299999aa8795d8582a436126edd0d15423 SHA512 3a84be399ed28f3b3f892c7ebf18cd36789007daba7eed74fdaacde11d053afaa94f38a3ae95538040318838da9bacbcd7edde96e8c3a0340c490752e7b5d60b
 EBUILD fsspec-2023.1.0.ebuild 1830 BLAKE2B c55981caf2ef78407afd92eca0b0be8137bbd1b26907329fb2eb9a608c9a2a83348f3ed80445db276424d40a14f08b51dac33db8070ebd0f2afdea8e8a5886d7 SHA512 ed043f8ae70819cb98f44885b68f8d9107b11b87d7a768ea55de0c2113960d6330b0618ab9146422d3546d3b4d61f33ca4e865209d54b32ece5ffd6812e3b3b4
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.11.0.ebuild b/dev-python/fsspec/fsspec-2022.11.0.ebuild
deleted file mode 100644
index 72f48d0ddfb9..000000000000
--- a/dev-python/fsspec/fsspec-2022.11.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-	# unhappy about dev-python/fuse-python (?)
-	fsspec/tests/test_fuse.py
-)
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 2664ca62c78e..8e33dd99ab89 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,7 +1,5 @@
-DIST importlib_resources-5.10.1.gh.tar.gz 34781 BLAKE2B 63b516e1bd9cdb141751dc432944b520227a9b5e18b814db8204e1a5820a410d6101a2c902d25855796d3d1fbb790e2bc1f9327a47f828e946419fb8e787fb4e SHA512 1a3a6e36e30d72ceefe014beafc668624975c74e1ac4c2f526c377443e93792e432f4aa22d3c7d08101dabf906f50227f8716a0ee7f60d62ea24ca99641f8c67
 DIST importlib_resources-5.10.2.gh.tar.gz 34882 BLAKE2B df84de4cf9f6f912c034c8a85be1005782ff6ac48df61c251d09990033ebc6bedc0db5913f556b9b2825c19a2dd1962d9481404b7ab85b4156ab685857ae6cb1 SHA512 891db784e030ab3262361165cef8730cb26f6a4526e279c13b8e538bed5d0035cb63ee6f4c62eb9d43ccfabfd97fb5b0effafda688185b89de8718910631b4d4
 DIST importlib_resources-5.12.0.gh.tar.gz 36161 BLAKE2B 1adcf5e2d0292867eb0b96819ee5d808b62d7f479a6fb4254db50b0397814b0f6ffe4d209f4dfcc19147bd060888cfd457391de9d6746b1b85f58b9d0792e29b SHA512 038d44919ace6d92709855eae0d111ae772edfbbf79e82349a34ab143d0ec9ed796a317ff3e1a06a08404d4a58398d130a1a4f425d26511e724bc03946679d19
-EBUILD importlib_resources-5.10.1.ebuild 1283 BLAKE2B 0dcdce06bfde6befe403d9d5757f638afda4c9aa714404b287346bc5c4ca5c1d9ced2acc0e04e45bc08e180ebe9fc9016e2ba35069a076efaed5fee8868f7316 SHA512 a094c225c14a2f9e2b1c3b0a346c427941712458898610346c4da272aa83aeab2cf57e54efd58a63a0e5409736db0b5af09b902a2fdee14e8d9ae0ae0ea6f465
 EBUILD importlib_resources-5.10.2.ebuild 1329 BLAKE2B 20018d9c6907179ddcff957ae297208807ceeafd30e7140f14e6a4fd5797474a2b3a4a37b4cc032a2ceed0a9e0cc9cad66fdc71d12b7651feb32bcae2a27b306 SHA512 b32abf54a052eb1aec3432e92d79a55a825087faa39e6d195f67fc4ba83d5e5302d178866e806f42dade40779c6137b40e8dbe9c0deee7ca2a85ca734e1525fa
 EBUILD importlib_resources-5.12.0.ebuild 1337 BLAKE2B cc780fc1f197344702af6acbb471550f038bdc2d176c573580db84e8eaeed75ac9281b3e66e1075ff8209208fb9314bf75c948cdd89c1158a41eb8fd77207635 SHA512 a500356072d562a2f625ef761de7d9cfec478a99e3a08a0e9831cb30c8afaec1148ed2be702de86f49b0d4168fcd0cce1174902b5ec06dbd61d30c5ec925ea47
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.10.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.10.1.ebuild
deleted file mode 100644
index c0eef94b99eb..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.10.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_resources/
-	https://pypi.org/project/importlib-resources/
-"
-SRC_URI="
-	https://github.com/python/importlib_resources/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 8fdaeae90d9c..fe7e32993036 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,7 +1,3 @@
-DIST jaraco.context-4.2.0.tar.gz 9308 BLAKE2B 047474e325846a5e01407cd5c6c64da4f7185d3a26b3664f06e3ca76bdb5989fd741a62ab32a667d56a80a4280824e8614cc64a27aa45f97f81d93c344f06f31 SHA512 829284682ead392ae7620c1881e89b7091e7ddc7c1d293c05792f7ce4276a5745554598a222a52ed93a7b2b401d20f3d066cfd32de65ad2f0f3c8c5f5cd2c75a
-DIST jaraco.context-4.2.1.tar.gz 9526 BLAKE2B f4543528ac24ed0005955cee49b1e4723b6d6240125eda3b6f58307a22180df41ed90069328e8e0efe460040dbadd2948d3728ccf2c01953b7e5d6bfb43e378d SHA512 34b4a051e4a50c24313bee4b80106cc5b3bb71cafc4b2eb4e8cf061b270f5ccf0ff550b58d7b05d7407f2cd7aa8ec4baf113de6dcd064d91e3f2619c5e0ce284
 DIST jaraco.context-4.3.0.tar.gz 9764 BLAKE2B 2905723ec54c6ae63b2088d677cd486dcdc06dfea06bb058eeb512da508b2ae74990894cb62f3751321cb4c813b66ffe9a3084b21eb0cb4236a9515969432dfc SHA512 8882229fa1a68f2733ec4103fbeaf47625b19790f4461ab18df4c1f1a99d4d26d10d7381ab68ba5df48616a1fdb2d5e4a767496a0e40658fd011ed9cd39255de
-EBUILD jaraco-context-4.2.0.ebuild 1384 BLAKE2B b126e0e6a82789c31051672e7ce3a9041f2f04d932a25c15f3b81ed63b73721fdb2359e0671850be2cbefe01c5c2d720174d3fd694d286caad040118ba686c01 SHA512 41f49a75e46087583443513b0fe9eb0933a4c1143e0dcd2e08f86338a226e2482fd9af5f145d10622904d66bafa87a2f6176e74c632aa32949b37a86f6839fe7
-EBUILD jaraco-context-4.2.1.ebuild 1392 BLAKE2B a0ccc1f4c149eab75bf8900561f8ffa70ae7caaac5f97d5c2a7b3a5d2ec14bd7c631f6d4e9305d2b7278c619c7fe00c402c938c43284c553ec22344c647c822a SHA512 06e9679534a64f1017574cee694a80735319616e8fc6cdb13c66172eaae224d55b27df358ef9c35b30a5a42e8faa99bf91397036b17dffdabc16b6aa2d7c9734
 EBUILD jaraco-context-4.3.0.ebuild 1370 BLAKE2B b6b9e62cbea9e3e8cbb7559dc36ea85a19277b1baa801956132fb1acc8ff47d90cc143cadbcbbe44644641d3ff0c6879f97b975291c835051decd05d6884e03a SHA512 929c32503c33d87c9b10ebb57e81072be46c3db952f9596bbb6c57ff90ef127cd1106637bfc6c65a54e03ac889c29c49f795fafc79d2ff8a7b79e786d276d7ec
 MISC metadata.xml 403 BLAKE2B 32344da5308b2bd5eef6ac6efc6299869f4f82ab67b51a23666eef697a803bcc94993ed67f3047e82ba5500d1b0c49ec1f9b32112855c21aa4b3015c09fa0144 SHA512 13dec82eb1581116d8800e60c99c328aa1bb409fec83044fa5e02838008e4bf5d81bc1defeb59bc353ff4032600bdc9213559bdb745fd6571f53e9edd9dd6737
diff --git a/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild b/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
deleted file mode 100644
index 7fecbb66c13a..000000000000
--- a/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Context managers by jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.context/
-	https://pypi.org/project/jaraco.context/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.context"
-		version = "${PV}"
-		description = "Context managers by jaraco"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-context/jaraco-context-4.2.1.ebuild b/dev-python/jaraco-context/jaraco-context-4.2.1.ebuild
deleted file mode 100644
index 100882e1beea..000000000000
--- a/dev-python/jaraco-context/jaraco-context-4.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Context managers by jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.context/
-	https://pypi.org/project/jaraco.context/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.context"
-		version = "${PV}"
-		description = "Context managers by jaraco"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 4d46a9961aed..784c9f3bbed2 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.text-3.11.0.tar.gz 15883 BLAKE2B f0f3fe33901a68741cb26270384750f070476ef921bf2822f81dddfc1c66e41016757579e310bd20fc8a7f02b188de96f07bf58db41cca51252e46ebbbddcff9 SHA512 ad3ac412df5e21cef86dc56cdc869a93a660a103a676c1d187e5ea762690b89d61c8f68994e6a891e3d98071b440a052fad60a37f71066e4e11a2cfaf45ae009
 DIST jaraco.text-3.11.1.tar.gz 16083 BLAKE2B f7268128209fbdc849a745595339f4dc9a097f3f4f8f0cdcb05ca3106ed5a45460126fbb2b7d9c3b01b63aa3f750175e8cd366034183b7d8804a1650fe493e4b SHA512 b4066589e9d4c9a2a82ae2b0825d34b22b93ee179d29c3666e9b978390121520afcb8fc5ffa6457022d2e8477f4cf2b76485d9896438ee46275326577609f201
-EBUILD jaraco-text-3.11.0.ebuild 1860 BLAKE2B 87ad59442da69a059c8acd9cb1438276e184d3e3d9864e6b1d5bc70cb6e6d35f804a0f40fca70ca6a16ff862a130813622f41543ae70cf48272745a069bd042e SHA512 962b38a5b0c619d55a70e3e5d1c5673096ab1cef597b50997f793fec7fb1718b72c7ee5908ba2ada46d384b599ddf2fde8e9e6dd76758f6ef3c3fe9406db5522
-EBUILD jaraco-text-3.11.1.ebuild 1880 BLAKE2B dc880edcffdf2da4ec0d2782752e0addd19584706256390daaafdb96eb3c989050cb9331d94fd4f5b3fe231ad194e2a9b48cc9a47fef148925e3e076c4577e2d SHA512 50d34996ef024c464a82cd812b7132cd1d19be17bc8adf4da828a8feff62f1d6aca782964f9f02be2fb4a95327e24c7a9e3cb0d764863df9a361aa97475e56b1
+EBUILD jaraco-text-3.11.0.ebuild 1761 BLAKE2B 60ee3f810903d9e161e175701664d5672f5e5483f46dbc7f7da5f69c9a51e335839b132b150a958daafba7c8c86530ca460c12c32338a5efb1d34d79503d045c SHA512 d5f02afff56e1b0ce52403106e78c0402b84d243f9b2ef13d1161bb8b40737ef357dd990b2405e3bc879e222c74bd1e67970340c93204a320983a9ffc016e772
+EBUILD jaraco-text-3.11.1.ebuild 1781 BLAKE2B 5743ae55cf942c362465ccf11539aaa041a7c3a7f4f218d498bca80dcfb8151806e7c3264348e48d0606bccb00e0b6414830ff7c9034cd61d4407ad2c8fd6052 SHA512 84b523dfb4e272d97bfe2d39da41b3ef626dc9d3572d59e74df675d8862b30e6c8087511efedc4cc4f2c41e9429a722bd28b35a95949d18fb27096e58bd86e0c
 MISC metadata.xml 550 BLAKE2B 147f1a6d5bb65e6ca4a29de497742b1cc69da4f46111512c05518c54c8fc351c12aeb452cc12c0a70974094ddead7014f58a5a2fb546173334ce282e218b8c9f SHA512 fd3bf89a43ca3ebf4be15c1cff79ebc70085b0fa0192fc9a44e6e1e799044ab9935545d4722d3bc6a3989d2a3199432a47f64876ea5b822e8e46fc3c41acd005
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild
index bda79d6b75c3..a8bae52aafb8 100644
--- a/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild
@@ -25,9 +25,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-functools-3.5.0-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
 "
 # needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
 # bootstrap
@@ -41,7 +38,7 @@ BDEPEND="
 		${PDEPEND}
 		$(python_gen_cond_dep '
 			dev-python/pathlib2[${PYTHON_USEDEP}]
-		' 3.8 3.9)
+		' 3.9)
 	)
 "
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
index e5be7098d250..1c4256a02463 100644
--- a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
@@ -24,9 +24,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-functools-3.5.0-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
 "
 # needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
 # bootstrap
@@ -40,7 +37,7 @@ BDEPEND="
 		${PDEPEND}
 		$(python_gen_cond_dep '
 			dev-python/pathlib2[${PYTHON_USEDEP}]
-		' 3.8 3.9)
+		' 3.9)
 	)
 "
 
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 67508d990a79..5679476b95d7 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,7 +1,9 @@
 DIST jupyter_console-6.4.4.tar.gz 35145 BLAKE2B d37190c30eceba79c0d37ad60d88c9e691759aaccb29a64a9482b7c3cf3315efa3c902ac2244c2139ef2f94a77450115124227768f8291f73512796aaff1214a SHA512 1f06591ed2a0fcf56e783d4e9f2a7c3f58a4f566cfb63b3367edac23c7709aa1af7bf6639c7358227a987049804da90658144fa5ad38db120c0816e78ed465ef
 DIST jupyter_console-6.5.0.tar.gz 35609 BLAKE2B 056386eaa1c214b27ff10993d08fc5351ab9f6775fa8f2882bbe8ed6ca4170edb8a8024740f3a9f0f9667c253a1945700da0e9a3bc925d970597b43c830c9e6b SHA512 9c3b44a43d0a18bbcade97fee514859b6c370941e80525630195fb6bf8fb32c3cf048dfabd2c41f7f98365d2fbd87c9e190f9fb8e899c5a29266585766df66af
 DIST jupyter_console-6.5.1.tar.gz 35754 BLAKE2B 1b3e189e8a057b0f57e6a1c1409797aff9b6584edd96975c5b91a7c5d55d8601e44a3f9e0218413351d67d7175a7f6c86c3734e14ba881f6ab25ea9f1748576d SHA512 3fbd97b1ab05596ac56ba8f6038af787698197b5148f7e33a79ad5cdcc9a78c80c2534e3e2c298aeb92ce880686731b9ba206d7d0094ad67d7cd4996c02e2327
+DIST jupyter_console-6.6.0.tar.gz 19523 BLAKE2B 5fd393b2d6abaab68ce9b96632a757f6c1bd43ac192744a9ce58be1e8bcc7accc1bfdf5428c908b270a66c14014177ce559fa97a6d0da93d3bfa34af101c5c98 SHA512 e1c4d0953ffba22660d680250b3b64887ec908e0bc420caedaf9afbe0ceb4b3e8eb5ac9b5b477aadcb773867ea7fce7b7da16bb8b4e403d9cf98484271577c0b
 EBUILD jupyter_console-6.4.4.ebuild 878 BLAKE2B a0284a8bfac8e4f1ec9cb62f6d990507f5ac6e6cdf51c4021b106617516a123f46fa6a7a689c785aceafe65d48447f98dad8a72889c7a9d23f2cf9195ae8ea11 SHA512 2fb8531df7a1f78acca881360291c9fa5e7588bcec5be20a219e9b697bc967a8ccd44ed572fa8a8afff8f7515879357839a317010c400175e660392ce6b4e143
 EBUILD jupyter_console-6.5.0.ebuild 982 BLAKE2B 9a6f164231967f64665c1c37510becc55de47204e3ffc5c43451b135b6277e14ad0449dc04dece50f2a84ac3a4e321f776f9a79bb3a947ea09366e62a9d7fa0d SHA512 060cbcebcc9441f95ff6335350f1d665a19bc512d4c077bfb532fa2ca7248064d3477c2dfd3c65754c3974be1485155abeba30431ab29c349f9beebe2be46a9b
 EBUILD jupyter_console-6.5.1.ebuild 982 BLAKE2B 9a6f164231967f64665c1c37510becc55de47204e3ffc5c43451b135b6277e14ad0449dc04dece50f2a84ac3a4e321f776f9a79bb3a947ea09366e62a9d7fa0d SHA512 060cbcebcc9441f95ff6335350f1d665a19bc512d4c077bfb532fa2ca7248064d3477c2dfd3c65754c3974be1485155abeba30431ab29c349f9beebe2be46a9b
+EBUILD jupyter_console-6.6.0.ebuild 882 BLAKE2B af35cafde924edb24f17dd31705255e8d47530c722b7851a6751b39301da3eca0cc42213f2c46c640006f3e1ac21391fc56dc8d77fcfb8cadbf67c3fac3fe2c6 SHA512 41e4c4cb231137761ac24fc7fd89e58266fb340ab590d46c075adc231188ee3f67e93a025e22c3463eb810230a3cfefbe2824ecbb6cd743c99ef5b955c14f46c
 MISC metadata.xml 702 BLAKE2B 38bb264e2ab7f1feca67ae6a35d2ee20c04b53188cc7d3a51bd2d1630ba6a9e89ac949013bbd9ac3443331bcf3f115f85537865787daee26949b9773aa9b9197 SHA512 c3f9fb275560a3aef2a5266d2070e3d013f53e2f3f7e1363626b15d290ccd619c65a19d6ee2b849a683a96159c8af29c55c81eff5a333759eae5cd6773736b24
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild
new file mode 100644
index 000000000000..f6c15d4d2afa
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild
@@ -0,0 +1,36 @@
+# 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="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
+"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index ebad3c470af2..7a0b5b25598d 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,5 @@
+DIST kafka-python-2.0.2.gh.tar.gz 327238 BLAKE2B 9d8bdee1cedcc3c7c0bee9d900bb815552b29f50ec45b7db9d1052a26eb772c84d92648ccc0d498189fc44314f5c8c30529fa61cb983481f2e2480e009630f91 SHA512 e193a8fe5852d2134e854749115feba46a0b8ff748336989a27bf56acba1124dbb8a5d841670a67ee26eef030a686d931d03d329f978b2eef7904183e83d2594
 DIST kafka-python-2.0.2.tar.gz 327238 BLAKE2B 9d8bdee1cedcc3c7c0bee9d900bb815552b29f50ec45b7db9d1052a26eb772c84d92648ccc0d498189fc44314f5c8c30529fa61cb983481f2e2480e009630f91 SHA512 e193a8fe5852d2134e854749115feba46a0b8ff748336989a27bf56acba1124dbb8a5d841670a67ee26eef030a686d931d03d329f978b2eef7904183e83d2594
-EBUILD kafka-python-2.0.2.ebuild 1267 BLAKE2B 79cd03b7739bb93aa63d4e34e2668a954b3709cf1981f8aa0efbae793aed162ce551afaecde72d23d7ee083bd2d47f4ce49be849227a135186f0b054c5112860 SHA512 0ae00f707aaf3a70315e2ea40916ad25e38dcb240066e31a0dad0571a03907dff8502a768645b921dbeeb81a13ff1dc018e5060dec8263926cf675bc6ce5a5cf
+EBUILD kafka-python-2.0.2-r1.ebuild 1243 BLAKE2B ce1b498a3902df56c04e7fa733303445f225c6ae916bba521bb18e6d1e66fea2d98ea6f6c37c7ec7345c7b35d6bdf4a1e7e39acab82865639e850c66a5362f3f SHA512 bbcc915fc78d9b6f1e2c6a1da06e0a19e05c76d8796b37eeab4c4e3c5a2c04a4b41fa7def60ff95ea222f3213b82c7668f9198e5f0d02b2c4139668205314462
+EBUILD kafka-python-2.0.2.ebuild 1253 BLAKE2B 9aea38ba8e1d8da0c9745e262b0e29cbbebb3a6d778d58d63ddf3771b2b4f2267c5e81430dcda46baf440e17e0afce33f14ee2107348b13e4a40f8cf74ec0f66 SHA512 fd0dc5b0462dee96f2f33bc069ca51e67b085dc3af4488b27cba23edfcfd07d3c3b37d9b0198f5e29d2d507ecfd4c833acf22a722350a80a6bcd97056bf77c82
 MISC metadata.xml 307 BLAKE2B d5a0188eb0aaf189135a021a211b30e2b641f31c83260999f8e0cc4cd12d78a9db90c5be3e5f958dd2f2ffef3177c1833c8e7d2c1b7624c3ccb0d2d5c7ddb868 SHA512 7452ad3874e6d102ebfe6ffa1a1c0ea37d477c100cfc434f9bc7259d04e08789bd2a926dca92f8e819de337028751b4738f24b9f8d2b9bcb59ef85053177b78a
diff --git a/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild b/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..911f0ecfa1e6
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="
+	https://github.com/dpkp/kafka-python/
+	https://pypi.org/project/kafka-python/
+"
+SRC_URI="
+	https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/xxhash[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/python-snappy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs the unpackaged crc32c module
+	"test/record/test_util.py::test_crc32c[None]"
+	# Needs kafka server running
+	test/test_consumer_integration.py::test_kafka_consumer_offsets_for_time_old
+)
+
+pkg_postinst() {
+	optfeature "LZ4 compression/decompression support" dev-python/lz4
+	optfeature "Snappy compression support" dev-python/python-snappy
+	optfeature "ZSTD compression/decompression support" dev-python/zstandard
+}
diff --git a/dev-python/kafka-python/kafka-python-2.0.2.ebuild b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
index b9bc7a22ab37..e66e23a38729 100644
--- a/dev-python/kafka-python/kafka-python-2.0.2.ebuild
+++ b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
@@ -21,7 +21,7 @@ BDEPEND="
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-zstandard[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
 		dev-python/python-snappy[${PYTHON_USEDEP}]
 	)"
 
@@ -40,5 +40,5 @@ python_test() {
 pkg_postinst() {
 	optfeature "LZ4 compression/decompression support" dev-python/lz4
 	optfeature "Snappy compression support" dev-python/python-snappy
-	optfeature "ZSTD compression/decompression support" dev-python/python-zstandard
+	optfeature "ZSTD compression/decompression support" dev-python/zstandard
 }
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index c6670563b96d..d01913d3ad09 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,3 @@
 DIST kombu-5.3.0b2.tar.gz 434341 BLAKE2B 6d5188f7682ccf2daa6ca4ed0fec7988cd4781954be0fdc847c18e47d5c425a657c3df0f5bda7999c764de293626e119a4645e92ff7bf23328f4fcb9d6f4cd4a SHA512 3000577cc3b2acfb378396640245f2bdf4c9e5e1d45252a27e4e168e22ff4070f480ad1fd70059b24cd710c452924bff1716f69bedcf020446f428f0967de832
-EBUILD kombu-5.3.0_beta2.ebuild 2619 BLAKE2B 0c0fd2974297ed6acf35f565614506c16353a714ef55e07f8f628ec0bcd4ed162212e55119de0657b609b9113f1fe9d2c9d1b6ec14c11cf765bbb98a13de4e87 SHA512 f1c82630bc62ff5f5d393a8fbf307b2dcd48a88762c5d30e959dcbea10d0a0691f00252775df30662c5ac43604c0bfafe6bbd7037222dd4bcff357385cf9f69b
+EBUILD kombu-5.3.0_beta2.ebuild 2487 BLAKE2B 96d3a9262fa999817047ee0600a0fb06d3b7a96ed8f26487dce141de45e622b4778fc7e2cf3dd32611baa0c1c226ff77b869be3f5f3508555441a76f9e6d0a70 SHA512 ddae1a12044e0320ca8d3665ad47bac393a8656836ef97ecae02a826c6a9c831610fc505f1be7ea6cfe4ea1271f4ecf32ecb6b254cc1217a6443cd8df274556d
 MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.3.0_beta2.ebuild b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
index 9210dada0871..b44966b72721 100644
--- a/dev-python/kombu/kombu-5.3.0_beta2.ebuild
+++ b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
@@ -6,17 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_10 )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
 
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
 DESCRIPTION="AMQP Messaging Framework for Python"
 HOMEPAGE="
 	https://github.com/celery/kombu/
 	https://pypi.org/project/kombu/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -38,7 +34,7 @@ BDEPEND="
 		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
 		dev-python/Pyro4[${PYTHON_USEDEP}]
 		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-		dev-python/python-zstandard[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 		>=dev-python/redis-4.2.2[${PYTHON_USEDEP}]
@@ -90,5 +86,5 @@ pkg_postinst() {
 	optfeature "yaml backend" dev-python/pyyaml
 	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
 	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/python-zstandard
+	optfeature "zstd compression" dev-python/zstandard
 }
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 2dc9ecefb88e..4f4ccf022882 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,5 +1,3 @@
-DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
 DIST license-expression-30.1.0.gh.tar.gz 162641 BLAKE2B 912a34bd86199f41248b2893e9e25dfcf1504231e49f6d94607ce30c07c95932a8c41814c5d2100beabfe7fe2deda499a62ea310243dce559d0a5c5ecb84f77c SHA512 eb152b53bfacddbccdc8bd4366e040c24c0e9be3561f1a602344ad756307e29350a739de5ab5f5448258db88dac745638242d971e1a2030fc4b43b88ab4015d0
-EBUILD license-expression-30.0.0.ebuild 758 BLAKE2B 2454c3259f725fdb4e87283a4fb2dac65d0988d684201ea52ba019eb66e7a2bf8b8f2809f88810bf3128e3c2e62f4aa2d357e416df5fc6bc6a04cb0b0dedb808 SHA512 0690a405c899ae138bf9b0845bdde1cb71d7f2b4d6c85d39f60b159b31e697a1a6821e3a6ae06b76a6fd893285367ab25d0a04174ce1059fbb4ea50c65e751c2
 EBUILD license-expression-30.1.0.ebuild 758 BLAKE2B 2454c3259f725fdb4e87283a4fb2dac65d0988d684201ea52ba019eb66e7a2bf8b8f2809f88810bf3128e3c2e62f4aa2d357e416df5fc6bc6a04cb0b0dedb808 SHA512 0690a405c899ae138bf9b0845bdde1cb71d7f2b4d6c85d39f60b159b31e697a1a6821e3a6ae06b76a6fd893285367ab25d0a04174ce1059fbb4ea50c65e751c2
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
deleted file mode 100644
index 218a3e602333..000000000000
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse, compare, simplify and normalize license expressions"
-HOMEPAGE="
-	https://pypi.org/project/license-expression/
-	https://github.com/nexB/license-expression/
-"
-SRC_URI="
-	https://github.com/nexB/license-expression/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index a53cb8fe06b3..36a154149515 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,4 +1,6 @@
 AUX 0.6.0-typos.patch 2236 BLAKE2B 8eafa371eec73761664e8f92a6abbc6df011f4ab8a9afafddd19b804611936c95d2cc05af97f1e709dff62baedbc16f10ce7326fa3450e8ca45c0011ab2f0ed9 SHA512 0c5e6d225eabeda3b791679c426bf8393b034cce797462264d4d39ccbc630641db978f0cd8f7844b0fb5b983bc5be8a4c8174f9da703936f3d5b4f9b55911677
+DIST loguru-0.6.0.gh.tar.gz 417660 BLAKE2B a7b7d95ffcf652769503db3423768ff85a4fa4898f0e2b155d96ce0c42fa7f24255f9dc49ba62e8a4f19bb3b7cc8b374580fe0965c9683b14d9bcea9866e71a5 SHA512 6ca7087cde3b4ce11255e31af988e5e118a7ebfbb338b97ebd6e7e4af716f0301c0180a59b18c879fd799c25802b428411b868290b7593212f06d70bcbd6a9ca
 DIST loguru-0.6.0.tar.gz 417660 BLAKE2B a7b7d95ffcf652769503db3423768ff85a4fa4898f0e2b155d96ce0c42fa7f24255f9dc49ba62e8a4f19bb3b7cc8b374580fe0965c9683b14d9bcea9866e71a5 SHA512 6ca7087cde3b4ce11255e31af988e5e118a7ebfbb338b97ebd6e7e4af716f0301c0180a59b18c879fd799c25802b428411b868290b7593212f06d70bcbd6a9ca
+EBUILD loguru-0.6.0-r1.ebuild 715 BLAKE2B e22f4acf5b03430e874bc60b8dcc71b772eee0b802d7be9d3f8110b91ccb23b9bcc7dabdb2f6488163a8ff43440cf476ba3aaffa30d846f7030cb5c5c16ee776 SHA512 f8d47f4f5172d01dfa5cd95d4fd9a8d2f7ede48ee17308160cc4345d507bd59dd8847c181fba8edf092f234253a105ac9c06ed03fcc9542c74cc91e195676188
 EBUILD loguru-0.6.0.ebuild 629 BLAKE2B c44341ac284409f63fdaa67634e90285ac6bbd9c6f923bde913fd7e8fb71e6531bded743301a4398524f42dea247c304f679cf1d0f66582be6bf84032df56d51 SHA512 16e03d9f626f78e0bfb260384bdd4b86bb7989c175bab77e995003676c8c8572e57fd9bbbfc57fb19f92093ba09d892e4c6ed3f5fa6b1d0f5c2ab7f27aca301b
 MISC metadata.xml 684 BLAKE2B 983bdc7e62a6532def7c1f368fee4e9e6cac5357a5de859c181775b02d7e3fa2c0b035d7fb7eb4126cddcbab24d01d8721d89baaade8d328fb1b600c689695ec SHA512 bbd545f9f8d643ee8a402ef97178191c67aed817f765eb45e3cda90c6f765a4a32837098becfb9af6fa9d704107676d5b5f2ed7e00630ef0c98b2b1b689c6cc0
diff --git a/dev-python/loguru/loguru-0.6.0-r1.ebuild b/dev-python/loguru/loguru-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..6c59eba2c805
--- /dev/null
+++ b/dev-python/loguru/loguru-0.6.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python logging made (stupidly) simple"
+HOMEPAGE="
+	https://github.com/Delgan/loguru/
+	https://pypi.org/project/loguru/
+"
+SRC_URI="
+	https://github.com/Delgan/loguru/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0.6.0-typos.patch"
+)
+
+# filesystem buffering tests may fail
+# on tmpfs with 64k PAGESZ, but pass fine on ext4
+distutils_enable_tests pytest
diff --git a/dev-python/mitmproxy_wireguard/Manifest b/dev-python/mitmproxy_wireguard/Manifest
index f609f0418665..8d4988f7e111 100644
--- a/dev-python/mitmproxy_wireguard/Manifest
+++ b/dev-python/mitmproxy_wireguard/Manifest
@@ -193,5 +193,5 @@ DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a7046
 DIST x25519-dalek-2.0.0-pre.1.crate 88717 BLAKE2B 6b4970f31dd1ae23016bee1e879dd7486e2bde5fefe7de5b934321bcf8360e6c033631856b05bc4e176fc4e4803a75139ac07659be2006d3ba5eee6c883bd6f8 SHA512 f8355a79c469d1e3c9ff38a435b0520a7db05467156e7974f9e56a13a5c3fa82934fa6522523e8bb10570b3b9fcb6fbf95dd357ba0cd18455ff97255b48f0371
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
 DIST zeroize_derive-1.3.3.crate 10380 BLAKE2B 5ed1fd50f483e1eeec54584adb3d6e20f12987037edf859bd0ca1e9274c41be332edfd4a294d25a96ec811ab06299185148702f4317dbcf1c5e0a23e7e8116b0 SHA512 cfe53287c80866868ca435414efba32267f68b6b95dca9c11201365c9fc21444b1ca926fe8a2dd64c0978a8691e351108538bc7e1fc6f60feb83dde93f56b3c3
-EBUILD mitmproxy_wireguard-0.1.20.ebuild 4402 BLAKE2B 5dcef5412968753eb8a9ed0c309bc71a825f092f21c83eb2d51b3553c06c44f0f6044422c776be63f87f92b706bdaafbd68316150d8626f981ef625bb3c2bf57 SHA512 188cd9c7e833655eedb51866a67f4315b60ee551e276d10a1cbf01c042898fd35b1549ef7723a4b6461ce72e649b5121b472f546f9eb05ac688648bdbda91e74
+EBUILD mitmproxy_wireguard-0.1.20.ebuild 4401 BLAKE2B 29d989531b8719b987be70a98a1bdc1661684224578aa59988ddb83c78899799ca08c42bb621edb2d32968130e2e598562d5bbacb672c08fd31b1ded5dfa72eb SHA512 9581b63297026dd88913590bd35dbfd5cac8159ff8be52859a3934e56daeddadeb7326f5498b58de37c08906f217d238b16a089b22b75ede26d3e13ec5ae0d40
 MISC metadata.xml 400 BLAKE2B bbf04eceaeaa26baff40480b9136d00095c1dddc92fc4ff8c98c5ce313a373731f3b54cdc8f631f86c0bc1fab00684c97b4bbff26d90199f6ec8527067a90a85 SHA512 121b90819b7b1f28017c07e1565758925bf5ea70e93d1f8c421dd3e8a8166f05bbca69a0eb8c5e888acdf81708b21ef6c17737338aa2599985eca79f175c212e
diff --git a/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20.ebuild b/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20.ebuild
index 09eb4238d447..376a3627f7e6 100644
--- a/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20.ebuild
+++ b/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20.ebuild
@@ -214,7 +214,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND=""
 BDEPEND="dev-python/setuptools-rust[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index e160861aa7aa..bfd582974376 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,9 +1,3 @@
-DIST mkdocs_pymdownx_material_extras-2.3.1.tar.gz 24640 BLAKE2B a6637991494a0042bdc65a65822b84066efa774890d13079c87667fdfeadafa439a92bddeebad1234be8d10d60a1e4bcb76c2ff693e305c6ae37e846958eb810 SHA512 bfc213de818d0a82786de2c55d35d90fa80f107efdff2aa12ef5a96ec77d2bfb7d1e0e9115e930a29440cfba49fbe3a3a429dba2fb5c993878268d8a85b6ceba
-DIST mkdocs_pymdownx_material_extras-2.4.1.tar.gz 24229 BLAKE2B f716b37f07e5b00cf7121c2de76c5794d96649b643767d315ef0f9be98a028af178f5b370f29132bb1a388c68e07eff9ce5f88b5b745558b7d3ecd12e7c3274d SHA512 651627361affa0a3dca1ad725744deb964fab009ccfcba6f581f29379f1bd8317da511b5a3055c37761d2b8ea814121e5459eac0c175aee73cbc5e446302fdc5
 DIST mkdocs_pymdownx_material_extras-2.4.2.tar.gz 24247 BLAKE2B 1ab9bcc9c6a6f11188305d36c48773ad03d9f03cf95636f6d6eeb292d39d7cce3c4ea155caf6343b636f33dab885dd2320e2f7b12f91b5d7d03e1da1480b2ac1 SHA512 8852fab08e7dc43b005d3ebaaabaed07598751dc7dbf237a9728c1cbf8abf992403e27a515d615bbbe0b753b08a0f32aa8f18cb249b07187319c20c285fdf312
-DIST mkdocs_pymdownx_material_extras-2.4.tar.gz 24171 BLAKE2B 8258e6c9566a24a614c222fb2f8e76305bd92ccd0ffbbd4b21e945a125a553ee8664d408d46a5081893e0bb8b72c5403ed2aefcdd11807301765b052e0ed29ca SHA512 002149765a30ce826b3df19c9ed659c45ee39ef0df4dfdff6ae1fdda8c88e69d6015fc3db41ee0d15229b35eefd2644dd8015a22e50db98ee45c520f95f0b04e
-EBUILD mkdocs_pymdownx_material_extras-2.3.1.ebuild 574 BLAKE2B afdf673a517bc839cdc857a62cc5e75be8b304c0a1464861cbf9d7711e6c782ef93108b8c7ef0a3d4745a3d0442f3fea65ba51fb4731db93566ac62421dbdd35 SHA512 ed353708e01fb26530b643b77f04c624abd6b5a54857c7bbedb172b01270a8cf9a5199bccab794931d41f8006b33f1ead1ebb35ea6e16607665159493e4a28cc
-EBUILD mkdocs_pymdownx_material_extras-2.4.1.ebuild 576 BLAKE2B 20de41d52b891027681d06caa6e9815c6c7d4d2f04128c0d54771ccc795646ae1a2723038ad16a1b90675584317abe7e811ccb78ba3e445e0921f5b0c6dce54c SHA512 69ce1d33c7d825823d1844635d96c6118b284dfadfd024cd1e45f6f876007516518a05480b35e4c812d6303577265c82edad820dc2e14000ca50ceb6955c45f2
 EBUILD mkdocs_pymdownx_material_extras-2.4.2.ebuild 574 BLAKE2B afdf673a517bc839cdc857a62cc5e75be8b304c0a1464861cbf9d7711e6c782ef93108b8c7ef0a3d4745a3d0442f3fea65ba51fb4731db93566ac62421dbdd35 SHA512 ed353708e01fb26530b643b77f04c624abd6b5a54857c7bbedb172b01270a8cf9a5199bccab794931d41f8006b33f1ead1ebb35ea6e16607665159493e4a28cc
-EBUILD mkdocs_pymdownx_material_extras-2.4.ebuild 576 BLAKE2B 20de41d52b891027681d06caa6e9815c6c7d4d2f04128c0d54771ccc795646ae1a2723038ad16a1b90675584317abe7e811ccb78ba3e445e0921f5b0c6dce54c SHA512 69ce1d33c7d825823d1844635d96c6118b284dfadfd024cd1e45f6f876007516518a05480b35e4c812d6303577265c82edad820dc2e14000ca50ceb6955c45f2
 MISC metadata.xml 1167 BLAKE2B a4efd99b0128f99bb7a8da17fde37695cff1f9e50ddec9d3b71e5eae4a09b8ba6646259c724220ee5905faa420efcdaf4be1d0828c8cc4d9e7040ebf1398bd0e SHA512 37d5b8e942796e54f31d0a2d592157d7a50d8fe5bdedf6f0e57305d60b4d7fd99f649e2604bb53cba5cf457227c3c1debfd607b3f5b97fcaee7e8209fbc900ec
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
deleted file mode 100644
index a43de70f0b50..000000000000
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Custom alterations based on Mkdocs-Material"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
-	https://pypi.org/project/mkdocs-pymdownx-material-extras/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.1.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.1.ebuild
deleted file mode 100644
index b8541382d5af..000000000000
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Custom alterations based on Mkdocs-Material"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
-	https://pypi.org/project/mkdocs-pymdownx-material-extras/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.ebuild
deleted file mode 100644
index b8541382d5af..000000000000
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Custom alterations based on Mkdocs-Material"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
-	https://pypi.org/project/mkdocs-pymdownx-material-extras/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index a350aede2631..8b271f742416 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1,3 +1,5 @@
 DIST nptyping-2.3.1.gh.tar.gz 66951 BLAKE2B 781e2e84b7d89337c4753a050e95f3f9cad3a1aca22ea235e203ebe231bfc7dc4e91f5455603c4f7fe833b7b97ea9e8e561eea62eef4d0b2dce4ade077b8526d SHA512 a80df18cba3d427668be0f44f3ca315cf80daf7e3aed90d76b159479de069054cb4a2442abf7b658ddc853736fc7c3be2b0d1db2d7c9e54938cb1883eb0cb2c9
+DIST nptyping-2.5.0.gh.tar.gz 72870 BLAKE2B 16c6cb90c36bbf0b97da5ff74cee7030c641ef76d055cc5691b9d83adab2714d6e3515fd4e8616fece74606e109e6b115348964614b408df06b4f5c3cbccce37 SHA512 2cde9c5f7694d4f916b85c93b86df7f72709a70b2ffa91b7bbc98c5884236f5b36bb545a89c37e8c02a9b460065c97151d77c64f8d93b92fd93bcff406f039d9
 EBUILD nptyping-2.3.1.ebuild 1133 BLAKE2B 694f2924e5de346491a116f392f936802a18fe1bd965247365817d4ee7ba50b7284d4b5ac4da6430966b77cc44f1d27342b7600c72121742aab5f0b0e5e6530e SHA512 317cdc63e3b083527a17a6c2b34fb66aeb133f7da650995f31e0d7547f33f3be78dc288322736d28d9649b892ab194e29583a1c646fcb005acccbee795a818f1
+EBUILD nptyping-2.5.0.ebuild 1140 BLAKE2B c13357fa4b42beaee0121aa9b34633d8c54dc905c38791615718e3284ac037c28444b5553e91ed37e2d1a991b0d1ceeefb745cfb29a3d55c53e184479e6e4bf9 SHA512 d92d137a6e98a24a6d1f6e397560e2d9b408b0dc484e8692f3dfe30d9609f77d0972064caf13ea7270aac1624bc3ca949ce9b39c0aee491c37dd174c3290bbd2
 MISC metadata.xml 427 BLAKE2B d314480c0cbd8bdf8be3bc5936d01cf73a3b27929b04a3d2147b43c5829a582d9ac3cbefd2c99e35c7dd83d5d4ebc39b0173d996483c349b392fbc27ada65a11 SHA512 1ee6a94fd1d8e2b61f97eec3144d5382e2ff7ebef369815551b033d218bd790ffd8eb21adbebe44f9935feecf62a842f9c6fa5989364f46f6facc606f94786e5
diff --git a/dev-python/nptyping/nptyping-2.5.0.ebuild b/dev-python/nptyping/nptyping-2.5.0.ebuild
new file mode 100644
index 000000000000..1d2880b0f93b
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+	https://pypi.org/project/nptyping/
+	https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# TODO: package beartype?
+	tests/test_beartype.py
+	# TODO: package pyright?
+	tests/test_pyright.py
+	# test for... whether the release is on pypi?
+	# requires Internet + feedparser, meaningless for users
+	tests/test_package_info.py
+	# relies on Internet access to fetch packages for pip
+	tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 816fa23231bf..cc551e73f266 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,8 +1,5 @@
-AUX paramiko-2.12.0-pytest-relaxed.patch 3335 BLAKE2B 3bf61502c164d951e9db3f9cef0d4277a40be1b9ecd1201575c903795bb017b561934b4032312c2642986c892f2cf472565236c4a800f849955504e2d63a71e3 SHA512 a3e2cfdc314c85caef85c0d4877a21b7e7764e7671cd6b912064bd4c473d9d8fc54abb9e4cddc053f6281404c658cd6d2704f25678ffae8df28a569884b2a101
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-3.0.0-nih-test-deps.patch 3435 BLAKE2B fbbe2bbd8b05dd215b2ba413e208a96fbd1df9904271980658e1fae100e6fb1d049e15d582a307364d6416090b97741cbfc8d7304e08d7b7bbfbd70e0f1a1522 SHA512 76cca0e404215e505d6ceb650da796862fd87ab460e1a65438c62cb926af4a3ebb8f603bd26acc1a6d1a1a37e6090fc01edc4ae7a7f81f18105d3d9fce03545d
-DIST paramiko-2.12.0.gh.tar.gz 351956 BLAKE2B d41668f32f28a5c2c3af1d2b5c85bb4c3d2f5af9028cd5ebcb2b8aa21bc25df2c1ead5ddfe61ff12cfacec4b92913833e267f8a3fef07fa9a794f4b064fdb472 SHA512 1bf325ffd393447cb90009d01dc1104d0d43a6acdd08cc6d28310063a649a333323748800dab119ab5e10833975e68f5f5702044fc247a2e8058122a5327f2c7
 DIST paramiko-3.0.0.gh.tar.gz 350348 BLAKE2B ba7211a3f3c7d4f9c0023017d96ed51511039378b4eba1ace13fbbf6902cda40aa09f2cf7b5ce9f7aee666907d9a662e9bf7eccd5d06669685b9aa25fccfa551 SHA512 3754314fcbd64bf3db5fd6a8d55babc13e639675d09e85d796e99f25eecb55b0f987c0b47bce288c3d154a2dbdb586ecc34bbb09d67786bcc13b0a94a78e6654
-EBUILD paramiko-2.12.0.ebuild 1297 BLAKE2B 518df1e6db14d0bdcf15b64a8842de844fcb972134672b67ee34a00820de9ad5aef5d935227e6b167cebba6c630447e61ee5db9aac89f7bd222295727ce8dd2a SHA512 1ac376a544cb3f92ae000b081f847f38ac0dd6fd1cf6305aed536d2e2c3e9ec08d2234c39615b3c8734c0ab59562330f4732b52c815aa6a199e4753c585b600c
 EBUILD paramiko-3.0.0.ebuild 1235 BLAKE2B 36a9f9d10eb7a60962f30ae039ccb6f1b2146f9545cebc901db59544fd3251f1c61d25b4b94c2874151c92852cf2555f84894dea34d529cf43b7de9d3a2ccac7 SHA512 e0573656798999815fbdbdda8938c3b9eda4b17f2de32f5fff9a37465bf1ae220380d6daf0528af2250f71e804efe707ed4b20a99f791a1574cc3c17fb2aff51
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/files/paramiko-2.12.0-pytest-relaxed.patch b/dev-python/paramiko/files/paramiko-2.12.0-pytest-relaxed.patch
deleted file mode 100644
index cf34fbfd1c60..000000000000
--- a/dev-python/paramiko/files/paramiko-2.12.0-pytest-relaxed.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 935507cc60b6f0b2b83c9c0e3be3900297b41757 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 17 May 2022 07:26:36 +0200
-Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine.  Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system.  It has been banned from Gentoo for this reason.
----
- dev-requirements.txt |  1 -
- pytest.ini           |  3 ---
- tests/test_client.py | 19 +++++++++----------
- 3 files changed, 9 insertions(+), 14 deletions(-)
-
-diff --git a/dev-requirements.txt b/dev-requirements.txt
-index 3ed9eb40..e90f3373 100644
---- a/dev-requirements.txt
-+++ b/dev-requirements.txt
-@@ -2,7 +2,6 @@
- invoke==1.6.0
- invocations==2.6.0
- pytest==4.4.2
--pytest-relaxed==1.1.5
- # pytest-xdist for test dir watching and the inv guard task
- pytest-xdist==1.28.0
- mock==2.0.0
-diff --git a/pytest.ini b/pytest.ini
-index be207cd8..5a506bcd 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,7 +1,4 @@
- [pytest]
--# We use pytest-relaxed just for its utils at the moment, so disable it at the
--# plugin level until we adapt test organization to really use it.
--addopts = -p no:relaxed
- # Loop on failure
- looponfailroots = tests paramiko
- # Ignore some warnings we cannot easily handle.
-diff --git a/tests/test_client.py b/tests/test_client.py
-index 3eaad4fb..66c41b0b 100644
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -34,7 +34,6 @@ import weakref
- from tempfile import mkstemp
- 
- import pytest
--from pytest_relaxed import raises
- from mock import patch, Mock
- 
- import paramiko
-@@ -787,11 +786,11 @@ class PasswordPassphraseTests(ClientTest):
- 
-     # TODO: more granular exception pending #387; should be signaling "no auth
-     # methods available" because no key and no password
--    @raises(SSHException)
-     @requires_sha1_signing
-     def test_passphrase_kwarg_not_used_for_password_auth(self):
--        # Using the "right" password in the "wrong" field shouldn't work.
--        self._test_connection(passphrase="pygmalion")
-+        with pytest.raises(SSHException):
-+            # Using the "right" password in the "wrong" field shouldn't work.
-+            self._test_connection(passphrase="pygmalion")
- 
-     @requires_sha1_signing
-     def test_passphrase_kwarg_used_for_key_passphrase(self):
-@@ -811,15 +810,15 @@ class PasswordPassphraseTests(ClientTest):
-             password="television",
-         )
- 
--    @raises(AuthenticationException)  # TODO: more granular
-     @requires_sha1_signing
-     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
-         self
-     ):
-         # Sanity: if we're given both fields, the password field is NOT used as
-         # a passphrase.
--        self._test_connection(
--            key_filename=_support("test_rsa_password.key"),
--            password="television",
--            passphrase="wat? lol no",
--        )
-+        with pytest.raises(AuthenticationException):
-+            self._test_connection(
-+                key_filename=_support("test_rsa_password.key"),
-+                password="television",
-+                passphrase="wat? lol no",
-+            )
--- 
-2.38.1
-
diff --git a/dev-python/paramiko/paramiko-2.12.0.ebuild b/dev-python/paramiko/paramiko-2.12.0.ebuild
deleted file mode 100644
index c7d516f719cc..000000000000
--- a/dev-python/paramiko/paramiko-2.12.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="
-	https://www.paramiko.org/
-	https://github.com/paramiko/paramiko/
-	https://pypi.org/project/paramiko/
-"
-SRC_URI="
-	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-2.12.0-pytest-relaxed.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index a1e9584ab5c0..bbe238a2abac 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib2-2.3.7-post1.gh.tar.gz 39281 BLAKE2B 71448eeb24cc149eb540b5b2f5f39cb1c7273ecbe9491eb049e8e1a721db4bde478bcd6cfadc7bc954c924eb26f1c5950fd4a8c5503a87dc3faec7866a23d0a8 SHA512 8eef6dcbd4b264365499ad0b53321fb1dce3b56377e91288a9d2b769775f9d697736e1136fe43d17147b8539fdad666e9b1f5fc22ecc63a601ce87434ba6aab1
-EBUILD pathlib2-2.3.7_p1.ebuild 733 BLAKE2B 8c386ee8989f028a7156f74790bc9264ed1a87dbefe0dca27614a16cedfe9ba468d89d57b211cb933ab5c5badc27b0dd3e0974f82aa9181777dae78f1ec3b833 SHA512 992bb42f465dc17b32a883bf84dd19adb4da8317629b066412aa0de0965e9e8476b58df7e65f8dc436da29fe04ee834b3e532ecbb93d3c786b75503c0094456b
+EBUILD pathlib2-2.3.7_p1-r1.ebuild 780 BLAKE2B 32f2b05979e458641c28b51ee94a69e109fd5e19bebbba0d90e96d4c869e57a0e71807ef5ee7be5bac02e9b0f9126a690dc804ebf979f3ba551aa3a010fb58b9 SHA512 49da3b2edc05a3e0b109f80573082a8d0dfdcc6b3df45a3cfed414fec1c41c48c676d72c00fada38aae3b6a8af78654bf08fad536f6c012521a66fa6de281593
 MISC metadata.xml 393 BLAKE2B df9eb719122443ad17e77076dc47c256a9d583137657cdfb6b20d09c19546425443b63b6ab3bfd94dadaa4273f444ffdb265c053c81793b2b56bac75a4e15e23 SHA512 08504588b43aa37e764a2c48817a8ac7a65ca19965bc8b00d616300560e794423dd931c29160d50ffaf30d19bf6f41a125287e9a3c013ffaa97e300a1e0b6725
diff --git a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild b/dev-python/pathlib2/pathlib2-2.3.7_p1-r1.ebuild
index 8b820d39c892..b9724da0146f 100644
--- a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.7_p1-r1.ebuild
@@ -25,4 +25,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
 distutils_enable_tests pytest
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index dc0476e4ff54..90236f16c373 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,5 +1,7 @@
 DIST poetry-core-1.4.0.gh.tar.gz 556575 BLAKE2B 6a0860f965bb7d554f1f13c46d76727b9a763dd3dc04a1d889ca894c30ad91e46931308981560fadf70348731f080322da9c9590248b7877e02eb81f4009e02a SHA512 31c9b42ae8e4ec5c4cec93604a5ea72642fb89717867d7f43fdf930835c7e1da97b0251870d86841c30b1bf0ee7b167fc6a8dcfe939beb5b40acd7e24dfaede7
 DIST poetry-core-1.5.0.gh.tar.gz 478924 BLAKE2B 54653b6a8dcac08ac732ccb8efd2ff0404e6e78e7e2f6981fca2aafc53144309372389cc11d2524470ff25b0fc3ade5039df850629fefe016b6e9860f09d3247 SHA512 18b62096f32b7e57abc296bd8e35d0802873563c83e19b0e6e5f9994edaa503e05b9a782a6612d28b8544e34efc92efe213dcd5b595ec1d217e678522df3ae31
+DIST poetry-core-1.5.1.gh.tar.gz 479091 BLAKE2B ff59460a75893c18f9ad0063a880b40c6cff108d03c7f7bd16aaab53a72bf8af2c08af949c448e8703390589112e26c19e9ea9ddfaf2bed69791f86293b62b1c SHA512 ffc2cf6a37175feebe6ae926250d20ebf5742f459824f54b7ad8ea0f65c28639ef1e90a3cbd31bf58fca19d45699c5a22a583cefb5d60795d7e92399bdd1a421
 EBUILD poetry-core-1.4.0.ebuild 1625 BLAKE2B feca07705fd9b6cda44f94ee0024b7de25124317fc834f75ac416237d3a51ff09e05431971ad74ef3553fb973d396a8eaca25a4e3589162892a28703905d435e SHA512 7109537e69a5e171d1f8e751c308cde5026ba8b16404bf1831bb9cdcf3de234f4a4698a99020b3b42e7b5ee2f6dc07b1ef4c7a1b7b001d0eea4d769933349942
 EBUILD poetry-core-1.5.0.ebuild 1647 BLAKE2B d391338addd8ccabaa967d6db612b370b10bdd467880f737fb800b7e03ee71012b5d0158c12b205885a89838465f734b5c03796cc55bb5e8dc41249085af078e SHA512 a0452020476311542e99a9478af9fe626eaa389415327b3631ca22b118344a50857727079ae701b0dbd74638cea9a1802d5c9da280d1433d78a2c8da53a5582b
+EBUILD poetry-core-1.5.1.ebuild 1647 BLAKE2B d391338addd8ccabaa967d6db612b370b10bdd467880f737fb800b7e03ee71012b5d0158c12b205885a89838465f734b5c03796cc55bb5e8dc41249085af078e SHA512 a0452020476311542e99a9478af9fe626eaa389415327b3631ca22b118344a50857727079ae701b0dbd74638cea9a1802d5c9da280d1433d78a2c8da53a5582b
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.5.1.ebuild b/dev-python/poetry-core/poetry-core-1.5.1.ebuild
new file mode 100644
index 000000000000..1288ab17d4bc
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.5.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# check inside src/poetry/core/_vendor/vendor.txt
+# (note that some are indirect deps)
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pep517[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# These "fail" bacause of glob file path resulting from newer versions
+	# in our tree than vendored. But those don't affect anything.
+	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+)
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# needed for migration from <1.1
+	distutils_write_namespace poetry
+	epytest
+}
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
index 6ae191336e34..16ecf15bf0ce 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1,3 +1,3 @@
 DIST pylatex-1.4.1.tar.gz 301482 BLAKE2B c68c8bbf70c5099b3c3146922afe94dcf4f90bfc8644fa165ee27835f4a24642645f9849f2f9fd69656dc07dcc4807869275aacf33a1e5b9c59e539801f8e821 SHA512 55a5734e4d239cef4bcaafa0ba64eea013ba3e86d137de5a5f8311d70c949d783e2e7aad24d39d16a6febbe4bddc34e47248068e1328fe3f95f39a7c7019a3a9
-EBUILD pylatex-1.4.1.ebuild 1409 BLAKE2B ebb79d6cfbd236f90c0e6e4f1c68662c2a43319196fa885768bcc8540d3b099361612e7097e7c77bd3473d5b938e9dbdcd23933181f83bab3444d04987deacf6 SHA512 54a282ba6db14bfcc87ac951a6a4dbde9af33d3dc2e0e2524842a29a54dbb7aa77a5d17d64a7282d05d6d1268eea623544a6776f3ca12921a341588fa1ff29a5
+EBUILD pylatex-1.4.1.ebuild 1409 BLAKE2B 3640f58eef86b6dec0f544f3462890eee76cb9a389a707c39e38d83b2729327a4636063325c7924bb5b7e08b180a57d1f97ef5f49b1d79bd18eff0e26b634d3c SHA512 d203089ddbd5f0b9614070759ec95fc21bc35908403b05e323a4a7d4b63a2a16bf4f3aaf0bc665b0b4192c60904c3023bd745892281acf4bee599953b04fef94
 MISC metadata.xml 772 BLAKE2B 4be85c7cd4f0b794fb5af51784d40961156954320046cb773520f6898430cea11ebf367e84ff593ed8c95b23c741ad32b3e9920f06fcd719e05d153981009ba6 SHA512 54e51c201eb124c8ccfc44dba8c47fe77bde86090219e8f38e1aaba9392598eac991bb134a5f98ea585829f9d6d362f237866898f2ef898d6faaeea05354d9af
diff --git a/dev-python/pylatex/pylatex-1.4.1.ebuild b/dev-python/pylatex/pylatex-1.4.1.ebuild
index 72df899bed09..55e919e2046a 100644
--- a/dev-python/pylatex/pylatex-1.4.1.ebuild
+++ b/dev-python/pylatex/pylatex-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MY_PN="PyLaTeX"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index be2ee44351e7..f304ff04b94c 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-httpx-0.21.2.gh.tar.gz 24311 BLAKE2B ae1ce7ada3977c3bd68f31b5e20e93ac32f2459359bcff30d1ccf358b07ce269f38acb06b46211ddaed1085a9cf78fcefb921a978a5ca4f6c84fe25b602a3a25 SHA512 d8a9d1381a7c1bb1f907effce48bcd4cad29b2eb135e5d18e7ba3025ba2f18d97c7914f0cfb835416dfa608c59ed51db653b0366d407cfbb82fc520808f3792e
 DIST pytest-httpx-0.21.3.gh.tar.gz 24373 BLAKE2B 8efa85974128a0c9d78bbc23b7c9bca17e68ebb09dafd3b49e5a09df54bd2808ab6e7995ab407b78495ac12a80239d7397169c8de539ec559a8c7cf95239b495 SHA512 8c25a702b9c049354a0f0b232eefeae5ac0c47764af023c89aba6829309971a1d79a0dab3e4d6275a6bf0f32f3a8309c9559eb22c9b742a6576ecea37ff0d15d
-EBUILD pytest-httpx-0.21.2.ebuild 774 BLAKE2B 7eff7358b4d922d9e06886de8776f87085171522b9c397454cbf7ea82ea35ed46a24160509c107ebff92ef281dae6091d62b14809b530c0891075487b8f65634 SHA512 fd260a4ca72148a90b78cd8ad5c7fd935aa742bb2daf1d742bdb313c2aa48c5cea35eba7278095cf4ce77fd2fb68526d0b9e2bc093110ac94d5c08930b38de4d
 EBUILD pytest-httpx-0.21.3.ebuild 774 BLAKE2B 7eff7358b4d922d9e06886de8776f87085171522b9c397454cbf7ea82ea35ed46a24160509c107ebff92ef281dae6091d62b14809b530c0891075487b8f65634 SHA512 fd260a4ca72148a90b78cd8ad5c7fd935aa742bb2daf1d742bdb313c2aa48c5cea35eba7278095cf4ce77fd2fb68526d0b9e2bc093110ac94d5c08930b38de4d
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
deleted file mode 100644
index 209a66e83b11..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.21.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-SRC_URI="
-	https://github.com/Colin-b/pytest_httpx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.23*[${PYTHON_USEDEP}]
-	<dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-zstandard/Manifest b/dev-python/python-zstandard/Manifest
deleted file mode 100644
index 02c086b43b11..000000000000
--- a/dev-python/python-zstandard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-zstandard-0.19.0.gh.tar.gz 683942 BLAKE2B 5b28fb6360147f87fb658d28652e5e43b0e41ff3cc31e46d91b1dcdd5334869f9a10a598f3d1d15a8c0f02afc59d009a8088ba3e81066f1a5f1ad9c05ebd4a1d SHA512 56e7b43161940f182ff5a0745bb6bdb2710c9a61140c4a84b690e0abd18c8b862211ab2b1ba36cfd99fe75bb0ae00af7de798b010b2bd4c5a44d691d4fa0c63d
-EBUILD python-zstandard-0.19.0.ebuild 1595 BLAKE2B a76dcfbd4df37802aafd9ec144d9624c366c86775257ab2faecaa9be4ba419d5b87fed441c9f380bd3c227b58b31e51ab3e3cdcdceb2c3ac7a4baa35e46889b1 SHA512 ef58eb6302b02c98969a33b529cacd6588b743ed9b9943095563ec3d43579bc1d3f1bc9f1d75de586970430e653885f6aa6a9c746889217f92f5434bc579555a
-MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/pywlroots/Manifest b/dev-python/pywlroots/Manifest
index 1f5d3c6f4a53..fe7692516fae 100644
--- a/dev-python/pywlroots/Manifest
+++ b/dev-python/pywlroots/Manifest
@@ -1,4 +1,6 @@
 AUX pywlroots-0.15.24-no-import-version-check.patch 592 BLAKE2B 24ef9a82a3a7c62e8b0669cd25e6cd984a633ebf8f276436f48d54f6064119cceffe400a8c386e6407f3063fa678bab10d4151e0a5976041eab0ff36a16b7c6b SHA512 4a93ebad7670ba6ff41e68030b33a15d7545f244fa5b982fc3dd12c3a349e70f2e59267c9d6f2383a80e2376243118cc46bb4b3d9027abbe3cd9d69d1be5ebf8
 DIST pywlroots-0.15.24.gh.tar.gz 85570 BLAKE2B 0c7ba0be6159152488785298028bb1feec20e2380357060a850dab417b3fb1fccb4a9e6cc6564d2b7f124bf4fc454789549267e9036b0b4559e5fcd4c6f06196 SHA512 b29b76cf18a65b2ef19d15ecf018a9ba44119d60ee61435967d17f06d5f7544d2117f2e9a81574734c71591a237b00c8584a5cc6d6adb928f39f11170f21ee94
+DIST pywlroots-0.16.0.gh.tar.gz 90064 BLAKE2B a9be36d0bf7462bbe3a7a2d9cece1e25d87440467b91059060c28e183236f21753d7bb2b14ce7775cf07c9ce170928ebff5ae8987b24b281aac7fd1c55a8291b SHA512 c28a2822a0494b9f90186a8033dd3f8d769ca0aba808f3574dfc3891b76e3ac560596379ecaa3e8822c4c253003c60899a5e36e283a002a20440209b59f90406
 EBUILD pywlroots-0.15.24.ebuild 909 BLAKE2B 42b30c5528e97f9b49af68db993c4a609b8af80148269fef618d6f0079d5b557f133e4f7edf6326874c16536e7e72f5a0102341006af1149a45603b0eeed86a7 SHA512 409fb7c21a46dbad3bee34d6f9a3be8d6494a2db0da04f54242d66fb33355c31c0b7da62465e73d1bdd8c8c8e2049738e13d67f915a1c3eb324f17389269b5e8
+EBUILD pywlroots-0.16.0.ebuild 856 BLAKE2B e9584ded94c13df59dde116c93db300ea40efe30ccfdf7da8bcfc6d6c88ed7987446f6f9de874be5fabd5875ed698a3b4cd0c6b9a8bbb84c555f23bfea362358 SHA512 6d303052aae9c75b04d4d8625798f32c54438aad81a69c21364a877f4be46ba89ae6bded3d5771812cbdce3ac84e91a7cd015d8c98e481ad76054e696a9df2b5
 MISC metadata.xml 351 BLAKE2B 8c8ef3ef1d58928c0a15fcd756e4d1c94b2793626c9b4e9cbeb31443119cb47fa4975063547065cbc6e06f327ec7d36beb5e74973fd3d372ad4f7feeac3410ea SHA512 b4840e4149647c29e358b64d3de99a0f2b148a4d7d123d7ef7df67cf918a3f599d3e199ed7ef4d0d39bf8ccc8e4630058db4ae3a2260119ce1c5d255bf2dd9c8
diff --git a/dev-python/pywlroots/pywlroots-0.16.0.ebuild b/dev-python/pywlroots/pywlroots-0.16.0.ebuild
new file mode 100644
index 000000000000..b802883e934e
--- /dev/null
+++ b/dev-python/pywlroots/pywlroots-0.16.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the wlroots library using cffi"
+HOMEPAGE="
+	https://github.com/flacjacket/pywlroots/
+	https://pypi.org/project/pywlroots/
+"
+SRC_URI="
+	https://github.com/flacjacket/pywlroots/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+# See README for wlroots dep
+DEPEND="
+	>=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}]
+	=gui-libs/wlroots-$(ver_cut 1-2)*:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf wlroots || die
+	epytest
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 36c357065ebd..c7da3eadccbb 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,8 +3,10 @@ DIST setuptools-65.7.0.tar.gz 2618315 BLAKE2B a0989c3fd0ab476d69885d022eccf1a89d
 DIST setuptools-67.2.0.tar.gz 2475665 BLAKE2B 1d82e21d5c5f7aea479d468ae5c29c62a86a552e811203794f2246bc715647c18c66ab6d37c9da3092fc2b402cc865c1ab85989092c9beccc440913ad7d51ccd SHA512 2d15719d7a0305535ee853e82b5196af2eaa29cbcf73c59515c2fa8e8c910c25fcf3854aac515789a51a845555b19c95e8d06fef4199cf19ba4a45dda5b7ab66
 DIST setuptools-67.3.1.tar.gz 2478867 BLAKE2B 5f2796b548c43e3e3bec71d81fc37938f97eb15256a93d30d749a3175c0c5278316d7b513de651c85b367e49b3bc3e14003a3c7607cf445e5d6137afa5b2c3f1 SHA512 5b0d71572e4107a673a95dfea56a363492a62a3a04ecc8f3095ca79686dea452299358a52b0571179a738226ba92c35d04a2e37d3504fd6c510053cf71e2680d
 DIST setuptools-67.3.2.tar.gz 2478825 BLAKE2B aef884a135f78ebac0505cc62c785609e20d8f639ae4c678dc685711095e87b41da296f5e99b20ef8376be3d3a58cac1f338f14cca3dae1bc42404be2e89d851 SHA512 55e69cac241109d8fdcbe6bbf4ea36a7611f8cd77b875d456181f85622797b78f385aa7459283c02bdd442585b79768452f69c830591579234df279fd82290b5
+DIST setuptools-67.3.3.tar.gz 2478985 BLAKE2B e9dcf43a8706b4d77c0a57c72c3dcdf06996563a1778b4543ed3f4e79bb68f4bf9b2c8f08f3d247571a1770518e6ebc636c380cdb2b906dcf78185ab3f4f47fe SHA512 35f3438fa178e6bd066d59ae50d816bc9b7591035c118bef34c1c0387267ce46fb6162630be7a96cf63d9ce45ef3cee4493fd8f3613938d8159daeb64bdc3c27
 EBUILD setuptools-65.7.0.ebuild 4450 BLAKE2B 0d6c6b9a30319a5f80c03b5a662067f8343400ed80384b2b1680d2258332667d28d28451e67f9332b6079362862392cc7f9c9d5121b8c27c43a7256c54540e48 SHA512 33a6cf573592f6489b6bbee633032a14c79911bcbd828db795020e2f3ea0060af65a85b4db7faa623817a68f9bb6419183fcb6a0451e33566502f84497d2a81b
 EBUILD setuptools-67.2.0-r1.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
 EBUILD setuptools-67.3.1.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
 EBUILD setuptools-67.3.2.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
+EBUILD setuptools-67.3.3.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-67.3.3.ebuild b/dev-python/setuptools/setuptools-67.3.3.ebuild
new file mode 100644
index 000000000000..f46eb55ab7f3
--- /dev/null
+++ b/dev-python/setuptools/setuptools-67.3.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{9..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
+	)
+
+	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/tavern/Manifest b/dev-python/tavern/Manifest
index c4dc36e9a8e7..9faa6e6f1fd7 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,7 +1,3 @@
-DIST tavern-1.24.1.gh.tar.gz 163938 BLAKE2B 661160fe203e5117452e23178a74279a982cb3e4b4cdb84df074d5cd8481796cb9a05b2c5d42b225c6a2d2cf34283166d59a3242ff5df76a457d89c6acf60576 SHA512 9a9f7e46172a62a0dbf0c42aa0521d0fbde644f05a650dd768a32b3c8652bb17209b8073519830e52b2865bbe646825e650cce251184b85f0a5343cfd2ceb1c3
-DIST tavern-2.0.0.gh.tar.gz 207901 BLAKE2B 8b5c68a16361afcf3ff5936e0d7e3d706da5052422e2c7a6aef97c8dcdfc370c8d0236bf40c9b03e12120f06279d4af39d321964214ddc0e2db7bf4e91c389b3 SHA512 aed751dccc26317c35d96b29e0b3ed6bc5d4f4bd70261c296dfd5573a83cb9b10e022a247eb9df72a2879f2d324098233b6fbae8847472052eb1536f457f7592
 DIST tavern-2.0.1.gh.tar.gz 208510 BLAKE2B a1b6f19d188437758690eced663556e9e3a5cfc8cedf4e04baba0478efd9507faa5dce2c6f308b2ce6e806617a5e75a8a1b2e60d9afe804b2294ca772ffbc7e9 SHA512 72025db6efa7d41f7dfe80ffc83033e12941ac3a9c4b71170647e571f6ce5022c84c0976d7d50fdfe38da06a4b516e334eed2334e016cfb013613fcc05eeaa9e
-EBUILD tavern-1.24.1.ebuild 994 BLAKE2B c785d88049b539d1e0553c9d536c100f638f25d03cd0fc63695fa9e872a1d994a574b16267678e4452a6621b22783bc6e5ce974afc59d8b01fcf2bf866d41631 SHA512 bbd79a9810c12965eea3fb7d38182d6e217555655f299ffc600a692553e220aca1a48400bb2bbab49c63ac91e3847216f29a88d833093f2902395ad60cfd2108
-EBUILD tavern-2.0.0-r1.ebuild 1243 BLAKE2B a22e5436d2a698b885494ee937e34ead2e2af67f81ec1ff197b5eb5c24b00cfc7b41c253c5788ce4ef8f5fddbbe19c1f1b18261383c74655fce8695e11f5904e SHA512 81c39dd44ad5358a8250f3a2f1dd8cbd81f981cab9264bbec5c011763d82c4c741ccd96578ae4eabed4b3de6925187cfc6b357bd5c6c1fb37ead5ef5afba38df
 EBUILD tavern-2.0.1.ebuild 1192 BLAKE2B 8a02b772fc2069581bee6cc8140ce162382460b127d2e012cccc6da6f8297897997b5dc17a768f75647e9cf34626ac7b5dce3675af9ea6e344ecba749aca0371 SHA512 f77bb303b5f3e465eecefd445a5183bfefbe80d6f1066ed4ca632841b51f08aa8a5d912e9b632abbce88caa1eae7a6e556fe4b443ebfd7cd6ac88f78db984f1c
 MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
diff --git a/dev-python/tavern/tavern-1.24.1.ebuild b/dev-python/tavern/tavern-1.24.1.ebuild
deleted file mode 100644
index 3bb6cf68a411..000000000000
--- a/dev-python/tavern/tavern-1.24.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="
-	https://github.com/taverntesting/tavern/
-	https://pypi.org/project/tavern/
-"
-SRC_URI="
-	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tavern/tavern-2.0.0-r1.ebuild b/dev-python/tavern/tavern-2.0.0-r1.ebuild
deleted file mode 100644
index 90e2ddad599e..000000000000
--- a/dev-python/tavern/tavern-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="
-	https://github.com/taverntesting/tavern/
-	https://pypi.org/project/tavern/
-"
-SRC_URI="
-	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip unnecessary pins, upstream doesn't update them a lot
-	sed -i -E -e 's:,?<=?[0-9.]+::' -e 's:~=:>=:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 115175bc7935..6d64207128f9 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,5 +1,7 @@
 DIST trove-classifiers-2023.1.20.gh.tar.gz 15075 BLAKE2B 04b5902c0318d495be8ef5f3602ae93d0a540f34382dd269202f4b0e6773d9c0adf023df9c45afece0ae27da8dad25d0018b602dc2a02e775c40ea73afb77195 SHA512 f99dee6f42ef3d1e42d0d1f520d882af2d430133a317de693464a526849bf6d9990307c189b5bacf2fa97c316d0c806ecfe9cfcd05a6734e79992763f597dfd2
+DIST trove-classifiers-2023.2.20.gh.tar.gz 15075 BLAKE2B 83c970fee610eef97c4beedbd77d8741fcd71c52676888f281574d91818ade2ca0de5119c354b01236eb6f9f6de29a75dcaed4f1e6c4a9ba9dbce68a75344348 SHA512 c6dc3d80ac7da86c5003aba3c8a4dee431a1ccb61f67b0499e40317a8b141b5476620eefc512167fe4a61e1fe7045d6ef2ace885cbb20bfc998ed979ddfcc83c
 DIST trove-classifiers-2023.2.8.gh.tar.gz 15070 BLAKE2B 92af68e3d967d984f60e1aedf6a32b7b4bed777c9947091a054dce27448965ea0b2221d61277932cd2d6520f112fded1af9e29c21d5d0d1dcb4170febe082252 SHA512 b1f1e25bb4bb70b059ab6a4dd0b57bdeac7b69176ced4a7e847c8b449511eaf50b2f62efcc06ddea7605dee4dc7f987e6dce2f9f92a5912f60eb74dbb1e870db
 EBUILD trove-classifiers-2023.1.20.ebuild 664 BLAKE2B a20d5b4b5e946e70e68ce5ddf332367393433e2cfff637ee31405e62c48b3c1aae6ef095ecef55f89b0c116c792d6d2542393cc9ae60c89eb7307fe61fd631e9 SHA512 26e1a23c3f469f050d07900eeafa808735f16721e1c4f85878b17999a4e05e18e1053128333841f1acbdb926a6e61bd2c44779fec0337a865cc17a297d8508b3
+EBUILD trove-classifiers-2023.2.20.ebuild 664 BLAKE2B a20d5b4b5e946e70e68ce5ddf332367393433e2cfff637ee31405e62c48b3c1aae6ef095ecef55f89b0c116c792d6d2542393cc9ae60c89eb7307fe61fd631e9 SHA512 26e1a23c3f469f050d07900eeafa808735f16721e1c4f85878b17999a4e05e18e1053128333841f1acbdb926a6e61bd2c44779fec0337a865cc17a297d8508b3
 EBUILD trove-classifiers-2023.2.8.ebuild 664 BLAKE2B a20d5b4b5e946e70e68ce5ddf332367393433e2cfff637ee31405e62c48b3c1aae6ef095ecef55f89b0c116c792d6d2542393cc9ae60c89eb7307fe61fd631e9 SHA512 26e1a23c3f469f050d07900eeafa808735f16721e1c4f85878b17999a4e05e18e1053128333841f1acbdb926a6e61bd2c44779fec0337a865cc17a297d8508b3
 MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.2.20.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.2.20.ebuild
new file mode 100644
index 000000000000..850f0b5ffda7
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.2.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-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="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+SRC_URI="
+	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/types-docutils/Manifest b/dev-python/types-docutils/Manifest
index 232efeeb29a0..7d3cd026f957 100644
--- a/dev-python/types-docutils/Manifest
+++ b/dev-python/types-docutils/Manifest
@@ -1,7 +1,5 @@
-DIST types-docutils-0.19.1.2.tar.gz 8973 BLAKE2B 7303c3ce16c9521215f29d2129394a92d436b2c75441189a6c3bbb0279c504ccb34995e9e40c777af7d6a09524043d05640d0419bfdbdc93b83b7daa91c6a9f3 SHA512 b9c4fff2f56bc77209f771996c24eef0c4d902dccb932e50b0f7207cccee8aef8335dfdf2cea7ff63f8c80de00be9293fd8367b78562dd7190f25228811177aa
-DIST types-docutils-0.19.1.3.tar.gz 9008 BLAKE2B 92d5ff462be1e9a1ef370ffc9823c790247de78fa83b44ae1d99245f465241416dea508fc4262168b03f823d2e0094650d3df14a3ab1b4a6f43a6fa0c5559a70 SHA512 e5afb78b50e874969aa96376e81493d1b1b17ea9dc85254d9c143b1d72a147adc0b84fc898006a37b7cbefa8d73d65441d8ef67650c4a582de5185f9a7d129ea
 DIST types-docutils-0.19.1.4.tar.gz 9011 BLAKE2B dbecebad58aac788d161688bf5f3f25ce0afcbe5240b370b342490ceec1b43ef6d13b773e61197b6cd2e8016986ae07ea7a098351edf0fe10a4e38918d0b8c04 SHA512 927a050c262fd0a141eacef20e88ec70eeead647f7d04179a760e5a231f4ec6c974119642dbbaf674e77f29292b51894a265ef1962b535b5526746977b459162
-EBUILD types-docutils-0.19.1.2.ebuild 399 BLAKE2B b062ea0887482f57e39dc3b213d9cfa758c7b77b201bf40707363a47b3f41e76d4fa981260a2ec01d9bc05b1064bf8cae2ae915e1eb1886b361527ce6b515183 SHA512 a88fbcd3d12735f35024bd079802106bb7043fa9c6e5623ce0db2425f6cc55623caa8df38a3f77412e648add977a36fa0df9d7f76055549fde0e5aef68ebe973
-EBUILD types-docutils-0.19.1.3.ebuild 373 BLAKE2B 8dec0d93924bb7e297be9b249cfb673681de368eea49c5e48b8e95eff7cf09117d03a6a0d692b85f200af215e57e53331d2392a98bc2d7c69144d6d541cd63fa SHA512 58617888fc7fcf514482f0c5478a7574d05dd1751d504268e9a64b82b4e3eb7e52813dd2d4a04a0f6075c01b3a5ab34fe3a9e25b7dc1ed84be1fe1865d2a7247
+DIST types-docutils-0.19.1.5.tar.gz 9221 BLAKE2B a5f642a1b0ae8cc3c06ca8ff4f82ad7527414417ea077c1fd7ae6757187f9e6070b6571b051a145e68a62f3e0329f17f44247ef51f8f8acb90c1d7450909a494 SHA512 e5e33839c7ca8ef20815c7cc9dad452578d366b69d20c57aa84b59999909aebc0c30ecb315e7861c94fdfc8db88359c974498a63d7b44728b7d3fb6d6131241a
 EBUILD types-docutils-0.19.1.4.ebuild 373 BLAKE2B 8dec0d93924bb7e297be9b249cfb673681de368eea49c5e48b8e95eff7cf09117d03a6a0d692b85f200af215e57e53331d2392a98bc2d7c69144d6d541cd63fa SHA512 58617888fc7fcf514482f0c5478a7574d05dd1751d504268e9a64b82b4e3eb7e52813dd2d4a04a0f6075c01b3a5ab34fe3a9e25b7dc1ed84be1fe1865d2a7247
+EBUILD types-docutils-0.19.1.5.ebuild 373 BLAKE2B 8dec0d93924bb7e297be9b249cfb673681de368eea49c5e48b8e95eff7cf09117d03a6a0d692b85f200af215e57e53331d2392a98bc2d7c69144d6d541cd63fa SHA512 58617888fc7fcf514482f0c5478a7574d05dd1751d504268e9a64b82b4e3eb7e52813dd2d4a04a0f6075c01b3a5ab34fe3a9e25b7dc1ed84be1fe1865d2a7247
 MISC metadata.xml 325 BLAKE2B 399aab1e8779e48d84998d6fdd595638aaf674b9a7076573aad7ade16855c4fc785dd45b1eff833c8ec7accda2a08cf561dfa14237e4edf6292fc7961ad76f7e SHA512 fb2768e73dd948c79654ab22c24d868a418576f2008153e45e4d0b42e2750872884bd35451ee3917203469d72d1c76f84d849e9d3534dc1006eb4d80b3ef04d7
diff --git a/dev-python/types-docutils/types-docutils-0.19.1.2.ebuild b/dev-python/types-docutils/types-docutils-0.19.1.2.ebuild
deleted file mode 100644
index 13149a76e44c..000000000000
--- a/dev-python/types-docutils/types-docutils-0.19.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/types-docutils/types-docutils-0.19.1.3.ebuild b/dev-python/types-docutils/types-docutils-0.19.1.5.ebuild
index 9a24481a1e60..9a24481a1e60 100644
--- a/dev-python/types-docutils/types-docutils-0.19.1.3.ebuild
+++ b/dev-python/types-docutils/types-docutils-0.19.1.5.ebuild
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 4a5f147d246d..0655f5184991 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,7 +1,5 @@
-DIST weasyprint-57.1.tar.gz 429652 BLAKE2B c94cc05f6c3b831d3214d7476e3fa799ff62d8fb575044a6f11172e650a87b1277e21fef40577bb01a1a778982a98e1a57801de708b3a3a26520b50aae8b43ac SHA512 0a130fba07d1d73eb4e9dcda27ab51ede45c440717f6fedb8d6aac09283244c366d36d85c2dac85995fbaebac21cf880a0cb684baaff3788af3eb6b4931c014b
 DIST weasyprint-57.2.tar.gz 429120 BLAKE2B c97ba3fb3eec431a7de9a1a8a440290005de11b11d4abac4dd993a7d2fc4c14e64bdf13b8f8c12d4ba4f94b2049e0b05c3fb950c8b204f446323038c9c471451 SHA512 11b9469d37820439b1d0dad0117dd1c9649011c71aabb0e27008b303e5c851215ce9f0b271da9a74d614e54cb23f9c6036b6e094016b5688f6b700fb7444338f
 DIST weasyprint-58.0.tar.gz 433708 BLAKE2B 3ebb87eeeefad8d8a1a6a5d1ec54bef5cd153e8f837d19f87ce6ee891d4a20d41b38532972e9942e4d2123107491db42e0d690a95b8330510010ec2267c2948b SHA512 6c8258b1539ba7c6c692d0a54d0adb36a252d9f1a407df7934cf37202813e08e16e97d2f70a322a2787e2ab64545f4a4fd745fe4771b9383f520b9fc8d51db28
-EBUILD weasyprint-57.1-r1.ebuild 1072 BLAKE2B ec59498015c698c0e6dd02a33c07691261c88c20f5efcece07cf754689c7d3085899b954288c4017b2ab5e136dd334b2d5b6675b6760888350d631aae39c0e79 SHA512 b74bb9363e33a0b7a9886eb8332bd288c88ba058e246901fb9a441254ac5807523b402a9e0e0c121c657194b92690d825566a21f10f4c24046a659f308deb838
 EBUILD weasyprint-57.2-r1.ebuild 1072 BLAKE2B ec59498015c698c0e6dd02a33c07691261c88c20f5efcece07cf754689c7d3085899b954288c4017b2ab5e136dd334b2d5b6675b6760888350d631aae39c0e79 SHA512 b74bb9363e33a0b7a9886eb8332bd288c88ba058e246901fb9a441254ac5807523b402a9e0e0c121c657194b92690d825566a21f10f4c24046a659f308deb838
-EBUILD weasyprint-58.0.ebuild 1073 BLAKE2B 282e3875289d148247ea68fca2f80defd15d16975855338417435027ba00500af448d76bf6c906a3106ab820f3b6d96eb91da02be4c9a269dd1684ce7055f544 SHA512 b051452c64790d5cc7d3e4a644e7fc87c70f02564c2ac06ad23f2d9f81a34ca4e211b9441d8b006b49164b9b49516593b1e278a15fa3b32bc466484c64aa1f07
+EBUILD weasyprint-58.0.ebuild 1027 BLAKE2B aa9cb193b4f67cda4f41e6f5c9754ccb93877a2aaf007fa1e691e6a20fc590b58d45b6715dfada087e75970a64c3a8e6e328e8d879c474be782f4e58170ce68c SHA512 3db0d9f706ece3722b0ebc9562bc156d9d866bbd6da3d661d0b997413028c2e157cf47e8ebc702d37eaed87a56575b582a9181f279b112f45e8456e6506a33eb
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-57.1-r1.ebuild b/dev-python/weasyprint/weasyprint-57.1-r1.ebuild
deleted file mode 100644
index df8f1a72c91c..000000000000
--- a/dev-python/weasyprint/weasyprint-57.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		|| (
-			>=app-text/ghostscript-gpl-9.56.1-r3
-			<app-text/ghostscript-gpl-9.56.0
-		)
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/weasyprint/weasyprint-58.0.ebuild b/dev-python/weasyprint/weasyprint-58.0.ebuild
index c9362f1c7799..82f7ac74c708 100644
--- a/dev-python/weasyprint/weasyprint-58.0.ebuild
+++ b/dev-python/weasyprint/weasyprint-58.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/Kozea/WeasyPrint/
 	https://pypi.org/project/weasyprint/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
new file mode 100644
index 000000000000..53f352d09098
--- /dev/null
+++ b/dev-python/zstandard/Manifest
@@ -0,0 +1,5 @@
+DIST python-zstandard-0.19.0.gh.tar.gz 683942 BLAKE2B 5b28fb6360147f87fb658d28652e5e43b0e41ff3cc31e46d91b1dcdd5334869f9a10a598f3d1d15a8c0f02afc59d009a8088ba3e81066f1a5f1ad9c05ebd4a1d SHA512 56e7b43161940f182ff5a0745bb6bdb2710c9a61140c4a84b690e0abd18c8b862211ab2b1ba36cfd99fe75bb0ae00af7de798b010b2bd4c5a44d691d4fa0c63d
+DIST python-zstandard-0.20.0.gh.tar.gz 712241 BLAKE2B 6ec393a440eb2a0527e655ee1aec16a47120578bbbb69d2f208b4367be199041887bf02d8feeb74f87992d0ab2b5e668cf8b3d8cd8967bd6dc47d4e052781ebc SHA512 bdbbd829e431a9b1ad1247b83e2e6102314a257a32c92a5c666c5ac050eb115bccd9d358240ac9ab41e975ade13bbbc155c66cb8fb583d2ee8dbd28ae323e4f8
+EBUILD zstandard-0.19.0.ebuild 1647 BLAKE2B 6cbfffbbf41c2fe9dd8dd0be1f192fed7b01e40f595bb82afc85c187f60631f8eead8210b6bddd72462d1078cffe36d41dea46e485b367aac63a2a620e968cd7 SHA512 f32c7c1e1a6916ce7e42263912257c8bb302bb5b6cb257f6078b75e83801aca9fd4a5aaa6b4c5b9407596e6a63294103310c116570c484f697b3739211c429a4
+EBUILD zstandard-0.20.0.ebuild 1616 BLAKE2B 4cda7962cebc049076b514b143cc9792d3870af4fb7bf5eb1745e90e39366a014f6ff741e4dddcf0b199692f9770fa922ee16f2f8f22936268f93ff0afe9e4b7 SHA512 88ce76ac9160843be9d111f8e8d148799e2cc1aa55ebf02c67f22c15eae7af3e8784451771bdbe1994639efe090207f9d688d1903b6404c662e4b27cd31dce86
+MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/python-zstandard/metadata.xml b/dev-python/zstandard/metadata.xml
index 9bca3117a180..9bca3117a180 100644
--- a/dev-python/python-zstandard/metadata.xml
+++ b/dev-python/zstandard/metadata.xml
diff --git a/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild b/dev-python/zstandard/zstandard-0.19.0.ebuild
index b643ab6b8dce..1a91f27e8b20 100644
--- a/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.19.0.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1
 
+MY_P=python-zstandard-${PV}
 DESCRIPTION="Zstandard Bindings for Python"
 HOMEPAGE="
 	https://github.com/indygreg/python-zstandard/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-python/zstandard/zstandard-0.20.0.ebuild b/dev-python/zstandard/zstandard-0.20.0.ebuild
new file mode 100644
index 000000000000..5fc27ad9bd17
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.20.0.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+MY_P=python-zstandard-${PV}
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="
+	https://github.com/indygreg/python-zstandard/
+	https://pypi.org/project/zstandard/
+"
+SRC_URI="
+	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+	# unreliable, fails on x86
+	sed -e 's:test_estimated_compression_context_size:_&:' \
+		-i tests/test_data_structures.py || die
+	# unbundle zstd
+	: > zstd/zstdlib.c || die
+	# it does random preprocessing on that, so we can't use #include
+	cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die
+	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
+
+	distutils-r1_src_prepare
+
+	DISTUTILS_ARGS=(
+		--no-c-backend
+	)
+}
+
+src_test() {
+	rm -r zstandard || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index cc5fcb3b8fe6..0b3bffb774f4 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,5 +1,5 @@
 DIST zstd-1.5.2.6.tar.gz 606528 BLAKE2B 0d9b0937346e69a25eb834d2894ab74efdd3f35390afebc98a6cb255f18cdbe540433139d51f43bf0a9fb5d85bee588c7df8543842248e700652af3e3e721df2 SHA512 a692d87ffad4d148d56487fa740876653ccbd151ac8a897a35946a3899d4d3b3aaf6e9954a2050b4cee8137d5161481f3460a0e64ce339c624349bf030c9f975
 DIST zstd-1.5.4.0.tar.gz 620235 BLAKE2B 490415a1be76e4957f14e2e5137eca5a80290e4b492d551cd230826b500a36a8574d0c20eabd4d0bf6bf34d8c61f60f8e6aef5220bf3b0a2e5ba95eef1aa428f SHA512 f9a9301cb0f5f3f7fbf67dd44d9b748673894b89002f5666f394c093545a779370f79ab5a4fbe853be40d8701a5c9203a26da3ef6a243650f2c81a2c0d029b2d
-EBUILD zstd-1.5.2.6.ebuild 672 BLAKE2B 78830eb50ca31e101d71ce591092a56718e06034928140e613725b2dafd3231a11e344607a34c91693986214c93c2d2f966805ecac8c7fd025fe5fa47d90764a SHA512 7e27f0f33d3ed9c85c525072ab55339d393b475391c408df8e1adaa8a7bcdeb8d111c9a9fc7831e147401f4cbd5026c6470ecec8ff8a1639b4ea33999bf0264c
-EBUILD zstd-1.5.4.0.ebuild 615 BLAKE2B e84459c2dcf294774d8e185cce9f126db31bd48a65e47e206ceac45c2b39e533bd569514156160f2d8cc09e3203d6493560cad6e0923431fc67dc8ed0f9b1f13 SHA512 7ba1942607f6a10470f67da3c29cb51a316e5276b58eecd41ebcf8d2f7f24a9ad83f192a60c13d27040eed659f3baa761fba0c21d9c5579728d42277d2597c97
+EBUILD zstd-1.5.2.6.ebuild 665 BLAKE2B 59064546edc141501184d245d6b16099933bfd225503e6f3dea9d0c4054e74fe90d37be96a333aa7e00a227b667b2a9dc045f1cfc1ef880ef07201bf39446c59 SHA512 e077daa3ab6ce13d266ca83fedd7880a963524f89ef125639e6d6e0733394ad02899f29f8160cae0787e3d2516fa70f469c39d6fd04db439ea1d9d9570350473
+EBUILD zstd-1.5.4.0.ebuild 568 BLAKE2B 2d204e8b0c709f1652d82d7e73e657d2fda69801f1e7562c71073bef11fbdee55b8a532a60abba67a21da5098a17e417eaa4d691f74e0eed31012e693e8e7aa2 SHA512 dee23d0b504e08acca9705701267cf9412720cba85e83aa2e6fb4481a5827d5bdf13e3e3695ff81f0efff759ab92d5d502842a51d6a0d4ceb5c9a0d9b3a78fe5
 MISC metadata.xml 472 BLAKE2B a4d69b294f26714e9f5211408f01222174c8dd9b0e990840c4603f70a7080fd41a6f3ec74987e40b330a19967f0b90447446b6d5fdb1179ec3be0406592f6b3e SHA512 0cb6b445a84c48dc909eca438bf3908bdc08309f27314692fc2a3fa5a21b3cd1af92e06a593fb2a2cb32c3f0f70db56b7177abcc1fa4348c664e779f0e277cda
diff --git a/dev-python/zstd/zstd-1.5.2.6.ebuild b/dev-python/zstd/zstd-1.5.2.6.ebuild
index e57b4b4ee1e4..0f00177eaaa4 100644
--- a/dev-python/zstd/zstd-1.5.2.6.ebuild
+++ b/dev-python/zstd/zstd-1.5.2.6.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!<dev-python/python-zstandard-0.15.2-r1[${PYTHON_USEDEP}]
+	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/zstd/zstd-1.5.4.0.ebuild b/dev-python/zstd/zstd-1.5.4.0.ebuild
index df6eb247020a..0c805254d3dc 100644
--- a/dev-python/zstd/zstd-1.5.4.0.ebuild
+++ b/dev-python/zstd/zstd-1.5.4.0.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
 HOMEPAGE="
 	https://github.com/sergey-dryabzhinsky/python-zstd/
 	https://pypi.org/project/zstd/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"