gentoo auto-resync : 19:08:2023 - 21:39:30

148 files changed, 174 insertions, 2883 deletions

diff --git a/dev-python/Faker/Faker-19.3.0.ebuild b/dev-python/Faker/Faker-19.3.0.ebuild
index ee6214922d36..b1ef37fb8581 100644
--- a/dev-python/Faker/Faker-19.3.0.ebuild
+++ b/dev-python/Faker/Faker-19.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 54f465cbccbd..e56e7c12c9ee 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,3 @@
 DIST Faker-19.3.0.tar.gz 1677117 BLAKE2B 855e3cc49e56d9c690add2b9bda9fc8c6e42a157543c44206803e794bc5a5da440f2a5151d959bff6aa438af465f7d4bf986e596af592251e64c80c861fdb8fb SHA512 cfbb81d8751fbe1c90260f806f36a8c95e7bcfe5f30555bb168b80e5e438a4e427482eb4220b55a6bd0f04ce4d64e9bd24b757b852b5a22de5f2b127e3f3fe25
-EBUILD Faker-19.3.0.ebuild 707 BLAKE2B 73f546a6f125391fb7479433e2e65ab1cfac13663a38d072eea015ef6f88fe2606c5180388694ba5a44f15ebd32a217920b6553f6ffaeab14613af6ee8df6a69 SHA512 0ddd66d527d847523f35549968e7c939603b657a252d55969fff99ffc4e65e56a951cfba63080a24613d3fed58a080e98f8e7a568a00f0664980db43d04f5d43
+EBUILD Faker-19.3.0.ebuild 720 BLAKE2B 1622a45722bdbe31e07f0edbf3dc3bebeef97305e38cbeaf7a216550e7c509244b1779d4e0c529e0742e6e4c80bafb8a44c49f9682bfc1f12741c79fc7562f97 SHA512 ef69ab3f17f6c1161b33f069abc68ff0ba294165b85c9a31c6795880121d301e14bf7c12d99e933fb67f81b4d79e8b15889683a1d2072c863b1639f05f568dba
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0354e6766c2d..6425c2e80769 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/annotated-types/Manifest b/dev-python/annotated-types/Manifest
index 78e929789f30..4ec5cbcbca2e 100644
--- a/dev-python/annotated-types/Manifest
+++ b/dev-python/annotated-types/Manifest
@@ -1,3 +1,3 @@
 DIST annotated_types-0.5.0.tar.gz 13504 BLAKE2B 6c13267b2bdcafabc57e734e3a92133c140ed34560625ed067e01b19f4c8e250b01dacfd5518d0e7283fe469d053a1c1baed173f215231e7303defc3e444667d SHA512 d59c00ff84d510d87149aa9a33deb26e2c3aee98f0f99b63cc0eba83a212c4c1567fcb81370e8bf9add32fd23cc9ea2a5a8692a840d316c44ab7a550bd4349b3
-EBUILD annotated-types-0.5.0.ebuild 563 BLAKE2B 7167be2215c7e41786e3281d8107b57b74ab8a7c062990d7286e2238ea7ec38dfc3d7fde4b1322adf6fe2142dc21003eab01fa9994e9479746456f681f02b91d SHA512 5ede8d519ebd4fb80daad3807b8319f04d042641cdb7026c113eaa2f9977c62a28ec91df2b7d308da878e37f6acee47fc8b86cd593950d22a525e6a8d98a135f
+EBUILD annotated-types-0.5.0.ebuild 576 BLAKE2B 817bce7dcfff99ab2630384569826afb29a0d5f9ee9b417e2dd4c22e4cb7b5fc7c7d5e8b3fd7ac5913956654fd43572f6f7f6fcf6a864025789755cddfe86507 SHA512 50e184bc8d549e6f51d5bd52c14a9df9535c4ac051f75e0f5c89b47a536c5a2382864353a14c35ab8efc921dfd3bcd3a8d6af85c5e08c42c281b8df7e5bf45e7
 MISC metadata.xml 414 BLAKE2B 692ebee33e03288b0a5ec5fd649cceaf7dd6043893712deb3204371965898d12390301349644d4daebd014f09afb6a89731144747b061f872d7e75e8c4f3b668 SHA512 6434d35a1cc78c487e02a2b19d56b2778517adfa07f81003cfd981fca0c49c0f26c95139865a02bba22ea10991639b98a8ebc27d71bdfd892bcb653338a9cf32
diff --git a/dev-python/annotated-types/annotated-types-0.5.0.ebuild b/dev-python/annotated-types/annotated-types-0.5.0.ebuild
index 7c8950488609..501e24618e8f 100644
--- a/dev-python/annotated-types/annotated-types-0.5.0.ebuild
+++ b/dev-python/annotated-types/annotated-types-0.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 342497c8d7d9..e04361bdae46 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,5 @@
 DIST black-23.3.0.tar.gz 582156 BLAKE2B 01ed5443e1bb251d46618a5b61bbfcc2dc0b41c0bef7d4315fb704a2ac0fd51eb4fe268838b8be6195630f21e6f7b3a5bfca124a7bd60dbef95a02714924327b SHA512 1ea8749ee25aae34a40c5d1b779c6076971488dea1a85ebfcbe4c2a8bb5abb5e3918a735a4e3f9b4ae2690eda0f48fac014ade055721b54d879fdd2d3450b72b
 DIST black-23.7.0.tar.gz 586177 BLAKE2B 4bb50b6c7409a97aa277f1048c17101a1c91368b9269cf4c08d3052c036887d2ed6e5f1f2e044c14f41bf2d969d65183413c2a9810f12d96cbf09778c9b1310e SHA512 78d5e87bfef4dcaff007455e8c72dcd45f9374c09da6f4ba45ae7caa980005d1bc984c68fa44d4abf7969a376a4039546e7e8f537c3aa1331d213e13dcbe3941
 EBUILD black-23.3.0.ebuild 1283 BLAKE2B 432872acab80be3c9ff246283f8786a879c4d53bf3ade2e783280873ed42b72ec7fc2250fd1a0221e88adbbcfecbd161022bdb78ece07976c1de761278b63edf SHA512 6557ab1400a5b52b9d9900d8987fb18d0ef4e5317369f979ace0098fad920a9f3ac581f20e3d69cc20007f98a5a2b6549e073ec3ec7def64ffe5ec61ec9330f9
-EBUILD black-23.7.0.ebuild 1419 BLAKE2B 159bb6253fead0e9868fa730d93cda3942b8bcbdeba595a4ed853a7a5b38de2c1118f7014637adf229fa94faec559d2620093a0d8d442f85771dc13b711947eb SHA512 7891509019d71dd6a88f6b07cbf7b706136f36b20695abb14dd0a75305adec58fffe5ab0f817553e587b61800da15f38146c3779149e23e06b66df4c3c94dd11
+EBUILD black-23.7.0.ebuild 1414 BLAKE2B 5e6c155168dbb9b205aacd82fbc61d78f304f1f4019860a5aec8b4af6ad60819e9ec6d26eee3d77490a1dd8197fb8ad4f0c85f763148ee7ba8d240e2d09d35bd SHA512 f5dc743a5bc59cb2f55d2a390fb10851405bb0f4ec1c6e236f22b47c233c13e7c940ac7151a7f0fc45910d6f12156c2a39c13f9e86fcef3d4e21c83fac7d0d08
 MISC metadata.xml 446 BLAKE2B 7d9bdbc4fdd62c1b4278a824a75dede64ccd3a4d865722a99edbd4e316342879eefa7b249c453668a5d33009e134e2feb4d1ac01976146c3e988f3724749d4a4 SHA512 0a3a912fc1d439a92452e48c9749705cd2307e645bb1274d22265656f6101574edda79cf04c03ae512818e7077e404f79fb1f70fd68d9c7cd3be3417f991700d
diff --git a/dev-python/black/black-23.7.0.ebuild b/dev-python/black/black-23.7.0.ebuild
index 29726cd5e4ea..d672e7ccfa8f 100644
--- a/dev-python/black/black-23.7.0.ebuild
+++ b/dev-python/black/black-23.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 841d9ff156ec..59c67a138c43 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -109,5 +109,5 @@ DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec6950
 EBUILD cryptography-40.0.2-r2.ebuild 4029 BLAKE2B ef9cd2e0418b5ad57aa6d7768b60730c16d4e5bf6a4bc750f144cf049f2ec02d7a7ea38de27151972cb53710212f20f4b86a8b941332ba430e28f7a15eb75a22 SHA512 47c8dd2995f4689a19914810b0622295627000ad16829831acdcc91e0b7bfe3f55ac9171adf52bc3fe9138600e2b590ea9fa5b9b204ef0bf7e34adb34a7d2140
 EBUILD cryptography-41.0.1-r1.ebuild 3268 BLAKE2B a5a0d782ed358f4393fe74a23f7c2e130816f4e07b7d40e313d4bf65a497b1f1f73bd0a127d53ac662d4a9d03d5c13711c6e9a29f07a96a4c6deddf7d334379c SHA512 5dfdf322e509b030cc5917c55814037078bc8b53b67829bb375f78f13c0bb6402dda34bbea08fd779de61d1dc00f70d2ff634a96a20d023547f357913baee9c2
 EBUILD cryptography-41.0.2.ebuild 3282 BLAKE2B 94f758436f38e23342de87250df16aa17f5d8c1b1ddb541676aeae5db3e0912ea2c5b625d1aeef2435636d67d5d11f373835f9049623d7b3e22b51779d7e6476 SHA512 c4d14d5dca67d73576d8b13fe65e46ae1485d3bd1d683d99fe7bc1ae9d835bcc2627de12bf0000bf3269dc57c3467762faf4c2239d943dc8646249640ab94a2e
-EBUILD cryptography-41.0.3.ebuild 3282 BLAKE2B 94f758436f38e23342de87250df16aa17f5d8c1b1ddb541676aeae5db3e0912ea2c5b625d1aeef2435636d67d5d11f373835f9049623d7b3e22b51779d7e6476 SHA512 c4d14d5dca67d73576d8b13fe65e46ae1485d3bd1d683d99fe7bc1ae9d835bcc2627de12bf0000bf3269dc57c3467762faf4c2239d943dc8646249640ab94a2e
+EBUILD cryptography-41.0.3.ebuild 3277 BLAKE2B 17f2e22952880641a19a592c421b02a18dc1c511525dab137e50a522a529e47f82d5a4fd5a82dce66525a61d398577e484e34cdc65970d93c3c26045d6117ebe SHA512 8f3562088edd0f2f8b0e5e23e44be1b8fac6c7e86e7974c182c4d3842c7d6528d9b1a78aedff8c1ff1a84d4110fa1e3172a06d6a443383dc47baae3f7624032d
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-41.0.3.ebuild b/dev-python/cryptography/cryptography-41.0.3.ebuild
index b052a16c4691..78d20a4fd55a 100644
--- a/dev-python/cryptography/cryptography-41.0.3.ebuild
+++ b/dev-python/cryptography/cryptography-41.0.3.ebuild
@@ -87,7 +87,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 71147a2ba8d4..2502438cea21 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -9,7 +9,7 @@ DIST cython-0.29.36.gh.tar.gz 2115333 BLAKE2B 6d43779c7222ff65d7de3a35ec18ef6364
 DIST cython-3.0.0.gh.tar.gz 2713478 BLAKE2B 16be50b463cf155417fee02b4529bbde8c4402bac0098ddf2cb05e33ac4c5b455bf7595b046b2bc6edcc8121f2c6be3b7af60c3c721a37bebcf4c654cd41a43f SHA512 a9bf6f0a78accd0624bc2a61329541d97d60257ae3a6b6601f73bd9122427a3d460129b317f000d3061a4dfe3e6a6de59342354862ded13e85c7eb622ee39f9a
 EBUILD cython-0.29.34.ebuild 2053 BLAKE2B 23381f1aef8140eb5becd09cb5f39563d8d801665b7fb6f8674658d7c5923855c9124dc88c10b0bc024b5b8771a1ed25faa938b7380dbb556b84d10a34b9a081 SHA512 7dd4ea66bdcb44dc64be8d617eac48bf4f80a32db5c8e2423a94c2c7ebef2857f1a103f07f32e6281d0fc84f4d78e27e8582006bebfc4cb7deae1f1b8c1eb333
 EBUILD cython-0.29.35.ebuild 2228 BLAKE2B c80e9cedb151c7d971bb52118f67332bbcecc1e780dbef65d7965d3bac23dceeee1a189b84e3956770866dcb73a3b2f2917d4db9b3cd0f49bdf3f0e82c5f01de SHA512 be56773909d380c114bb15b40a6f2c778be66e29d465f976c64beafdba1d28f445ab63853a100f1c9e5247bfca8b86277d4fccaa72b54c889162b337cc7c9fb8
-EBUILD cython-0.29.36.ebuild 2240 BLAKE2B 951c47bc8110df60e659b7c1d94fcf0fa841064d2e47dc1883fcd681ea19e77310872b00b5e1ce0bc73e6862b9e42b0bff00407e9612fe0096c91269b9bd9898 SHA512 5112fbe372f04050e7aabf954950b37ba489f19eb5ad913dbb1addf60263edf8bb283fac608254d6ba70d560cc1e9ad5f3e2f312d5256a7ccbcf0444fea789fd
-EBUILD cython-3.0.0-r1.ebuild 2060 BLAKE2B ba3ecc1e3a8f4f411fd1ed61accfdea575c4a371e63cb5e52043509365cc1025ae885eab60ad262850a32e0005d6573061f0ef0bb71a8b3515a2ebe467840478 SHA512 f788bbcee1a8915a561e582236d42b9eba8cd3ace8271518402608bedaca1150691939fda3fc44897783e70575a6a183fc2479646ab5a6c21bfa0f5f2584cf82
+EBUILD cython-0.29.36.ebuild 2235 BLAKE2B 756f1d61c9c6fce80d23ac8aae2f27a1a733ddee89c90479bebc7df44da36a3a623004e329cb33999522e742ea9124f6bf5a1953b4500bdc16c77ea2654a92ee SHA512 a07af1a4628dd377fd1406c67d9e20955e63621df8b49909d15a3977df10e5ca6ac01ad6d21671b7f36b824b8c27a5d88250edbb33fe4139497fd995d3aafd26
+EBUILD cython-3.0.0-r1.ebuild 2058 BLAKE2B f39dc87fcd0ba334f6f5661bc8087aea873634008c80a73e9fafbf3e66c6bff7fa6c703f28e81d23fc16b4498753395a245d1b05cc71c01fe79b8b60ef9db555 SHA512 07fd03e9260b35839a05f4bc661cde42fbbc370174555a32078f33adb0ffe66c4dc166526664354aeb60d0210d056765e56161a9cf066f3b90c7d20753f83e31
 EBUILD cython-3.0.0.ebuild 2012 BLAKE2B 528ac18c3d91d15aad03d5ec6449957d0d0c3af98dedf11ed8f8c6762245811b1b16e6f443e7a1904eb32c93cdf7d222ab373751543dead367399767f75b6bd9 SHA512 eb5bb85611f0490e8d2d80b2c97404f9a9029ff9575241384a21b58010e3241bb90a138fec7fd5aaf0e9611fca1d2bcd429ad45f6e3fdcb703c5f8dead0b8265
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.36.ebuild b/dev-python/cython/cython-0.29.36.ebuild
index 3db83925618c..a27e45a8648f 100644
--- a/dev-python/cython/cython-0.29.36.ebuild
+++ b/dev-python/cython/cython-0.29.36.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-3.0.0-r1.ebuild b/dev-python/cython/cython-3.0.0-r1.ebuild
index 5455a20d026a..7f84eeef2d4e 100644
--- a/dev-python/cython/cython-3.0.0-r1.ebuild
+++ b/dev-python/cython/cython-3.0.0-r1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 3410cb76b7b9..4c1a35acd1d8 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,8 +1,5 @@
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-AUX distlib-0.3.6-py312.patch 2001 BLAKE2B 761b186ba02ceb3af5a5b88523be120707e1e1be401bdf6b63463e88466250df7f83ac0abd2b22abef15fb8a8420247e265434eeb8d69b18ac1b3e8e2a4aca09 SHA512 92af65078333e9e615f1c045f93bd795d894e85fa390c9d2236febd1ea42e9c960cd8e05c0224a11246907f85a790aae63127e695712dbac0522ee05ebddb486
 AUX distlib-0.3.7-pypy3.patch 626 BLAKE2B 9191d50f2a0e634b570f5cf65c7d1870a926eefa0945ad31f63d5c4d952fe6639a5b641b2f799105dd7ad62f0e8d34af1b799695e150d2cfbc2b780a6f0ee06b SHA512 135ee944a49f5d04022676c866b3766a3feffaf09ea499e33c020ff79e83071ff4f2acf5331623086927934de106a18a9e3f466e2b63272039e8d7a83357d084
-DIST distlib-0.3.6.gh.tar.gz 1234082 BLAKE2B 384b736d9fb9e63d1b9a9375caf972ddfccb36c99903928505e684fe09b30190f873cf7b109beb6c32a1e4b1e11a1d9947adea74f9dceef3398fcc1963a2044a SHA512 39948539764ff5d45f14dc602ebd47d523b71b587ee081d7a267669aef4e4b1013d3995cb992038136bc4c01826ea633c6e4ffd050f1511705b296bf76f3bbf9
 DIST distlib-0.3.7.gh.tar.gz 1240451 BLAKE2B 2050133ae1f57a2b37013e0e49a22903a816377d111e6a35c57084e2dd7877b41e9625e3cccbc9e67c35239814b835b064f94eec8bcd41dedd7d329f9d5be2ec SHA512 33806fd953c4b185eaa69c7d0f0cdad9ea71be73d26f0585cefd4a332edbcc3c6287b3bce024858d5d15626311f2567474b19b6366f80b2336d9b39691c6fe31
-EBUILD distlib-0.3.6.ebuild 1361 BLAKE2B 744c3b04d88b5fc5b5e1071262dc628481d1e0ea2e793d08023d9b233abc77d7e5ccaed0efc019d65ab631b892143e34ceec78f48e348e1a20f586532cdf1528 SHA512 913932c9a414a6b54f6b8d904b84e9a08b6e72c713d09ed8382109573cfce035b69bde7966a44a9779616c9e690a4bb9ee49fa91b75b287a2fe5c899e6458415
-EBUILD distlib-0.3.7.ebuild 1429 BLAKE2B 07c8aadc3c33d30cb4edbe7e31dd232f42a4c9700217babc9964d36f3746d20bc1a60056b02310226f4e50d1c6f59d5ea16577e0c4de1d3eee79bf509873b49b SHA512 fca2089502b7c63d95a51c41541c7294cb7d1d81e1bad3b67d6a5393c9d841bce75df93dd07cff052e4d454f105bca1e1ccdb401d084c0b7270e106130481898
+EBUILD distlib-0.3.7.ebuild 1421 BLAKE2B dddbf8c3c7da5683a8113582e918f6a939bf158095d52b39aa255f18158ee780969ca3e5a14f9cbc2526c8ae6c42576ab2be1183433a8826ff429fbcae5521e0 SHA512 643ebe2b36ac93bcdd5c26687fa0a1d616f2c957f9abbce8b95e5953c983ef83cec16da71d29165cd81dad7f691672e35dd981bc8c0c9b6b22b26d00069c34a5
 MISC metadata.xml 365 BLAKE2B 74d46041d58af096a40f55e08c48562eb11aa8349f2a5afeffad67182c65561b71e2723254df6176b77852f74fd569bb329e21bc8f4ba70828dc8fdb361bf518 SHA512 3d5da338be7508640eaff3ac9360387a6b98d40df477b81e9d4dd9b642e84c8d3fbdbf8c277dfaadc869bd733616329b02607fe56357139be4721d4cabb7996a
diff --git a/dev-python/distlib/distlib-0.3.6.ebuild b/dev-python/distlib/distlib-0.3.6.ebuild
deleted file mode 100644
index 2fb434b9de26..000000000000
--- a/dev-python/distlib/distlib-0.3.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="
-	https://pypi.org/project/distlib/
-	https://github.com/pypa/distlib
-"
-SRC_URI="
-	https://github.com/pypa/distlib/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pypiserver is called as external executable
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-	)
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-py312.patch"
-
-		# use system pypiserver instead of bundled one
-		"${FILESDIR}"/distlib-0.3.2-system-pypiserver.py
-	)
-
-	# make sure they're not used
-	rm tests/pypi-server-standalone.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-
-	# disable system-site-packages -- distlib has no deps, and is very
-	# fragile to packages actually installed on the system
-	sed -i -e '/system-site-packages/s:true:false:' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/bin/pyvenv.cfg" || die
-
-	"${EPYTHON}" tests/test_all.py -v -x ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.7.ebuild b/dev-python/distlib/distlib-0.3.7.ebuild
index 8d237a4bfc38..55efadc48c14 100644
--- a/dev-python/distlib/distlib-0.3.7.ebuild
+++ b/dev-python/distlib/distlib-0.3.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/distlib/files/distlib-0.3.6-py312.patch b/dev-python/distlib/files/distlib-0.3.6-py312.patch
deleted file mode 100644
index 4e1d8927b745..000000000000
--- a/dev-python/distlib/files/distlib-0.3.6-py312.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From fe769c72e4f9d613b2ce066325d2fb28317833d5 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Thu, 18 May 2023 14:09:34 +0200
-Subject: [PATCH 1/2] Check for cert_file attribute before accessing it
-
-In Python 3.12, HTTPSConnection no longer has cert_file attribute
-so unless something adds it to the subclass, the attribute doesn't
-exist by default.
-
-CPython change: https://github.com/python/cpython/commit/ef0e72b31d22f780d3a165d7d0471806061fe380#diff-3cf29d90eb758d0fe5ec013bbfda9b0bb60be4f7d899583bd5f490a7a5a5dc5f
----
- distlib/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/distlib/util.py b/distlib/util.py
-index dd01849..ddfc992 100644
---- a/distlib/util.py
-+++ b/distlib/util.py
-@@ -1435,7 +1435,7 @@ def connect(self):
-             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-             if hasattr(ssl, 'OP_NO_SSLv2'):
-                 context.options |= ssl.OP_NO_SSLv2
--            if self.cert_file:
-+            if hasattr(self, "cert_file") and self.cert_file:
-                 context.load_cert_chain(self.cert_file, self.key_file)
-             kwargs = {}
-             if self.ca_certs:
-
-From 440a7b57b9521ba2eca749e26945eaf16bc7c472 Mon Sep 17 00:00:00 2001
-From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
-Date: Wed, 24 May 2023 15:50:44 +0100
-Subject: [PATCH 2/2] Use single quotes.
-
----
- distlib/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/distlib/util.py b/distlib/util.py
-index ddfc992..d1ec58a 100644
---- a/distlib/util.py
-+++ b/distlib/util.py
-@@ -1435,7 +1435,7 @@ def connect(self):
-             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-             if hasattr(ssl, 'OP_NO_SSLv2'):
-                 context.options |= ssl.OP_NO_SSLv2
--            if hasattr(self, "cert_file") and self.cert_file:
-+            if hasattr(self, 'cert_file') and self.cert_file:
-                 context.load_cert_chain(self.cert_file, self.key_file)
-             kwargs = {}
-             if self.ca_certs:
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 00b450eb8def..b57f93db4d8e 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,9 +1,3 @@
-DIST dnspython-2.3.0.gh.tar.gz 339222 BLAKE2B 1e1bfd1d716f5afce1ccc2e0f1fbb8e575e91619bc32f2c5067f6da4e01ea927dd0a1ed4c35e6c88d34de320befd833c9c17d060ea71918775c1f5f0121b61a8 SHA512 0bb4b41262a1d97b724e48b4dfb70f1fb544c18824e7d2bc2dcb8ef6c943c6c827ce753ae4ccb2ab37e95c8f5ff5d2f4853f238509f21e6299a445760c41e10e
-DIST dnspython-2.4.0.gh.tar.gz 356155 BLAKE2B d77ac611a45bb6f19903752af480e03d25655e0c814768c67b9a605c7a41a8c17efa976a4ff55fcc7de811113415addb094f8edefb5ebaa29b25d5a5865ea9ab SHA512 61becb66d049f9a503a4e60195183cd7b2f6dfb67d28aac85e39d26d30abd1eb97b52f368796438d90a4ff9acb441d1e487d5699484c77ec58e3914885d66aca
-DIST dnspython-2.4.1.gh.tar.gz 357296 BLAKE2B 7346a2c4ee60e5449edc567d69f5ec3e7a546b6fd1fda3b08448d3748a1fd991526b0d673b26b10b31cdb3029a07322b3e62f55f67685432e376ab6e2a8a49c0 SHA512 98f440f13b8600880cc56493d9f20bfd824d40eca4cde4ed4bcaa0fa617d30176f4d37bc391896a237bd7bd3ce99f0ef9779a2fb26dcdb02e455edec53a31fdd
 DIST dnspython-2.4.2.gh.tar.gz 357675 BLAKE2B ceb2f4a824a1c2b834401d2eb7943e62a5fb28a19be64cea8071d7e294d1a6aa80dc82266586d050fcb1c0eff881d9e139be335313d2098b6c3c6cf690f398ab SHA512 6a76331fc8bc282bb8ef61509317b1956bec6fb516a57409b1df38c8f5094e5ddfcaabc951f7678f1be75e735962c94f225b6e78eb4abe56b27e075180c62576
-EBUILD dnspython-2.3.0.ebuild 1145 BLAKE2B b0434fbbba3c5d1d52b7cd561305e98ca0adf0709459573caf7a318174b9180ecebd046a1775cb511a41a8a45d90b5351d9cee7e0f53c48038e6c321909713e1 SHA512 636c8cfcc0c915a90f7c493ad4ebab60a9e8c1d2d8eb5a64abeeadd088fc805fff6ece216f9adacc5af7ac193c1b740cb0925d8d9e6cb0249d4661776e2f5593
-EBUILD dnspython-2.4.0.ebuild 1153 BLAKE2B a5eaa877b610b206bd67ca48b21cfa1c3e3a06dcb0df095e5e84b22bb3d6d921af5ccfd845f48522615b5c7589014cc5c13ae446660d7da48e58e5fda5920531 SHA512 e48212950e6ee168d6da043876699a421ec93467260dc427eeac95a0afe6e52a697d160bfce7886b6f544f0a85cdeb1fcd41e3653ab321ebddd5ce70d7d43651
-EBUILD dnspython-2.4.1.ebuild 1044 BLAKE2B 354dbbbbb0b4463fc468f6bb594ac48c5f17538839b1cd82c779e9dee9cbf6b3768dcd6c5dece5557be5349613d925788ace05aae19b3a726be767e1e521f4dc SHA512 7e331340629790b5e2dab037e039428a034a361503e89ec2de54c3c61522dd0d6640d8478ae99ede75fdd79adefef07eb8180ca3d70f1f3224d5fac2813dbc12
-EBUILD dnspython-2.4.2.ebuild 1044 BLAKE2B 354dbbbbb0b4463fc468f6bb594ac48c5f17538839b1cd82c779e9dee9cbf6b3768dcd6c5dece5557be5349613d925788ace05aae19b3a726be767e1e521f4dc SHA512 7e331340629790b5e2dab037e039428a034a361503e89ec2de54c3c61522dd0d6640d8478ae99ede75fdd79adefef07eb8180ca3d70f1f3224d5fac2813dbc12
+EBUILD dnspython-2.4.2.ebuild 1036 BLAKE2B 09065dc34e1d6c65eaa2efaeb7432a74ee004070a5e49ced70e2ad0aee9a7e38ef14decc18286410fa3aa2640c503d815e3c3fd870a2148a6376c0676130b6bd SHA512 dba146f266a31de5bace5606a4df9d7adce10cebf951fcb2e14d764216efaaed094f0a0b2ac2d2bd9dfbe7f837756789175629c5b251fe9ac72c2ec73f83388b
 MISC metadata.xml 1709 BLAKE2B abd502753325fedca3f1ca94818258c9d1b82f88766f9e005b35b3e79aff71ca2efaf06188e73ea30830f80ec011cdf5c42df320130c9295e13d3c427a148f8c SHA512 8c25d579a4a2a7c5ff34c21643a1386a434545f6b9b465f4aa8e07f7da3aee203bbc0341e930ddb767af431f64e8024ddd6cc8513cfce862c5900da4637bb1c8
diff --git a/dev-python/dnspython/dnspython-2.3.0.ebuild b/dev-python/dnspython/dnspython-2.3.0.ebuild
deleted file mode 100644
index ed2c92b04b53..000000000000
--- a/dev-python/dnspython/dnspython-2.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="
-	https://www.dnspython.org/
-	https://github.com/rthalley/dnspython/
-	https://pypi.org/project/dnspython/
-"
-SRC_URI="
-	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-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"
-IUSE="dnssec examples"
-
-RDEPEND="
-	dnssec? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	)
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/network_avail/s:True:False:' \
-		tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -s
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.4.0.ebuild b/dev-python/dnspython/dnspython-2.4.0.ebuild
deleted file mode 100644
index 00c4ada172dc..000000000000
--- a/dev-python/dnspython/dnspython-2.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="
-	https://www.dnspython.org/
-	https://github.com/rthalley/dnspython/
-	https://pypi.org/project/dnspython/
-"
-SRC_URI="
-	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-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"
-IUSE="dnssec examples"
-
-RDEPEND="
-	dnssec? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	)
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/network_avail/s:True:False:' \
-		tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -s
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.4.1.ebuild b/dev-python/dnspython/dnspython-2.4.1.ebuild
deleted file mode 100644
index c48c33add1bd..000000000000
--- a/dev-python/dnspython/dnspython-2.4.1.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=poetry
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="
-	https://www.dnspython.org/
-	https://github.com/rthalley/dnspython/
-	https://pypi.org/project/dnspython/
-"
-SRC_URI="
-	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-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"
-IUSE="dnssec examples"
-
-RDEPEND="
-	dnssec? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	)
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -s
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.4.2.ebuild b/dev-python/dnspython/dnspython-2.4.2.ebuild
index c48c33add1bd..31bcaba25d68 100644
--- a/dev-python/dnspython/dnspython-2.4.2.ebuild
+++ b/dev-python/dnspython/dnspython-2.4.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="dnssec examples"
 
 RDEPEND="
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index e5f55df17d7d..96b1519e7a3e 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,7 +1,3 @@
-DIST pip-23.1.2-py3-none-any.whl 2064688 BLAKE2B 85c19cc80a59404867e7212c442e60ed6735da35d544bd23ee4cf5a1bffad4c0fab1f34a652417a181cbcb4afc9baf94682b0ec6e1fd9457eb77bc971d29e459 SHA512 a5a8feab25f01a96c2d8c4e15a001cb38c4a0a9d88563da6653239f3966324fdbe86ae0c5172cbdb1d03b863b37a37358b80e8bb9c8112bd7809fd16fb2ec776
-DIST pip-23.2-py3-none-any.whl 2085968 BLAKE2B 320f19b21253d0160d09d51e677a81fa30515a1faee07c4ed87b36a4134820d5bafcd524c099d5892b41bd7bb738a0ccc0b906d619d7e5690a8404cb78f4469a SHA512 bdd211e74fb77117f389f0789c35b163834d9a900e7615d7a1d90a9c6a62613e69552af79cc88f594890afd9189e53c55b55a50cc31d4cd18118352ecab9cf40
 DIST pip-23.2.1-py3-none-any.whl 2086091 BLAKE2B 0a35bf4ba589f07e3c800d8f835e4bcdcd433976db83f91c86e12a2316b0b1c7de7120b248d70fe8b5587c28bb3c6e7bc633c64cdfb65a1f18f87a9e7a423181 SHA512 016a8cbd09384f1a9a44cb0e8274df75a8bcb2f3966bb5d708c62145289efaa5db98f75256c97e4f8046735ce2e529fbb076f284a46cdb716e89a75660200ad9
-EBUILD ensurepip-pip-23.1.2.ebuild 645 BLAKE2B e5e007e2866582afab1292d7435e4eedee0f46bdf005d144e0c7c07bcf6c8460a32c60fe9260048b0f37030af1ca960ddf8a7e7bec05c0ffddf6397fc4634b28 SHA512 6cb1172140385cc6d6c65190990221c76246dfd9922a502755c5d8295429d2d3b997fd8d372f7713399090da83c9ec3ab4ec372a86129c809231eeea3597b2ab
-EBUILD ensurepip-pip-23.2.1.ebuild 653 BLAKE2B 7de97648cd4add911be02952862b975df3b7fad7daa24716f34b7f192b4d6a0b4cbbdbb7a924068de58bf2d6d2a6a543af81fcc0488c3238597ef05f60f6191c SHA512 152f91fa0ae5a6833ce07b94c7bccac40006c264ab221db45c25647984d58ef58c914203cd45a6c8527c3903e88976a187b90f3543d52ce4e18043d0fb46b450
-EBUILD ensurepip-pip-23.2.ebuild 653 BLAKE2B 7de97648cd4add911be02952862b975df3b7fad7daa24716f34b7f192b4d6a0b4cbbdbb7a924068de58bf2d6d2a6a543af81fcc0488c3238597ef05f60f6191c SHA512 152f91fa0ae5a6833ce07b94c7bccac40006c264ab221db45c25647984d58ef58c914203cd45a6c8527c3903e88976a187b90f3543d52ce4e18043d0fb46b450
+EBUILD ensurepip-pip-23.2.1.ebuild 645 BLAKE2B e5e007e2866582afab1292d7435e4eedee0f46bdf005d144e0c7c07bcf6c8460a32c60fe9260048b0f37030af1ca960ddf8a7e7bec05c0ffddf6397fc4634b28 SHA512 6cb1172140385cc6d6c65190990221c76246dfd9922a502755c5d8295429d2d3b997fd8d372f7713399090da83c9ec3ab4ec372a86129c809231eeea3597b2ab
 MISC metadata.xml 309 BLAKE2B 197e5620aab85ff590270ae6838c9188cd699943af4c9c3eeb7de92c2e9390c082eec603e63bc2bba39477586f19e58da2e5fe2d5ffe9b59b87ae5386c939df1 SHA512 c678bc8fb62f6e6850939ebff56962503bb03393572cfff7e5f7d38e8cf5ca71d8e38e402355c5f963fb718eed24bca463d7c63fede5cbb550f6f32a9c06af9e
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.1.2.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.1.2.ebuild
deleted file mode 100644
index 4e55e335b00a..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
index 474a502c1273..4e55e335b00a 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.2.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.2.ebuild
deleted file mode 100644
index 474a502c1273..000000000000
--- a/dev-python/ensurepip-pip/ensurepip-pip-23.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared pip wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/pip/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 26a30d5cbde6..0c27ae106397 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,5 @@
-DIST fakeredis-2.16.0.tar.gz 108416 BLAKE2B 0897614e567d59b54a35c18922a33cc79e8d2759614fc13b2dfbbf0e52c802470678cdf497b914762f258e84b50afb178ac1a0604acfdb1520daf3a03ac87a6a SHA512 a9fdf6da74c9fc650df9720b39a8c2ecb609353d1c535433bd8ca3ff4674f112e2bb06a381ad8f994e7daab78cc41b1bf1c75a0e287af0b41387bf15d05fce5d
 DIST fakeredis-2.17.0.tar.gz 110121 BLAKE2B 21b8ce15236aa918d519e2d5c045d1664d6edc4d9f1fd10923bde4779c0a4605685519e17b5edfddec83f6b9e9421539cce037e8a787673b12733ef9cb28df00 SHA512 31da92e0617a6999bb29261b9efdb1b8ac9f790eb1f4500f71d65b7e2ec700095ac30a55230f3c3efe9cd9c535d04a9138596944e2aa684a1e6e9e7158b5c2be
 DIST fakeredis-2.18.0.tar.gz 111601 BLAKE2B 56a7d2e113fa0d2d98f95b4e8d5b7462a311e2e505a19cd5d3067650a0b950ad272b86aae42b748e5854c7f24287fac03f8c61865c05612697324e9f328dfbe9 SHA512 2d67866bbac8f8a12a6414cfae0a8ba925b769c0cb420bfe74ca233de40792f369678752a0d71ce4c0c145f03944fb071ecb234ee40f3f52005587db1929134e
-EBUILD fakeredis-2.16.0.ebuild 1936 BLAKE2B 52420a8751cd0dfef8e72b327ef46fcfd4c2d7573c59b49d1b7dce891b93491c63fccd3f56feec9d781762bc587a79d378dd309541ef2d84a03c3819b507a425 SHA512 59fd320c46eeb78cc495fd55b57cc893b5aa7a9478c0bf70b73d9d3d0d399b97b1b39526c42f45cfa378702ffa409d332cf4324cb05f58bbff082289e7a214c2
-EBUILD fakeredis-2.17.0.ebuild 1940 BLAKE2B c59da6750ce8a65df5412720e650369db11a28ad5ca64eb00b6fcc31243f7cdf30113839a4ca0f14b2528d5a8ca46372cfbd2efc53bd5431b0432ab0c72a31a1 SHA512 4e6c3bd98e2f86eecabae913e2bf59ad509f00ac2ef3b398a0e291392e71ef9e56b7c7d18abc5fe0c0b93b98675bf6dfdfbe1a6822c5e2570daa7c9dfd2719f8
+EBUILD fakeredis-2.17.0.ebuild 1936 BLAKE2B 52420a8751cd0dfef8e72b327ef46fcfd4c2d7573c59b49d1b7dce891b93491c63fccd3f56feec9d781762bc587a79d378dd309541ef2d84a03c3819b507a425 SHA512 59fd320c46eeb78cc495fd55b57cc893b5aa7a9478c0bf70b73d9d3d0d399b97b1b39526c42f45cfa378702ffa409d332cf4324cb05f58bbff082289e7a214c2
 EBUILD fakeredis-2.18.0.ebuild 1940 BLAKE2B c59da6750ce8a65df5412720e650369db11a28ad5ca64eb00b6fcc31243f7cdf30113839a4ca0f14b2528d5a8ca46372cfbd2efc53bd5431b0432ab0c72a31a1 SHA512 4e6c3bd98e2f86eecabae913e2bf59ad509f00ac2ef3b398a0e291392e71ef9e56b7c7d18abc5fe0c0b93b98675bf6dfdfbe1a6822c5e2570daa7c9dfd2719f8
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.16.0.ebuild b/dev-python/fakeredis/fakeredis-2.16.0.ebuild
deleted file mode 100644
index 4832c918118d..000000000000
--- a/dev-python/fakeredis/fakeredis-2.16.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${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]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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/fakeredis/fakeredis-2.17.0.ebuild b/dev-python/fakeredis/fakeredis-2.17.0.ebuild
index 12cd5e3de69f..4832c918118d 100644
--- a/dev-python/fakeredis/fakeredis-2.17.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.17.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index b73dfbeb58cf..8e5ad64d5539 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,7 +1,5 @@
 DIST fido2-0.9.3.tar.gz 217894 BLAKE2B ccc3a9b59045216037664b5bf4b969a79b86b300f67fc4253b563acbbee98912ea076996772f17b88141d2a36a933b4926de96f05c53e204d0bb4eaaa2daad6b SHA512 f105c347784cdfab88ab08852227d24f4bca623145f7f76bd066dadab6ada1eae751934fd4dc7436a5c5fb3a0ed2fc4d5c59bb2a93888d470028f0713ca7e09e
-DIST fido2-1.1.1.tar.gz 247150 BLAKE2B 136d539db8bcaa5398e7ac2c2d0733c902b370c1b30491181164cc2f329c44dd81a42f19374ff6bd89fc757fe33580ef39bdb016e9f93f5ea17b12f22143761d SHA512 8078acbc85e277ddbf7a508f17c34f581eb8978786b5e43b4ede7de24138f07eee7f81aa307295305a42b286900a73903f269afd2a66aee9650fe05ac6aa1901
 DIST fido2-1.1.2.tar.gz 248554 BLAKE2B d2a8afb5fa00d3f3debd4632ae7e3bd4e28b10574d0fc76e78db4bb6408b308e4aa7378caf6fcd87ea3d49ce3db70b879288ea0cd5d0dbd7d5131bceb0eea137 SHA512 db62cfc05a8daa2224bae820ba3174f22d1e4711643d52f549e738e4af14537f92ca950c3904660f3bb360d6aadf236c9b19b8ac4816d99467a43e239b7c219a
 EBUILD fido2-0.9.3-r1.ebuild 1096 BLAKE2B 75e37944a0fe8046d7f6d85f8c1bdadf8588e6ed230056925de86c01c279b9581a9d7bfea3faa7dbc51e8583fedfebee8942f4ee8ea4b514cf8ba06520ecfc8e SHA512 b80e66a95e875629603fe87af57c2a37244d87e23639f8e4e354d3384fc84a50a7df56077ca3508870618e1407da1d6d582e9927e30083811cfb08c376f6142d
-EBUILD fido2-1.1.1.ebuild 1002 BLAKE2B eae691b60fc5ce3a7cdc8f09c0f23a3eede2bdfd414c8bd46af04d06243a3b17e6a6b1b48297a78652737ccf3a8ba9c9c19e258aa91060c8ae4dfdecad347c8c SHA512 a8857c167673cb82fa306a10f04fb1adcb3ceb8b3aa47c68f58196b2fbb49cd3cacb47540344818279c1f9c3cef8b005aac8c0703e2b777c033b838e50708b51
-EBUILD fido2-1.1.2.ebuild 1005 BLAKE2B 869b209a943c8f9d1e281c80c657b769fb7fa0dd930ba986b3609f5ff43703332c1684b5e5020464fc62efc650ebb54a55c3e47862ee237db41087f5e0164a3b SHA512 2873f1f10949d667ab90b49cdbfb498476d0e68d83e38f6ea2fe5e1cc025e7213e3091ba409e3299d24990179072b3a1bf4a0163c53e6be553c6a422ac2c5e9c
+EBUILD fido2-1.1.2.ebuild 1003 BLAKE2B d693e2554d836a4c716e7dfc59ddcd54deef5414988ea2b1a3b2caed3ff2335c43c8a102cccfdc26a3fa3070ac57a13258844eb4201fb8264d80e0ed77818975 SHA512 ae07dfc5cb8411563654dd1facff8ca30cadb514a68fc1666a20e975f626b91e330e8a42a9e3ecb13f8feaf4f4098cb25c096a708755e46fcfd4e12cca542e89
 MISC metadata.xml 820 BLAKE2B 092fc3aa0dc3e3a8998e7cef0a3229d5b8791983dc07df84c74ff6b7221afc879aa5a39a6ad58ff0bfe2836fa48b57d3445f20a0c78e2affc3bc47b73b81544b SHA512 f588e6637d75b668dabf80fc2c8e1133119a770d4f7fa5077025e0a478f8eb9c7f18eac1ce15395549485625bc4c82bdeebf07440087cd074e95d42a685eef53
diff --git a/dev-python/fido2/fido2-1.1.1.ebuild b/dev-python/fido2/fido2-1.1.1.ebuild
deleted file mode 100644
index c9f8cb24142f..000000000000
--- a/dev-python/fido2/fido2-1.1.1.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1
-
-DESCRIPTION="Python based FIDO 2.0 library"
-HOMEPAGE="
-	https://github.com/Yubico/python-fido2/
-	https://pypi.org/project/fido2/
-"
-SRC_URI="
-	https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
-SLOT="0/1.0" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/cryptography-43[${PYTHON_USEDEP}]
-	<dev-python/pyscard-3[${PYTHON_USEDEP}]
-	examples? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${S}"/examples/.
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/fido2/fido2-1.1.2.ebuild b/dev-python/fido2/fido2-1.1.2.ebuild
index 6ce115a8a771..7ce22f9b0e8b 100644
--- a/dev-python/fido2/fido2-1.1.2.ebuild
+++ b/dev-python/fido2/fido2-1.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0/1.0" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 396167710844..596fc2f37ac5 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -5,5 +5,5 @@ DIST fonttools-4.42.0.gh.tar.gz 3764057 BLAKE2B ef6340a58d1b8dc0fa87a6514792da76
 EBUILD fonttools-4.40.0.ebuild 1571 BLAKE2B 198859e24f17175b3f1de699774f5b41ae674c8281e23cefbd265c1b66e8b6444702c0017bdcd827895fe8f21e2e4a1ea799a2c0052e0f9ac1df54eab0bde742 SHA512 debd1e92dd9e09bc802b9c2055087970b74b826a6fe96d38383b4ee84c93ff0de4adae9a071e6d813535a128a7fd51e6dce279f3cf9b839a6e93abef0c1ce3f8
 EBUILD fonttools-4.41.0.ebuild 1592 BLAKE2B e18b4dc6f63474408edbce5898d544ded8d11a981ed91a787b15909929c3a90a0c76c63480ad6a2f8b9b52db17e07633683e25ab52dd8ae2b8e562ee1ca9417c SHA512 219929f510c4f99eb74954e92d8d7b127f9d1a81bf212fb1bb25610571ccf4cb20d5f42c4d7c72bd15e266047f6272845716667e54114bf62ee76e1e042ccbe0
 EBUILD fonttools-4.41.1.ebuild 1592 BLAKE2B e18b4dc6f63474408edbce5898d544ded8d11a981ed91a787b15909929c3a90a0c76c63480ad6a2f8b9b52db17e07633683e25ab52dd8ae2b8e562ee1ca9417c SHA512 219929f510c4f99eb74954e92d8d7b127f9d1a81bf212fb1bb25610571ccf4cb20d5f42c4d7c72bd15e266047f6272845716667e54114bf62ee76e1e042ccbe0
-EBUILD fonttools-4.42.0.ebuild 1592 BLAKE2B e18b4dc6f63474408edbce5898d544ded8d11a981ed91a787b15909929c3a90a0c76c63480ad6a2f8b9b52db17e07633683e25ab52dd8ae2b8e562ee1ca9417c SHA512 219929f510c4f99eb74954e92d8d7b127f9d1a81bf212fb1bb25610571ccf4cb20d5f42c4d7c72bd15e266047f6272845716667e54114bf62ee76e1e042ccbe0
+EBUILD fonttools-4.42.0.ebuild 1586 BLAKE2B f3f1be2cce2e1afe7aa8ef9ab88a58a881f5a2af3f01e1960586a4d641fc840f6462dbb6461367359bd5a3119009ab0d239f1c2efc6311998aca4fe9af96fc31 SHA512 bb4d6d204bef07edab432104332f2fe2aeaaa8ec52edf121fbfd831c32f41badfb7ce736e8f490074d71fc9f46091d63495033e1bee266c0fbf5a3ee5fffa8db
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.42.0.ebuild b/dev-python/fonttools/fonttools-4.42.0.ebuild
index 9468c65101c8..b250bdd0bfe3 100644
--- a/dev-python/fonttools/fonttools-4.42.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.42.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index b13934c37e5b..1f48ea415505 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -2,5 +2,5 @@ AUX hiredis-2.2.2-system-libs.patch 1421 BLAKE2B d10de294e0e15ec1b816505c852b0e8
 DIST hiredis-py-2.2.3.gh.tar.gz 18214 BLAKE2B cdac5e9790c88657c75be721c4dbc91174a0eb38cdd790076b3ec1f009d43c7aef300bfa7381a10061749cb3bec02d4a488e732f550bea4c62893aabfc0c3222 SHA512 e85032869b6bbbc30f991d83d67a710c04998645517b1ddcfd801ff37bd28f0576a5bdc2986f3526f72da8448986714a79b42a0ab1a5cc6b6bab24f3d98fdce9
 DIST hiredis-py-2.3.0.gh.tar.gz 18179 BLAKE2B d87460d3ea75f81f9017a837f44281e7733104e5772ed53dc9471eb18a38b0a9e1298ddb3c78b8d3c5ab7a8e1f71e966bbaa10e06969321e7940b8965ac56b2f SHA512 4e72f71719e9616913e5ed6dc9d2e01ad91d44715231c1eda1a1c6570d75c00be634093712444fc9a86bc6843278ab34c33c7362ffd5b8171f4ff775aaf0c4bd
 EBUILD hiredis-2.2.3.ebuild 829 BLAKE2B 167c77a7d4e238f238a6fe6304150e31ea01de4137617d3125767c03648d4d7dcfce3f7a5d92cbc957797b25c955aab395e69920c21b3f6db82db12d95081a81 SHA512 5a4191967625df86a407ca050dc5ab16512ee1b3ad8a9c86a318f48c46c057f3698adf58022b7768268135fe4b63d9d841aa8e6f079aed99eeed33d5a73ca909
-EBUILD hiredis-2.3.0.ebuild 833 BLAKE2B 2210e82d940926cf65cc0a0beb5506e3c1b4ee17b31b0c21f4162cee4c2727534df5fc1ed92476838669003a49819059554301535d6ba9b6a0831870a2a5302f SHA512 07e3948b8a16a608dcf81ecdd25d7173553fb3a10b79cb218f24937d6c151014f70121acae46231daf044a192694d64d39d2c72c9fc7ccd3e98b2739e1d19481
+EBUILD hiredis-2.3.0.ebuild 831 BLAKE2B b3988aad9e3e92bf584db216db13acdbe99505301a25b44b4e60a0f25c527c6a159735cf8f5164482578abe173758a66a7601c46f5a8f39cf391cca4f82b3067 SHA512 9a7af839ca9d77e34419262839f5a16b116553724a616b595ea6e07817fabaf83231e92ebd701ecbc654bca833a0a44ef049de2896c251178dcfbea095e21b92
 MISC metadata.xml 493 BLAKE2B 9ea63c09baa3e95097afce5edb30a2e1f358eedcc41fbd6f66492e3701bce65fa91e83c236d69b39ddde17f3d92401ca39ec70fbe12b6bc74dcde3e6e2495490 SHA512 42cc38851c3ffaddeb32aefed35551a444fdd1e9463dfca2f320a184445567174b44de84981dbd4613029abfcef28a69208bbb2857811308667cb54102357c83
diff --git a/dev-python/hiredis/hiredis-2.3.0.ebuild b/dev-python/hiredis/hiredis-2.3.0.ebuild
index f84862162b67..054a69176742 100644
--- a/dev-python/hiredis/hiredis-2.3.0.ebuild
+++ b/dev-python/hiredis/hiredis-2.3.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/hiredis-1.0.0:=
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 56d5f0033d62..1ef611ef9645 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,7 +1,3 @@
-DIST identify-2.5.24.gh.tar.gz 101544 BLAKE2B afcfed2a48d59a263dac4df836251be00b911e78eabd8612fc06610df5efc0052bf6542c955e8a9fd7fd0513e04b1d009fe511bb591f880bff1347e02ae35c67 SHA512 40c0163aba0fa9be266a746bd58cc64b740be3ece49a22996ae1c5dd334c76a28544fd195d1da8a042f82816b2f0c440a3406160749fe192b6af00780ed5eb28
-DIST identify-2.5.25.gh.tar.gz 101544 BLAKE2B 4e7403d9d4abc44945a697ca8f2362a707e47ce92c59e4302283d23486510f1b215a08752ed1b737b428d4048fd750997469dbc433a4e78b074aa723f27e7150 SHA512 4d7845d4941f67a58c3d8e49a4067d852a3a8c4f060b32c9e58c7b400cc7e595ca4dd6268392a7a17f9768f97bc1719d7611c4b029fb91eefbc2a62537df3815
 DIST identify-2.5.26.gh.tar.gz 101549 BLAKE2B 383c6467436107cf98a667f1db3ab63f42aadff8f51d2f6bedf715dd45590eeb5fe7b3d6572b7704a7ae613d079a22a2d84c86581b7a63b7578807e06034aa70 SHA512 4c17c7f40b14fd45649e0a6b6885e2d96a1ce3cf91fbc1092fdb9b92d7bf2ac35b0c04a24bb3e77f3188a3c8d00f57dbe19ca660e1e08b60cdb60385f340c4bd
-EBUILD identify-2.5.24.ebuild 596 BLAKE2B 1ff0ef25ec8161f1b282f48401a18dbc6d8f219918089037de21686fb0fd509123a9d606c738680280effe304933771a345dda486331c942461866adcee6966f SHA512 9c58fc5a62222484d168a4be7c7463fa343fd487098318c53e3479d0508b0d75d460e217585a9ad2036262390037c03549267749093d24a6527216d217b198aa
-EBUILD identify-2.5.25.ebuild 598 BLAKE2B 15278ce98c490e872627af90b592d7c0912e7c68454e1ef02eccfe16995ddcebeb1896cc39b32c7310917c918dc8f34eacfeb1f8e5f74a282da5e5bbbd6bd6a4 SHA512 17a7eb2058b35699616c32621ecc7bee9222b6773b6cf37faa0cab88820c3c297d806ffa8d23b63ac3335ce594b27091be61f85e1f4a8725d35057830ad5b33e
-EBUILD identify-2.5.26.ebuild 598 BLAKE2B 15278ce98c490e872627af90b592d7c0912e7c68454e1ef02eccfe16995ddcebeb1896cc39b32c7310917c918dc8f34eacfeb1f8e5f74a282da5e5bbbd6bd6a4 SHA512 17a7eb2058b35699616c32621ecc7bee9222b6773b6cf37faa0cab88820c3c297d806ffa8d23b63ac3335ce594b27091be61f85e1f4a8725d35057830ad5b33e
+EBUILD identify-2.5.26.ebuild 596 BLAKE2B 1ff0ef25ec8161f1b282f48401a18dbc6d8f219918089037de21686fb0fd509123a9d606c738680280effe304933771a345dda486331c942461866adcee6966f SHA512 9c58fc5a62222484d168a4be7c7463fa343fd487098318c53e3479d0508b0d75d460e217585a9ad2036262390037c03549267749093d24a6527216d217b198aa
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.24.ebuild b/dev-python/identify/identify-2.5.24.ebuild
deleted file mode 100644
index f7d940f48b0b..000000000000
--- a/dev-python/identify/identify-2.5.24.ebuild
+++ /dev/null
@@ -1,29 +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..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.25.ebuild b/dev-python/identify/identify-2.5.25.ebuild
deleted file mode 100644
index 906b58d7a709..000000000000
--- a/dev-python/identify/identify-2.5.25.ebuild
+++ /dev/null
@@ -1,29 +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..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.26.ebuild b/dev-python/identify/identify-2.5.26.ebuild
index 906b58d7a709..f7d940f48b0b 100644
--- a/dev-python/identify/identify-2.5.26.ebuild
+++ b/dev-python/identify/identify-2.5.26.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 329beacda1df..01954918f962 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,9 +1,3 @@
-DIST inflect-6.0.4.tar.gz 71131 BLAKE2B 24ec6f25462594fde4558f7a4269c68d31989ead54c982f3a4382b5f0c192fd5fcac7544413fecef0abaf7c3fe2f9b4a8049fc7dc7d324e4397fb6a81763ef8e SHA512 96aaa74b3e8c5dcc91d81af336af73535826f3cedaa556d6baf540ca54db1a7c1f17a372c240446c0d81697520eab154bad4f0aad6195c6ab8e131ae443d3811
-DIST inflect-6.1.0.tar.gz 71080 BLAKE2B a4f86fa3d64f979ad184d3744dd40c5a220ea904bef3cc87af3f675febdd1346b918797a879ebee368f4d9381e698476229b538fe15f14921c41351450132a04 SHA512 2457ed594081a3f26390e88b5d5826867cd3d54ffd73c4cfe52c20cac873157ec64e30ff3e01efebb0b1edf8b0e412930bae434e1cd8c7920a273667d5e6eb68
-DIST inflect-6.2.0.tar.gz 71776 BLAKE2B f0ddd4a00d23db6462d8286baf11f46596cf1292dff327940e7aab2d17e73571f8ff68bb54f1b449176398448b1478c0b99e886990dbed75b33ba170bb54a343 SHA512 ebc1c0e0518112417bfbb1147c42e2c867e1a3dffb22a67bb995170a04c3813e55620bf6fd07d1c40d380bc8886435ec634c477f706134e4f8943c94b3269851
 DIST inflect-7.0.0.tar.gz 70963 BLAKE2B ae896109acd33946e05902d121ecbd95e04dc33a1d6da6035148521de5baff8cff877a5c56c104bde29d56025e231e20f97e0ee50686de0ec19b567d53612314 SHA512 b2ca39d0e36cda8c8c42d208443d3b84b10d659dcd0d368273503d6e76df19c61ac3c623d526ea918ca8b347d6db8bdfb691609e480eaa33dd4f1c37e008473b
-EBUILD inflect-6.0.4.ebuild 697 BLAKE2B 23f52b8eb2aa8d980bcae8b96362d72cf4a00b12c2fda83f59effc672e6a40d9cee96ce91e1b8f75a93ffd3d927144f7b6345a0a81e3142c55c175570b82e6be SHA512 b72de91fa7d7e2c5e1db8e119b3c2b4933def5af27c113ebe48552f7c2640a43dcdc84c790e334ea83c9690ae35ea05a43cc148a733d635e753a478c69cee950
-EBUILD inflect-6.1.0.ebuild 747 BLAKE2B c9bd16700bdfb66efacc80bd2013906bacea001ffe4b7a6d0b24046af59fd75e5b2fc818d805f289dfb3a740eadc8af8f37818a422ee4cd478b5e24fedda12fb SHA512 d73833baa2022d8e4a29249dd1cd0d9bcbbb8c935bb4de89b3abd195a6db55aacb3f97a43a66fc7678a612d985855dfa0f484ea1b7bcaeb0e72d659185878bc7
-EBUILD inflect-6.2.0.ebuild 753 BLAKE2B c782e87c80e0ec503ae19487930e3977c2429555ffd83eff39810ee71bed626abd4c5d3c2104d19d3f96ca6035c4f32782f44dd24e9c9530ab9a2a21f4f8de00 SHA512 dc26f9e2b89a27dbf6fbe72bf543453030beb4620838a9d03b4608ccf72b3bdf608bcca409c0996ed9ff7e2fff30a2684f64656709ff4b7103de15f2a58b336a
-EBUILD inflect-7.0.0.ebuild 753 BLAKE2B c782e87c80e0ec503ae19487930e3977c2429555ffd83eff39810ee71bed626abd4c5d3c2104d19d3f96ca6035c4f32782f44dd24e9c9530ab9a2a21f4f8de00 SHA512 dc26f9e2b89a27dbf6fbe72bf543453030beb4620838a9d03b4608ccf72b3bdf608bcca409c0996ed9ff7e2fff30a2684f64656709ff4b7103de15f2a58b336a
+EBUILD inflect-7.0.0.ebuild 721 BLAKE2B ab468c5fb4a0707c0eaeb4640b58f58b686dc8a6cab988da0a18e46b8eb3da16044aa01d76ce72161d6b082f0bc87d9b10f880c20e9ba57491d24d16a130a69f SHA512 0b2215e5d511d86a2cb3c64bbcd0d27ca8eb3ed41caa4d266df34c88f5605a1f6034a5133e80ce9ec006d839be7632603438a144b96421892aa20988b350c0d9
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-6.0.4.ebuild b/dev-python/inflect/inflect-6.0.4.ebuild
deleted file mode 100644
index 47bcb2c006d3..000000000000
--- a/dev-python/inflect/inflect-6.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-6.1.0.ebuild b/dev-python/inflect/inflect-6.1.0.ebuild
deleted file mode 100644
index c6247d69eeb2..000000000000
--- a/dev-python/inflect/inflect-6.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	<dev-python/pydantic-2[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-6.2.0.ebuild b/dev-python/inflect/inflect-6.2.0.ebuild
deleted file mode 100644
index c74cdb223fa2..000000000000
--- a/dev-python/inflect/inflect-6.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-7.0.0.ebuild b/dev-python/inflect/inflect-7.0.0.ebuild
index c74cdb223fa2..24d03c10562d 100644
--- a/dev-python/inflect/inflect-7.0.0.ebuild
+++ b/dev-python/inflect/inflect-7.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 7ffc02879014..b322684aa6b3 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.itertools-6.2.1.tar.gz 16813 BLAKE2B 7bf4b3818bcf66ad49643aaa1c606953d8d920c970fa4a4159796c042a1d5b77e53240e8a260b24b337cd65398758d2392fe2a5f73cf784aeeac9b4d0a128181 SHA512 7b4c27143848d899472a9ce207819062719adbef2cf038754c9236fee7da39f62238b85f8d83bdc41bf5a37e8d102e79dd4afbc6efa46c2d7c7ca04c032c67d3
 DIST jaraco.itertools-6.4.1.tar.gz 18202 BLAKE2B f384e7bdbe6068ed85a19e12aeae2ac0ca4bea52a4c3f4840a7ce258440c0a73c0f9f6928be59a1db2f2bef887710a95c423cbf1854bd0e58f068bd4fd833d08 SHA512 57c3ce37d1fb39c7140fc0581bbeacd75479ae1c375af4041144d41bf184299898069418e046f21872c290708ccb44728d1111cb3cfffac4a1d703f1cb86a70a
-EBUILD jaraco-itertools-6.2.1.ebuild 1274 BLAKE2B 3eacce7f1d81a89a05b1941077926f85650c3567cdafca4af280494c25264a3f044ac867ee25ed08a03cc9753659128434e8900cb7b563365791fe5997dc8eeb SHA512 fcf8a25e05ad6215d7cc087f33a1936e3bcb2ac477eb89d3398b888e7c5487eebf76be08ef8c80a50752eeb79bc674f235c185ec3ec5bd44f35105c60859b263
-EBUILD jaraco-itertools-6.4.1.ebuild 778 BLAKE2B e58499bef0873f9d6231ad1ae2968fc6471e872597f0aab4ee3fadb87d630aeca25f55798bde7b970e9e066bef0f99bae22c4e701dd22a5021ad7da1d140e694 SHA512 326e1aa78b106a005d647a20d20bef60b75c499178dd7947c4d76847f20821322021e5dc27223cfdb997cf25034cc7ececfe285315ba96c89dbe61d6a8ee040b
+EBUILD jaraco-itertools-6.4.1.ebuild 746 BLAKE2B 2202ef74c251929f694e4fae4d308036f0842eec10877b3f98a51b9d2161aad23dc88c7227cfbb9c407f6ccd7e4b02cf977c52b52c6d6b3d075dcb8ff031d71f SHA512 4d678d41c52094f812cb1dd19b49cf57c6486cccf87b8f7be7ad0eec75b4d58d8cc30d9907dd47b1a6cb91f02e455c755b66428fe2c6a6554f14503021589f0b
 MISC metadata.xml 478 BLAKE2B b020626bddcaa0eae2fa3524ce7e785c5357c8bbfbfd9e3ac84cd0593381c252759ac1ecceda3f0215107491233b1478084ef119f32d6d2e135adafdd25b26d6 SHA512 7cb2ed20706c82d6ea53d85ba03c99f6dc97618de70ac271017f747f8756fd701bf399dbb55542286db30a0d2dd27425b0e7ed917da31d81c0ed417e7ab1b5f0
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
deleted file mode 100644
index 54091725a7e5..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.itertools/
-	https://pypi.org/project/jaraco.itertools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/inflect[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == python3.12 ]]; then
-		EPYTEST_DESELECT+=(
-			# prettier output in python3.12
-			# https://github.com/jaraco/jaraco.itertools/issues/17
-			jaraco/itertools.py::jaraco.itertools.partition_dict
-		)
-	fi
-
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-
-	epytest --doctest-modules
-}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild
index d117a9ef10ab..cb4f9a22a429 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/inflect[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 96ab16ef8762..24ff009a1621 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,4 +1,3 @@
 DIST jaraco.text-3.11.1.tar.gz 16083 BLAKE2B f7268128209fbdc849a745595339f4dc9a097f3f4f8f0cdcb05ca3106ed5a45460126fbb2b7d9c3b01b63aa3f750175e8cd366034183b7d8804a1650fe493e4b SHA512 b4066589e9d4c9a2a82ae2b0825d34b22b93ee179d29c3666e9b978390121520afcb8fc5ffa6457022d2e8477f4cf2b76485d9896438ee46275326577609f201
-EBUILD jaraco-text-3.11.1-r1.ebuild 1628 BLAKE2B 902ae697664d36d7b9a41946f0c3b3f12ee7ed52065003d235a671f56b824d56d334a116a3a39cfd34fb750c700a499dcc8d756c42dbac3e8260432d5903d643 SHA512 82fe78cd8a9bc91c9578676c71de82c73e7a7f1b6fd2ba4822a00fa651765d8c486b3c522fc01933d164ebb05c1bd6365cca3284b1387ef05b845289e5988a0a
-EBUILD jaraco-text-3.11.1.ebuild 2067 BLAKE2B e9b3d0c716791e9a04875039ea3ca28148e426d3fc9fe9fbea7ea14f6c67e0be1b867afea122773350ce79c536072a3b2fba2c73cc5a7cf39c815efbfeb2aa23 SHA512 6fa342b2c8e6dd2d9cd1e1d7013ddcae6fca34154d2f2e4b6323d978183e64b88a0e860dba30b646385732bc2132fa80dcf5a75629d1407dba6fed0010c2efab
-MISC metadata.xml 569 BLAKE2B 93d693cf06e08ecb9a3647f207ff2942ac9e3908635442281f6ff73ee3ef0329868969820ed8a1d90b3840bb1a85742c6cc09d1a8e4ff4613917ab61d6ce7acf SHA512 9b11125d60fada5d7ccd5308fd31dee3c8f46d484097663c23790edf93eb39cc9a1434b44f2a72ec596d2d3a36fde16311e744534b61170bdac764a791cf685e
+EBUILD jaraco-text-3.11.1-r1.ebuild 1620 BLAKE2B 215ee25262ab7197d201cbc0d5b6abc5a182cfb16fd4cf2c34006b4775d1fd780dd0e0527cf556215ef4fc2c21f4dee6d64a8f037469c8105e449227c929c7cd SHA512 f2154b0b5041b3b343672d327eb14ee8c7444d84ef09c376b8305144884971c9c1bd2788a09cfa620f307a3925872b0ac4eed8b94fd1caa75e4df0c5a8719629
+MISC metadata.xml 463 BLAKE2B d5103f7438fd4e08183a9e00ad91bc4d25d54a9885868760201a61531d9bd6f4710a019b7a2f17b00403eed20a41bc51ef74eeb70aca76c3c351458ae20c45ae SHA512 b508e2bd43f237a89e415a37d0debb7c980dea2191a5556108002e297e52356b43551a147e9121f98380ca22495a742a2ca9652916810a7c0bd4c0d47e9268e6
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1-r1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1-r1.ebuild
index c1747da85d28..407c5792a3af 100644
--- a/dev-python/jaraco-text/jaraco-text-3.11.1-r1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.11.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
deleted file mode 100644
index 369fdc1db2f6..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
+++ /dev/null
@@ -1,86 +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
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-CLI_COMPAT=( python3_{10..11} pypy3 )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.text/
-	https://pypi.org/project/jaraco.text/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-3.5.0-r1[${PYTHON_USEDEP}]
-"
-# needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
-# bootstrap
-CLI_DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/autocommand[${PYTHON_USEDEP}]
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	' "${CLI_COMPAT[@]}")
-"
-PDEPEND="
-	cli? (
-		${CLI_DEPEND}
-	)
-"
-BDEPEND="
-	test? (
-		${PDEPEND}
-	)
-"
-
-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.text"
-		version = "${PV}"
-		description = "Module for text manipulation"
-	EOF
-}
-
-python_test() {
-	local EPYTEST_IGNORE=()
-
-	if ! use cli || ! has "${EPYTHON/./_}" "${CLI_COMPAT[@]}"; then
-		EPYTEST_IGNORE+=(
-			jaraco/text/show-newlines.py
-			jaraco/text/strip-prefix.py
-		)
-	fi
-
-	epytest
-}
-
-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{_,.}text-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index 0cc9650b316b..0ca273bb4c56 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -11,9 +11,4 @@
 		<remote-id type="github">jaraco/jaraco.text</remote-id>
 		<bugs-to>https://github.com/jaraco/jaraco.text/issues</bugs-to>
 	</upstream>
-	<use>
-		<flag name="cli">
-			Install dependencies needed for CLI tools (Rust warning!)
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index e414edc6d12c..71086790d50e 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,7 +1,3 @@
-DIST lark-1.1.5.tar.gz 246737 BLAKE2B 2111bb6c2f6eaa05b803daf11f0f55641c9b3943a97f943fd27b5dd33f8b511e3b0fc4fb335edbb3926ad19da6cb2696b7f87003b7def068cae1d805b3feb8d9 SHA512 8103e050745c83c99b077667aa8b1d4dfad28f5554d2381534b3518d8d3e8adb70f0304fdc7e1c762d3ea26089181d9632dea155b6cd97237078b89330a6711e
-DIST lark-1.1.6.tar.gz 251270 BLAKE2B 2f2b81eef82ba2cb774e3aab448a092256a714e7118da08e1e25297c1573d0b833231e6b6158dc88fb19c80af370b1e72946dc929f6379408a9aea6c596f3605 SHA512 347ba7423f15fe38c97446991b4d2d0d6edd50bc656aa9a67c8b6d94b8cdbf2b006f3391c6c06fe000fc4b2657480e6a66a9580ebb0440eeef2b5a6a5418567b
 DIST lark-1.1.7.tar.gz 251290 BLAKE2B c6f19eadf29c75257e0b49231e621bffd27ff6c569a07159e9f4934d0bf74abb6df9425fdd971392b415fc19d12421abc67186d844f2ef1c294205a25f4e263a SHA512 59e5567ebff173a25caa2ea4db3ff3f284bd580ce68a6a3ca27ceff34158a9b56fc404ebf3016e2bbb074fd19286a0d511ffaadf2f157185f45b10305c3c8474
-EBUILD lark-1.1.5.ebuild 976 BLAKE2B 27eadd92cd8da5f9fd086223ab7d3fcc217a456e4bc7bc2004cf60596ec41d4a8fab38a1784e68418e56fc9881f3e51650317704344a391d9148435469bffe9a SHA512 3a7416443f30db7aed7c1f7cba9d83c29179b93b230ae1310acbe61c7c349d65e12739e3d8193ea13911eb7a7a4d28611133df244b0a7085ae4f8f28ac53bf50
-EBUILD lark-1.1.6.ebuild 984 BLAKE2B d705f41abb9f132717974faff1b5c5610f4ed61b92bc5aeab945883fc6f5e42bc5bc405ded31592e21a4409bf6206860157537da2cdea4f3612225e15be55423 SHA512 d703039f124770e79b8dc111f26c757a6def89ff198318e31d220a4c222c3faffdfe4b3d97d69b8f7b3c06a550b7b01b363b8cce3d541488b267b5d1ff6c336d
-EBUILD lark-1.1.7.ebuild 984 BLAKE2B d705f41abb9f132717974faff1b5c5610f4ed61b92bc5aeab945883fc6f5e42bc5bc405ded31592e21a4409bf6206860157537da2cdea4f3612225e15be55423 SHA512 d703039f124770e79b8dc111f26c757a6def89ff198318e31d220a4c222c3faffdfe4b3d97d69b8f7b3c06a550b7b01b363b8cce3d541488b267b5d1ff6c336d
+EBUILD lark-1.1.7.ebuild 976 BLAKE2B 27eadd92cd8da5f9fd086223ab7d3fcc217a456e4bc7bc2004cf60596ec41d4a8fab38a1784e68418e56fc9881f3e51650317704344a391d9148435469bffe9a SHA512 3a7416443f30db7aed7c1f7cba9d83c29179b93b230ae1310acbe61c7c349d65e12739e3d8193ea13911eb7a7a4d28611133df244b0a7085ae4f8f28ac53bf50
 MISC metadata.xml 388 BLAKE2B 705a273d593a97c10e06cf04bf146864ff3a5d955f30d0094ab6869fd12e6033612e361e55b9e934f052ab29de7beef928293a377d0f1abb917f9715e111cdd6 SHA512 76a47597d5a6f2a71907701dc53837b1fb175be2b2fb0e70a03dacd17974f4dbaf3caa56f5e4be07c6847245c313bc3911ae949c689056082edda7993405cc32
diff --git a/dev-python/lark/lark-1.1.5.ebuild b/dev-python/lark/lark-1.1.5.ebuild
deleted file mode 100644
index ebc8caa6fd91..000000000000
--- a/dev-python/lark/lark-1.1.5.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_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	if has "${EPYTHON}" pypy3 python3.{8,9}; then
-		EPYTEST_IGNORE+=(
-			# test using Python 3.10+ syntax
-			tests/test_pattern_matching.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/lark/lark-1.1.6.ebuild b/dev-python/lark/lark-1.1.6.ebuild
deleted file mode 100644
index f65a5584bcd8..000000000000
--- a/dev-python/lark/lark-1.1.6.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_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	if has "${EPYTHON}" pypy3 python3.{8,9}; then
-		EPYTEST_IGNORE+=(
-			# test using Python 3.10+ syntax
-			tests/test_pattern_matching.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/lark/lark-1.1.7.ebuild b/dev-python/lark/lark-1.1.7.ebuild
index f65a5584bcd8..ebc8caa6fd91 100644
--- a/dev-python/lark/lark-1.1.7.ebuild
+++ b/dev-python/lark/lark-1.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 0978e728a68c..84057f5716fc 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -5,5 +5,5 @@ DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2
 DIST matplotlib-3.7.1.tar.gz 38003777 BLAKE2B a387d23b58e09011cd3ae1f8c0ebf5dd8c04c8c15c1f6453c92cd22b2439fcabcf384f39ae8d2d2c6b7d2645817cd57a60856a4c05728e8f8aff9dd163af5083 SHA512 d7db4213d5b38eba779ba06ffaa8e67a435192e4a8cf62f8e1cd4b8079cd257b2e83cb79926df012b7084c785c0ce8b03275035f68cfcf0a36b0dda7322f2e67
 DIST matplotlib-3.7.2.tar.gz 38095843 BLAKE2B e26e78ce3a27604ff3d0f4d280798715b21a89104908e4fa66f96e32152d61f4f640e02e1eb2327563c71f3391c03716b5f6a1e769a07725d02c042b21973a4a SHA512 3ddb223c869c01cf71ab65a628a3c996eed1ff8b2375c02e3158a5750652a5d8277a55706e50890c15c14c7a104db01f01b01ca8964f85b6ffec104fc273872d
 EBUILD matplotlib-3.7.1.ebuild 10042 BLAKE2B c0b158220afebee30b91e13d80611cd7eebfafe4399f0327e662782b666807409844182d4bd283300535cecc5cc9a0b5e32bc99c472d6e9d106820d677d67a39 SHA512 05d6f5176e6c4b2431969bdf130f06525d56db044ca5e65516a9bf7363feb25e22c48c7a146102c1ca2da4a9ba783e6a8da98b80efb08674ba456b245b691e0e
-EBUILD matplotlib-3.7.2.ebuild 10255 BLAKE2B 4a8a457c35001ea57ea746bcae2fa26de0335d46313c05839b472f7d13727558c52ff818cd2af7c3d104d5cfcfff9271f37593e2ccf192343554b8b16140bc7c SHA512 148bee7f9e71cf883544f0036c712a7ee62491eb7ce1edb097c1fee96efc10a8e88eb08c7a73438b108fce018f6c7d1a8b36479faff33835542f5506a71d61f9
+EBUILD matplotlib-3.7.2.ebuild 10254 BLAKE2B 0b6c9fc1f3988e229a1f5cda767cd8d37c0cffce379cbad9ee3e3463bfffb213537a5dfbd2cdc7903779f012644c8aabf1d3bb07420792ef0af62d53dc7bf91e SHA512 178606982a59d0de28cbb013010226cff6e505ce9593d577dab9f1ce9d1b74058ae95215f322ae76d7881d4eb963074968dc32bd8b8d197823fdbcdf34a2b1ed
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.7.2.ebuild b/dev-python/matplotlib/matplotlib-3.7.2.ebuild
index 8fad3f941931..b7d5b9e477d6 100644
--- a/dev-python/matplotlib/matplotlib-3.7.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.7.2.ebuild
@@ -30,7 +30,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 00c346ae1d82..7f2e4653f4c5 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -2,5 +2,5 @@ AUX meson-python-0.13.2_Mach-O_bundle.patch 876 BLAKE2B bef2575363237b73c0d11e65
 DIST meson-python-0.13.1.gh.tar.gz 69434 BLAKE2B c3442eb1c066772b80efe4e41764897df85a3581c94f9d958951af04e9ad7a01c646c7ed7f0104fbe957567e16b80c6e3744ab23b6b66a8df3cc920cb68c852f SHA512 037825eabcaec5bdb73890114ecfcfb05373bcb5e2806a8d38e4afeeecea42aa14f9c8cf0bec151bd231e2984c64608b28a1ec79640485933cd57c8895b6a305
 DIST meson-python-0.13.2.gh.tar.gz 69575 BLAKE2B ddcab5530e7c235057752f1c355052120863167fc601b669e3add713079400cf95617be84989e06542125850559124d70a693a618cbec456c0e59e3f80d14c5f SHA512 b5518c5e9ccbec40747f2c08a83134f012557e0d9612b99999473d2ae7fdfdeae5b7552dc16cebb493133c3ed8c52153b3e3afd3cef32d0f3a65771ebbb5b3bb
 EBUILD meson-python-0.13.1.ebuild 1562 BLAKE2B 386dbe0c5afdc8f6b3406bebc9852010a748c44fbe427f61ab8d43b25432dba82a94798e55357badac13d0390f5d8080b34dd9f3d047d5af128af1b5cfe57920 SHA512 d3810ba323c8e31968284c021184b24cd0628bfb2fc576d96e4941a903abb9044923f8b8dc1468edec63040859559c924d77b0acb639de945b0f4e1b62f82a02
-EBUILD meson-python-0.13.2-r1.ebuild 1680 BLAKE2B 2bb78a06cca5c26dbcf8c55cd0f3fa181ac38412e6f794dd18b0765599c92601e9cc184d4c85e3a32ec05c6aa2e1592450b0bcc97209cf55b30b31c7d087e5ab SHA512 bfe9f5d40ecc547b11e982d7efc1b7f2b6b53f64b8147610cbaaad970067ff64d2ccc0517ad6fe0830e0bc15038d26bc2c504d11b11690119783716196ce5108
+EBUILD meson-python-0.13.2-r1.ebuild 1677 BLAKE2B 34039e63d0d2619958ac0f4943f1e071ba319a72870ca5e44fb03cde5c975a2ed1f250925c9634550559e5a51a39c7bd3f93e36138fc891e346b5089a5da3d50 SHA512 c75b7f0b42b870cd9bec9e5574438f9a8ada47d9adf752689e84a015a9b993cb0f8be4a8cd6a5ea7b35fbd754acae318e17145dfdfe3d638b2120a36ad820311
 MISC metadata.xml 357 BLAKE2B c2b5fd8c6ad39e92970a5e6c1db8950b4850660c9a95a84063504ab75e5dd69e3ab844fcef23cb51f33493b7e522a6d26227ff48dd893c92c422badc70f3c962 SHA512 1402ace4da543de7320a1d97f44177593807d5be9f1891d8a53190581877569508c46fe6b4ce63516c7fee2d2165d59d39f44343dde18438570883da3f4ad28c
diff --git a/dev-python/meson-python/meson-python-0.13.2-r1.ebuild b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild
index d825de551203..7674ee6beb6a 100644
--- a/dev-python/meson-python/meson-python-0.13.2-r1.ebuild
+++ b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 5799480823d8..ab4be8c098d3 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-redirects-1.2.0.gh.tar.gz 7434 BLAKE2B cba7252865135c66ca467473e5c373b1779131dc0fdea47092d97d97d4222e6e9b38f9b312f0341af90b8a05a24c3c33250b060c2b3029d49dc970da0b2fc48e SHA512 e26260277f56005d8fab3a7e6d05187796356909d7ab4f8d6cd6edd535b0ee944e49faf5b6366269bfface1a855f399e3d95275a5f0967134f6c8e1256bef220
 DIST mkdocs-redirects-1.2.1.gh.tar.gz 7420 BLAKE2B c91701b5aeff6998d890d44fa9286b0a7924a2c66ee9d54777495b338152be0cde3f897e4516327e63a38ab362a156a0e44f041bc4af5bda32d7ae188a20369e SHA512 52b078f75fdf950780fd9f295cb528607aff641c46bd2d00df0a38ca2817280b1245c006b6bae6f63c37f4e61857aeb0271ca9fba4397e3185b173016c3ea437
-EBUILD mkdocs-redirects-1.2.0.ebuild 732 BLAKE2B 8793828d82324475ab2d028f407e4d5c35b075c55b9a1892d1d48e5b86f4a0a1cff5d52b4e8dd12dfab44f8fe99d6995877e2bd292557db8e1126a29580c1dba SHA512 56c008c1ab8a218743e9e40d3d4efdd0ff398847f3a55d780ca4d8fc65c3ac047f7c77748417ca60d816200b3dcb7fef2e5bed7e8c8bd0293627d8fb9e73ee0f
-EBUILD mkdocs-redirects-1.2.1.ebuild 735 BLAKE2B 82075e8a57d7af7307db1a71e8eb68979735e6fab261ecb81cf850a50c20b07c9a3342bf33f1d7e8b87f610d2ffc93f4fa6e5b225cb265a25c3060d14c94b256 SHA512 0cd59e55de6ca9e2b920997a0f6a05ca4e038293221c3c94c2ed3ea965ed7293dfb94fa8f821a75d6acd110d49be4085a19e88b161afcd008537c4a08b3653ba
+EBUILD mkdocs-redirects-1.2.1.ebuild 733 BLAKE2B 461459b956d52bd949ddf80ca7330a08b65f8932bec4d59bec64ea6182379ae25726de02f78bc2a64573ad1d631832f4b5fc24e590ef572f8b07047937d7ae5b SHA512 d4708f31899e2dc70fd243f04bcb44028e6b8546e258a0ba2e70bc926cdb28ef3aa8faf981c02241a9d130c79853728c2d9299aa865e0880e36fe2d6eb8d8a86
 MISC metadata.xml 425 BLAKE2B 0dba3e4e60feb48ee0e2b7bf308a6f8ba4f4c6bd6acf3f1cd9e61015fc550c1bc1dcfced21d42ae722286afa65a40b7491a73a159bc3d6244aead5104ab5fa68 SHA512 13a924e44d6c9689783e1c01473c055992a2b2b2357523e587ce1603c71928265045c306ecdee95de524f80dd5581a4dccd49e048369f128c37236744d1345d0
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
deleted file mode 100644
index d73f7f0cf042..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/mkdocs/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="
-	https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
index 861bbeef18c0..16441c90628c 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index ac8f13c3c089..a5a32868d2dc 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,9 +1,5 @@
-DIST nbconvert-7.6.0.tar.gz 886726 BLAKE2B 9623b10adf08f06921c7b162018a747ef02e47a99c9663261247af2ee895ca66d310c42bcfb8717009b8fd9e8da4a088c5d8369f0ebe5a570a1439d3ea0db37e SHA512 70870b875c0045796004ada5ea3ec5402339392419919c11f2713f07cb0f35605f8902a1e965706c13b972fa4d7785d4941834bd9565e3b3c8afde2a9d2868c9
-DIST nbconvert-7.7.2.tar.gz 849694 BLAKE2B 20fb4f9385e5c0d7288974b1c2fb76529b48ac32a21a786e06844d001dfda94643250e54d484809d02c056378429b352ef17559790197305fdeffbe27722d1b2 SHA512 9a92efa3522eb38f975db82a5ea4559833cf30bb65c03f1a2895bc7e4f95c691aca3a8f8e48b0105e44e8428062ee82883480655442ca5fb215b48df45937a09
 DIST nbconvert-7.7.3.tar.gz 849762 BLAKE2B a887fc2bbb7978fdcabbaa46ea391a9b42ba904609ee0a67fc59f1d66373ee2d4cc6328b4c39a7deb77f5bb87c503dc61f7c3a5ce04e36a8149fe7ece42fab46 SHA512 8b6f5b05c89e4931716ecd7de1d16be54284a0c5699439f896f9c08bf3d88f930e6e6cf2fa688132a6c7b93ccd11be9526cc08732d4c28ccf3854f402e21fe82
 DIST nbconvert-7.7.4.tar.gz 849858 BLAKE2B e7260b7cd6d315fc7ca70ef272a72b2b85557813caadc5c89964a21cf85c5cda186921d16685f2abc8f0a34b1b78a9c5c03b8bbb5308a31363f6af3ecbd4c721 SHA512 4af508cabfcff9c3bfd56fcb7e002f3af0a3edb1209ffb6dd48ab79f8ce24d0d7abe87398117fe41dd8d704bb8bf292a785826f1bb6e8be124a761a317fcb015
-EBUILD nbconvert-7.6.0.ebuild 3057 BLAKE2B e4c6a53b9106aad5c3d010797dd078a6ec3a87ed2e16c656b38d0bb5847c905ce31e8d0b795905fba6b06605ebf7f27d1ddcff057231cce9a464b662c68d3e9d SHA512 8dd90259bdde51131269a675c6b8651ac817e33c0591fd31e050cb04fce582eb4612a96cfb4d1e9a596e5cac33259903dd47b46377fa29056dc34ed32f7dfe23
-EBUILD nbconvert-7.7.2.ebuild 3102 BLAKE2B b0742e401e7da54b0edbf1720626c0da697f148cbde3dea9b2d57d382c1d47c0617d56ad8a44d17cdf37206fa7b1a6801499c87e2c816a8b8e588274fb9d0c88 SHA512 e742ef0a4f53aed02f1fbe06e4f96b2e1bda1a408aa3a332d962442f3d2874b947b68a362fcc841d947955e21023cb34c8fdbc63048c591fe9660db4a801d7ee
-EBUILD nbconvert-7.7.3.ebuild 3102 BLAKE2B b0742e401e7da54b0edbf1720626c0da697f148cbde3dea9b2d57d382c1d47c0617d56ad8a44d17cdf37206fa7b1a6801499c87e2c816a8b8e588274fb9d0c88 SHA512 e742ef0a4f53aed02f1fbe06e4f96b2e1bda1a408aa3a332d962442f3d2874b947b68a362fcc841d947955e21023cb34c8fdbc63048c591fe9660db4a801d7ee
+EBUILD nbconvert-7.7.3.ebuild 3094 BLAKE2B 27a1afaef7e037799e2b8546e75174dc1f27a9a369dac65539844b5c54a2309ef2d5b011f49eb6b81c732e97ccdfdbc216c4280332bc8e4ab2c0bd354418af83 SHA512 c3bc1eb1ccd9b53f6fb34e2187874b34324e7b84eb1c466157ec9a7b5d8b880a904cba884043252d71f0f95c2060683eb31e2b7bc28cdeb5e4a9e87f95a39426
 EBUILD nbconvert-7.7.4.ebuild 3102 BLAKE2B b0742e401e7da54b0edbf1720626c0da697f148cbde3dea9b2d57d382c1d47c0617d56ad8a44d17cdf37206fa7b1a6801499c87e2c816a8b8e588274fb9d0c88 SHA512 e742ef0a4f53aed02f1fbe06e4f96b2e1bda1a408aa3a332d962442f3d2874b947b68a362fcc841d947955e21023cb34c8fdbc63048c591fe9660db4a801d7ee
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.6.0.ebuild b/dev-python/nbconvert/nbconvert-7.6.0.ebuild
deleted file mode 100644
index 759da74de6ed..000000000000
--- a/dev-python/nbconvert/nbconvert-7.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	mkdir -p share/templates/classic/static || die
-	# tries to refetch stuff even if it's already present
-	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
-		-i hatch_build.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		nbconvert/exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-		# TODO
-		nbconvert/exporters/tests/test_qtpng.py::TestQtPNGExporter::test_export
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# latex failing, might be too new pandoc
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_filename_spaces
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_pdf
-		# too new pandoc but we don't have old anymore
-		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_minimal_version
-		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_pandoc_available
-		# crazy qtweb* stuff, perhaps permissions
-		nbconvert/exporters/tests/test_qtpdf.py::TestQtPDFExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest -n "$(makeopts_jobs)" --pyargs nbconvert || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-7.7.2.ebuild b/dev-python/nbconvert/nbconvert-7.7.2.ebuild
deleted file mode 100644
index 8243caec62c7..000000000000
--- a/dev-python/nbconvert/nbconvert-7.7.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	mkdir -p share/templates/classic/static || die
-	# tries to refetch stuff even if it's already present
-	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
-		-i hatch_build.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		nbconvert/exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-		# TODO
-		nbconvert/exporters/tests/test_qtpng.py::TestQtPNGExporter::test_export
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# latex failing, might be too new pandoc
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_filename_spaces
-		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_pdf
-		# too new pandoc but we don't have old anymore
-		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_minimal_version
-		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_pandoc_available
-		# crazy qtweb* stuff, perhaps permissions
-		nbconvert/exporters/tests/test_qtpdf.py::TestQtPDFExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest -n "$(makeopts_jobs)" --pyargs nbconvert || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-7.7.3.ebuild b/dev-python/nbconvert/nbconvert-7.7.3.ebuild
index 8243caec62c7..c503ec9a03d4 100644
--- a/dev-python/nbconvert/nbconvert-7.7.3.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.7.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 16754241537c..547f9d158cd0 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,7 +1,3 @@
-DIST pecan-1.4.2.tar.gz 124900 BLAKE2B bf78c630605dbf020bcda830855cf19dc660c8bdbfa6d68a9739a0da7c585ec17d30525d37337867e007aa31d3329e87224cfd4e0335b14496df911457af5c82 SHA512 cea290db5b7c4664057ec326e1f9ac11d4b523e2df83a84c3b47acbce0520f248bbd33de0f66379409a4ff463b6408b587238917362572479288d36843542ab0
-DIST pecan-1.5.0.tar.gz 124111 BLAKE2B 2a72c891300f847f463b3f9a8738113929a12f256ba9a7c7b2ece23f807e56ea36376fe8a28ba57c2e67f82e1d6cd9f754b2680a27cad0910a5f1005a4e9dec2 SHA512 c48082aa0841b58ead990011901cbc43c9fa9ffc586321f47eca8ea51d80fd4a05fbf8ea85459362a7419f5eadd15b3ca89eaad9e69b754aff5c44b46e06552e
 DIST pecan-1.5.1.tar.gz 124161 BLAKE2B 441c4fcc94409aef93324ab8dfb727fc09a3e0f8802ba804d3d5f52237d4f089c3eed23f55a8ad82a9d372d28d622faf8b196b59936e7fc9feb69c4f87883084 SHA512 87fff8657268accda3a53f156338332e3d23df8055cc62d77d9f1641f692c1d7e4013f564b0108541e5df69e1d3d2c8e3df87486e0b4316e437f67d010013fa9
-EBUILD pecan-1.4.2.ebuild 808 BLAKE2B 56ebb6497a4a33e4428f28716bebd75bee57406399b092e8f13ac53c6d98c21b39071133a021aa72f6daaca996d6ded1a47bb6fc20048c2dec9a5d159f448e7f SHA512 45af5ffd021d2650f9fd2caff254741de3d113e9404ff16fe7c12f06c44d576294e7a792692069fdbce07d379484aa376bf70feed085b036dc7e421ad2cb6f50
-EBUILD pecan-1.5.0.ebuild 777 BLAKE2B 8463113e610e3342d35a095db9194e7923c0b722b12ed43966a46d9c498c180855e5aca3eecfbcb3190b9d20ca795219228964024d5211595aa04ed5e86b1ce7 SHA512 a7cfdff56c263b9bd0bd861b2a0e145182a8d4b6f00bf085a0b65ce23092eb5f9012c57ca922f3505d7e444d6ecb912913f202177e5a232b926552d057260497
-EBUILD pecan-1.5.1.ebuild 691 BLAKE2B 7d6b421e77d26c97f62b20a43b5f0dfdeb25dfd95420d2c0193cbe13a0b7fbaac5081bfdb840dd60247d14092de5918695ce588887035ccf0f85d6564ef83e30 SHA512 65ff7a62a6d96e2f0303a9edec346ea3be8a8390f4e94b82c4d6ac60ecd460b9deb283f335781faac959002b3c6e43a29de00a7829cb8517191776b217b48df5
+EBUILD pecan-1.5.1.ebuild 689 BLAKE2B bc0b997ab2b17ccb2c2f7d9efaf19a8d0a7a15a0f86cb9989ea43800586193f108ea2e3eebe5e1244b5674d1c5cca6863ea1624f49c3591d130d549ac275b309 SHA512 63a01a80d1ce00fa5b7475c29cdfcab9a4efecf3ca691c425fc2b26f415779a3b557ce6730fb2e9e596f1cf3168e8b0ec3bb631b8f8fc4d927a86a25a41695dd
 MISC metadata.xml 398 BLAKE2B 3633491bdf0a6d7ee60f39bbd1d9213ce9749bf8c54f3afafbd01d6059ac995e8f10a1995d2390188f677d196cbc2c2d4dc58d4365794932ae6b190ed6d41eaf SHA512 f3abccbbf33c1b98b7e1e936979d40103cbbc322a31c10106b270d3fc2c591d053b0bbffb565a5de542d9724ce7e600342760b9451f71d033fc9a1810ebb5642
diff --git a/dev-python/pecan/pecan-1.4.2.ebuild b/dev-python/pecan/pecan-1.4.2.ebuild
deleted file mode 100644
index ea3de314cbb3..000000000000
--- a/dev-python/pecan/pecan-1.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A WSGI object-dispatching web framework, lean, fast, with few dependencies"
-HOMEPAGE="
-	https://github.com/pecan/pecan/
-	https://pypi.org/project/pecan/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/scripts=/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pecan/pecan-1.5.0.ebuild b/dev-python/pecan/pecan-1.5.0.ebuild
deleted file mode 100644
index fc7a9f0a67cc..000000000000
--- a/dev-python/pecan/pecan-1.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A WSGI object-dispatching web framework, lean, fast, with few dependencies"
-HOMEPAGE="
-	https://github.com/pecan/pecan/
-	https://pypi.org/project/pecan/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/scripts=/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pecan/pecan-1.5.1.ebuild b/dev-python/pecan/pecan-1.5.1.ebuild
index 8ab7bc4d01ce..2fea58f4a4d2 100644
--- a/dev-python/pecan/pecan-1.5.1.ebuild
+++ b/dev-python/pecan/pecan-1.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 7f945264f6bf..b8d06b64be23 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,8 +1,4 @@
 AUX pip-23.1-no-coverage.patch 1836 BLAKE2B f8c95ed26d5a7cba2a516b8d134ddd9901fd7d39dc8bf174397ab2afab33e93c4af342195b5b4d7b0aedc642493f1ed2ee474c74e16e285f335dcdcf531b1777 SHA512 c63929cc5324b2a741a4c1ebb4990c376eb6a4c0f39370e456b674ce3cfbdf10471ec48cf9368fccba9264fd9d4a5667988116163e73772496f28d52986ff111
-DIST pip-23.1.2.gh.tar.gz 9345911 BLAKE2B 511ac1a9405e377ccb2525e89676f4a63f138aa526d40e76f4d9681139d94db1f92772beab1a647654c17abc6bee09f52cf4c4f4484716874194565fda07d056 SHA512 b33070cb59a1258904a60b48ec8abfd9e316c5f87681fea13d89ddf6d516afac10965ae1db54fea299a0a72f98602ce02e8b3be46f239e857db84866045730e1
 DIST pip-23.2.1.gh.tar.gz 9370625 BLAKE2B 9e7855aae371a773a070c24b50f985dac6ff7c2412d51e268368b911b92d0d0b52a839f9d761d5f6aaff33f1e7570d5f930e5063e8af98aa99f50d2f1c1b5ed2 SHA512 a6c629976c332cffe5dff0ec1e201d694c7a42fa8def202ebf1db251a6dbd90091eaac89c36a354a0cf0c60cdb267b4e0ec9ff6a88b0ac61cfaafdf159e34fc8
-DIST pip-23.2.gh.tar.gz 9370682 BLAKE2B dbce43e29ed453e32e13a6d2f18ba2d8095021de0073d13de18cb55b5410415d0feeb2610e31ae8a0025864e6d05eb41aab3dd8adeaecf990fa31e7284e71fa5 SHA512 fe915a8f85b21d59b416a5b1fad6e6ce2874b27e055c86ad71efe31c492f117a468734da239882c3d7f4678f91389daf0e8d13abc6429ddca5bfef87cb29dae0
-EBUILD pip-23.1.2.ebuild 4038 BLAKE2B c67ff2423fc237ffa94e3a5849ac187b76b01519ad6d54ee1db078520408e85ae51ecb5dcda888d5f43b89b67c91fc2449d57495e1fdece696fe87599df87272 SHA512 f6fd22c5c095e4a643648da9711ca6fbdae46e7639dc4b4eeabd37374b42d0d7256c2f431b1cb6ad9c6535aecb9d73658e6d6dfefafe08f77003e9040c9710aa
-EBUILD pip-23.2.1.ebuild 4223 BLAKE2B 04f51fa0a7c263a14453afd76fca041106b6c186d4471008604dbc196fdb2fc01fa9e832a700b2223c6e3330c39b9f621c33c348a88d10eed8ee6c84516082b5 SHA512 be7c42798d0bb8ca53f1c222c4992e0ef7b244c0a87004490296bda85a8610fb954f76eae48b9b26eeecdf9060406c9fc2f1395fc2441d3b51a88f75153abc39
-EBUILD pip-23.2.ebuild 4223 BLAKE2B 04f51fa0a7c263a14453afd76fca041106b6c186d4471008604dbc196fdb2fc01fa9e832a700b2223c6e3330c39b9f621c33c348a88d10eed8ee6c84516082b5 SHA512 be7c42798d0bb8ca53f1c222c4992e0ef7b244c0a87004490296bda85a8610fb954f76eae48b9b26eeecdf9060406c9fc2f1395fc2441d3b51a88f75153abc39
+EBUILD pip-23.2.1.ebuild 4215 BLAKE2B d72e3ca23f6c4405f63333554873470f4d550981b3b6e582d9ff5ffdd442a81d02f49b2041aa69d18f9d203cce356da15837012383cb9e7eb67e6aed1bc35435 SHA512 98324ea9475914ed958af64d651fd1bec0f4c5166015438a30505713e003d7fb053f1edbcafce1c3594d94e3c41331ae58e8c49b2afd9191b123f2b6a9f0646c
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-23.1.2.ebuild b/dev-python/pip/pip-23.1.2.ebuild
deleted file mode 100644
index dccb1733d387..000000000000
--- a/dev-python/pip/pip-23.1.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-		# wants to install keyring from Internet, sigh
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-23.2.1.ebuild b/dev-python/pip/pip-23.2.1.ebuild
index 58c5279dbfaa..5f4a2d920c67 100644
--- a/dev-python/pip/pip-23.2.1.ebuild
+++ b/dev-python/pip/pip-23.2.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="test-rust"
 
diff --git a/dev-python/pip/pip-23.2.ebuild b/dev-python/pip/pip-23.2.ebuild
deleted file mode 100644
index 58c5279dbfaa..000000000000
--- a/dev-python/pip/pip-23.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-pip along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/ensurepip-setuptools
-			dev-python/ensurepip-wheel
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			test-rust? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-23.1-no-coverage.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		local wheels=(
-			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
-		)
-		mkdir tests/data/common_wheels/ || die
-		cp "${wheels[@]}" tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-		tests/functional/test_install.py::test_install_8559_wheel_package_present
-		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
-		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
-		# TODO
-		tests/unit/test_network_auth.py::test_keyring_cli_get_password
-		tests/unit/test_network_auth.py::test_keyring_cli_set_password
-		# wants to install keyring from Internet, sigh
-		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		# probably a too strict assert
-		# https://github.com/pypa/pip/issues/12152
-		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 54a21b376379..911d0bffb6ea 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -2,5 +2,5 @@ AUX pybind11-2.10.4_macOS-GCC.patch 867 BLAKE2B e74c330552e5c1c842d557a37cc6de7a
 DIST pybind11-2.10.4.gh.tar.gz 740622 BLAKE2B 7b2d86e8262581b2cc6dd720b83336206e242ef8ca99b257b01a11141ed8b127d7f35d7d573bc763dd36f2fe8c8ac91766089deb63a76e9c10029c34eec2d6d3 SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7
 DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
 EBUILD pybind11-2.10.4.ebuild 1363 BLAKE2B 3eb66771750d56d7acee9208fd6dac13d95a83dbe81dd3a5e59f23d4323d1dee7eace4cb8925607843533a34aecf42fe0a6eae2c827879348265fece46fefee0 SHA512 9260291f7e30f4d0360bff665b29f76f5f99707e2ebdacd8f71a5c83007b5f18237fedb169bb0d13a8d22930be8fbda5d4ee3f6e961fc17d9f0d5ac916687774
-EBUILD pybind11-2.11.1.ebuild 1313 BLAKE2B 6fc1f0571384fbee195c27883b357ddd701eccbbc9723c473eaea9dbc13b550e68dcd4dc834f14065ead6ec9f2527c2abf97f3b5b765098648793d55a1344811 SHA512 d4f627d5306e8bd785ea082950a136522d03ec23c09a11129d70197b68d5eb21c7626cad19e38c1f860448f2a3877092b441c95de6aed9668dd7a42b9f8fdb7a
+EBUILD pybind11-2.11.1.ebuild 1308 BLAKE2B a056cc6c6117787913dfdbd35a792639daabb468d9242c232469cdae3f389ec159ffb8ab091a24afcb30b38d603744c8d9b6cdaaff6fbb3f68da6696f97ee3aa SHA512 feed9bb643078d4c5958b02221b8860eed9f2437b7f7a3a4e40d8b3a1028b244f4fb645c7a78ce3058dcaa7f39ccbd918cdca604a1147b5557e6c11fe87933e0
 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41
diff --git a/dev-python/pybind11/pybind11-2.11.1.ebuild b/dev-python/pybind11/pybind11-2.11.1.ebuild
index 7b60bb179887..6d679c45a070 100644
--- a/dev-python/pybind11/pybind11-2.11.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.11.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index f655d73ca662..eb2d89b25cda 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -100,6 +100,6 @@ EBUILD pydantic-core-2.3.0.ebuild 2856 BLAKE2B 761f14a7d2bf09b94031a1c5edf711fb4
 EBUILD pydantic-core-2.3.1.ebuild 2856 BLAKE2B 761f14a7d2bf09b94031a1c5edf711fb41af82ff8064c1d4550632ba6843b0dc2a7bdc9be3f491074df320ca39d072d14ab3c81588b8eee33add3a657be10730 SHA512 203feeedd26090802179a05c59b27b967692640ed04be5de52acb20adb9df1c4661d5aa70941baa4f84f9cbb5c09e16176fddccd288e72b448bf87fdb15a739d
 EBUILD pydantic-core-2.4.0-r1.ebuild 3019 BLAKE2B 5c34a453aa26f3db7475422f1cfef8aba4122de06d4d5c0ebe375037dc6bec8bb2a1e54fb967e55efb41f8254b1b41295b9613b22ebae361eeddf6e99622ce5d SHA512 2aa2011a361820e601aec7df68c26a0e84e7d88ce7fa0ff16b21dc4332407f2e4bb4b6236fdf8635160e9169de349013ac11a82e9cdf4ab3889c8096ffa2e095
 EBUILD pydantic-core-2.5.0-r1.ebuild 3060 BLAKE2B 8b80535ed4ec7dc08ca3db07b9c2d6e6f98a2ddf99c53ff37ba7c9d6cb6571257b775cf2964331c947afb1650cba709253e61a6fdcbca8a298ae96afca9dcabd SHA512 123242856633399ab26efa383fa1625cb9dbc0ed85d43f3e71ac5092062a37a7680f7a4fe5d12c754874836e41b2711277f66c9a8fb2d74ec53f6241f0b0e913
-EBUILD pydantic-core-2.6.0.ebuild 3060 BLAKE2B 2e253fdb3bceb617f1362739110fc4ab5aa7e55445a81d9f408315684d3e76d80c388f5756aa10d7922611ddd996ec3880289ddea0e4d7a40ead2203943dd5be SHA512 c3f14cc06195ddb5028b8ef75fece65ae1157aba6a8fb3e39110ed29819e83b2ed936877709611f8a3e3ebc40d247879647adcf382f3ae014973fbf882f88771
-EBUILD pydantic-core-2.6.1.ebuild 2859 BLAKE2B 9724687278d29111811ae3e5b42c2294409aaf613c2ecf4e9b0963e8d8e20aec376a879f4655a12acff37138b9e7694192047ce166509dbef02a0edaced97a95 SHA512 377e4e90650cacba517599d630a528ad04e55fc9cd740b78a13af7f407d3e0ba43c19db8a42bce720b7a83cd328f72187c777ae2203851836d54a975743204a4
+EBUILD pydantic-core-2.6.0.ebuild 3073 BLAKE2B 6055e34b414ab03e02605bb1cb0ecfcde8737cecdcb0fb251dea25231061cabacf37ba5fcf3309198bd6f219a05d7073f593be453cad732cabd2ab8f3150c169 SHA512 f3d0bf0cd067bdf08aed21aed74dcf5ef6145e06c342be54ce6b9ee3bc29ea00a40b5aed8a7a0160adbaee0a0d90f1614d6b2833b9a04f9ea6ee39a7a478f571
+EBUILD pydantic-core-2.6.1.ebuild 2872 BLAKE2B 268cdf442fe5a7c953d7bc8e6977c5f4ede42540036e8f7e4858db08e1698e002d3e4eefd4ee8f43083e27906dd6b9b05d61422182d130ac056f08ea4bddc0a4 SHA512 fc1b8278af517ef55693425b779d9e5001bbef9de9a18d55cddcbea24d992dc5f9094c2c9874d0a0a7c56038edf20114680f3090ec2f9d66b8da948f0f6a70ea
 MISC metadata.xml 379 BLAKE2B ac0fa1abd0aac6436f234dfbfdb1517cdef2f7636c019a16257619d1a1a95a31b67061daa6606b47b68332d03bd213fa9bf67017b0e4af9733a26ab4828cf206 SHA512 7e3b5785628be025efc5360924e31a5a5becab941c9db255357b966dd5d3aca733e96485e92e78533bcde95379c59c36a601d4b407550c5ff1c649f09c3a21a6
diff --git a/dev-python/pydantic-core/pydantic-core-2.6.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.6.0.ebuild
index b7c52c7a6ea5..a1e999a20b01 100644
--- a/dev-python/pydantic-core/pydantic-core-2.6.0.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.6.0.ebuild
@@ -101,7 +101,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic-core/pydantic-core-2.6.1.ebuild b/dev-python/pydantic-core/pydantic-core-2.6.1.ebuild
index d4afdfba6f3f..3507c6d1add8 100644
--- a/dev-python/pydantic-core/pydantic-core-2.6.1.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.6.1.ebuild
@@ -99,7 +99,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 3b295c99c4f5..ddebbedd9723 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -3,5 +3,5 @@ DIST pydantic-2.1.1.tar.gz 611057 BLAKE2B b414fa698fdc8aee12427d38d0c410ffdd9a39
 DIST pydantic-2.2.0.tar.gz 620963 BLAKE2B 64b32daf0d6161a70364bdf21e4f868547253106ded166212faf7ae6dc4861ca21078c0f261af1e86b4d300de790f59bb641b76f0c046172a1240fce0135be86 SHA512 b9558cc9ba7da65507e13beb553e616a653169600c2898d783fcb761286674add7afccb39b90400875c0fe1b1a6fdde6e028fae39770fe3be767a9cdb94df5af
 EBUILD pydantic-1.10.12.ebuild 2518 BLAKE2B 84f7ee9b095b56518792f81df308652cdc725c6accef3388615bfea735c676f45e449e0c60ec030349b067a8a97833669071f493325c6644c7a73d08d348dcc3 SHA512 7fedbe4158ce80d41e8686ed19618bb818d3efdf8d508a8d4fdef7f8525a3e4e1364a340ba0d710f2b33327a280e33e5df15c0ea2920446dfee3d1b95cc4862f
 EBUILD pydantic-2.1.1.ebuild 1668 BLAKE2B 6bac6d6e3ea60e26dc99e89f7420f483dd6c1153d0ae44f7558457c828e7c014efc0595c372f5c74010bb11b526dc4631044d18743edd73c1d9acaeee2eb8ad3 SHA512 b42cd39cde88d30cf3e67845ca6026c6f4ac581b055b0a4a40b6ac26db3f593c1dd7c8e249f26246c65e88678050cbd049f073259d70faa58075d1267c840d05
-EBUILD pydantic-2.2.0.ebuild 1668 BLAKE2B d265789b35bc51e465a93a04c9abf4eb755793a76c56ab63a42af9b50301a2c03949b8f58db1eabf8dcd9d8119d4a8ff3732267b6f24357c5affa7b145560313 SHA512 0cbca4fc50c0fbba6abdb84daa63774873205a55e477a3347dc2befa5b76626b877c8a1f7e024d483d7a3222427fca6c3dcf0c1116dbfc2c88417bd92b60839a
+EBUILD pydantic-2.2.0.ebuild 1681 BLAKE2B 5ba5de953b709e045710f32503ae9db3ffaedaca519a20870e86e03b2d3d82024b0dd1192ce2d7c25653b2a8063183e7b426e13d55ab3c94a12a98d49d26913e SHA512 4d2038d9becc3db41db957e2469394adc15637bc7bde355e4edcb0bc36035125ec9219d961ab2e61ef70d291f0eff85839b88bf783f2b44ec220750f761e22e7
 MISC metadata.xml 630 BLAKE2B e765d13d92f634fcd09ce51499a64149ca11f46c8b45d9a41c35382ed84686326b5dd9aeeb0d780d34f38f0cf99b08de6269f1671642aeb389bfd9b8abe18dba SHA512 43f108a909059554ea0fba2055739d23d889f1cf5e01c8f54c4e926062055d042b77412faa9f60af41697c155914907c87455361bb0d32edfdfcf5ff8ce1b2eb
diff --git a/dev-python/pydantic/pydantic-2.2.0.ebuild b/dev-python/pydantic/pydantic-2.2.0.ebuild
index 3301cd976203..312ad07c514c 100644
--- a/dev-python/pydantic/pydantic-2.2.0.ebuild
+++ b/dev-python/pydantic/pydantic-2.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 8ed4a692d7ed..5a472099c30e 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,5 +1,3 @@
-DIST PyJWT-2.7.0.tar.gz 77902 BLAKE2B ff1e1c5dfd301a86a42eb6b4b2d6d900b15acdf60875bac49aee980b75b724292ff48b169cd2b9708388860ea93fd94f3cbf891f4606bfeb544e07a14c328bb8 SHA512 0aa886dfdc3c668b45e1c649cc3fbe3c2dec7476f46bd361ff74f6e9c7ea0ad40306a8a8ae84bfd63fe1c1364302b8aa69943013c951b32c9f24e4782b94ca8d
 DIST PyJWT-2.8.0.tar.gz 78313 BLAKE2B b5031ec0ea672ef2dffc077aba6c781a20a7497257a16241841c0e0158017370581e3c9785d930772290c25fc9029e71a5d8744d999b135b29715a4f35720508 SHA512 74e74cf8c78494a9e51a2a186347361388031d5c0d0864df2a5d051621d9d31dff617ab1d7ebb4a829cc7d409d196e1bdb3b361ec888b6c14f1abea77544475e
-EBUILD pyjwt-2.7.0.ebuild 709 BLAKE2B 17b76d60c992206b367bc592a0fa01fc7142b9681c1c5a6055b7f8e565e1d1114716aca989fba9b319a207971f8bc83ee07e95823e72e3ff377b74bf9f053514 SHA512 656e5f8fc0c5f6f9dd1b5829a5a31928177a3a7c97dd8b5f5ae9c02f9df1ea6bc07543aa3d25a6e253a3390763a693b65b6038a7a3e108ae6715acdaf59621af
-EBUILD pyjwt-2.8.0.ebuild 830 BLAKE2B 5da766d408a3d6bf097fb8aa89a135f570f53fceaa63c0d226612979b2c0525770cde937a9c8d5e7fa089ff346057e231d0a4517a74110a4da088f0e6ed12069 SHA512 85756fcf2dbd5840a5584533be44ecf3ac854d47d1d975dbbf848538dc84e26d2a3002bf0f74790dd31f1772797940c3df107fd72e946a3b6121158b9235bf51
+EBUILD pyjwt-2.8.0.ebuild 824 BLAKE2B 86cf7388f8c55af3d00364b4596e76ae28f65a5d8b353fa3243402cc37db37d4d269fb923630ffb5b664b616583fc371fa52175a5690ae33ff421782d52b4370 SHA512 e90d5bfe7ae0c1376876158db182112716f005930804344033979260c38e7d51f662c293d9e1fa9db2e0325633dccab4d233c4279592f845f1c1db7fb2bac3f2
 MISC metadata.xml 450 BLAKE2B e0a5244140aed7eb1dbc7d1bedf41b64f999ada11a82d5a7c3720501d824c789590e5339d5855fa4d0f96ff1b572e86af41859f8f14105f2f9b1a715d9d71d87 SHA512 83bce7997e724867cf1962ce75d8bb8e7a4e7a8dcdb42b95d9d323ca3a3ea4584020d4b700885e1afcb753d4fcacee23ec7b25066e93c0ac5eb614f65d140f29
diff --git a/dev-python/pyjwt/pyjwt-2.7.0.ebuild b/dev-python/pyjwt/pyjwt-2.7.0.ebuild
deleted file mode 100644
index 13e25fa6279b..000000000000
--- a/dev-python/pyjwt/pyjwt-2.7.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
-PYPI_NO_NORMALIZE=1
-PYPI_PN="PyJWT"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="
-	https://github.com/jpadilla/pyjwt/
-	https://pypi.org/project/PyJWT/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!dev-python/python-jwt
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "cryptography" dev-python/cryptography
-}
diff --git a/dev-python/pyjwt/pyjwt-2.8.0.ebuild b/dev-python/pyjwt/pyjwt-2.8.0.ebuild
index 612aa0783eac..c30f673c63aa 100644
--- a/dev-python/pyjwt/pyjwt-2.8.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 RDEPEND="
 	!dev-python/python-jwt
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 4e3b42947773..3dc52004bf85 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST pymdown-extensions-10.0.1.gh.tar.gz 1063025 BLAKE2B 937273053918cbb8e0245ba38a78a93184a492e21846db60f675d015cc5f942bef5e7085136cc861aa4a6068096e23fdb5f212182d47f245ac6a45127b5ca2a2 SHA512 579aa70c21cffdc7d5ffd927bce071f40bc6ace040cbcb4d15d620a54b97eae2cee7afa049e9005dccc2081dac7db3ff7e2deb2c1c468cf27fe42a306b6e46ab
 DIST pymdown_extensions-10.1.tar.gz 783894 BLAKE2B debe9415329ac5eb663924697529f456fddbc2870188864741003a5f9a3e6c44741188c90db5147d65fe8570f8a2acfc70ef8e12cf7ecfce7f3f051f25ac8c02 SHA512 c7692c7688b7d9764460b274a5cf609c3638a171f8ebb10d265a0e78d1f3b7b418f9712e6d7597e091181caa82e7fca9120e388f2ee80bd9299e9b70492084af
-EBUILD pymdown-extensions-10.0.1.ebuild 1356 BLAKE2B b1d0e8d8ead41706d73a4fc109e13d7db9d340b9ec86aab4ef0dccfc175e52e28f4342684bab5ed757d741150a792eabfa37a64b91d821c4f560289471544330 SHA512 ef09ee6e833d0fa00e402b1f207b1367c42fcdbc6e009c4bb67acad07b990b107782343454420f459c687e2ee1e359d603c7b64848bd76109b86c61910cd867d
-EBUILD pymdown-extensions-10.1.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
+EBUILD pymdown-extensions-10.1.ebuild 640 BLAKE2B 804f63296878b5a901189b5d27919da2994c00f8999fbe2b5515b6a356e629838fce8e03210bc2024dde140641812ce079724376308e91538406c728c3d5341a SHA512 3221a9dfdbf6e6d4ebe23d9132b2f5718a0515cf9d7818fdc42a413f739f1173cb3ae2cb721f427c6d13f7ee0a505e053b4203f044439382b9049c091eb68e8e
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.0.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.0.1.ebuild
deleted file mode 100644
index 06768ca57e30..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/pymdown-extensions/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		${EPYTHON} -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild
index 4ed08497d644..9129aa82ebda 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 630eab36f93b..56971842dceb 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2023.1.1.tar.gz 472723 BLAKE2B 4960db0b9096ef624f0459f6711a6d1fc4561599f96c3b01c5efe3c183c8cc4284b63038b2a5e98d43c194a8e5ce3331886f675c0bc5f44073bc353675400985 SHA512 50c23132028bb2c35816b6c83c054eaf929d333fbb172230e0d696a5e6103ad6ee6ccbbbd0b5d3d2d3c5f02505340a885422097eccecb1bf51845658c7938c8f
 DIST pyopencl-2023.1.tar.gz 472581 BLAKE2B bfa25646b00b8d5c1a2fb7b98c18383e3013b9aa1573dc1bcbc1e056d3bd50d48fb35b7b74c4d87c079fe9334817ff325edd235bdd0de610373850c3ab057773 SHA512 3a6c61715338b31f9e9c3b9c8afe029e63d2689f9d52174c91cfe7383425643b3d08f5c125ab7e24ca776c86ff19d5adb7bfe56f1bd531ba443f99dcf9449244
-EBUILD pyopencl-2023.1.1.ebuild 2016 BLAKE2B c6e80026ca608c628cd52ff2ca042e7503d6dfefc9af9eaba9831eed0e1cba579088a9203a40184b5bfc95a73e87d9d15d545eca64ec7f3af69e3e1efc15e4a7 SHA512 9ae16d857277c60fd7e09fd9c30d0c664f08ed35681719d0e2fcdc8bd51ac8951068fe0999ac7855d755752dace1b0f3cab9924fd0d2d6f99c64315165d4c82e
+EBUILD pyopencl-2023.1.1.ebuild 2101 BLAKE2B 48810d54e5a9e98d969cae84851e595f4ec95de789fe700d5589863b85ff20cfe1bcf3431d84694d34b4db4f7aafc0bd7a23762897f03328ddbf65273610b58a SHA512 f16e9a8e680a365d3f94b4599c4343dd58a6eb320baec2730d64c09231b2474113324268b3e9f546ccdc5ebef5866ea2b671e9c6e7bd649039918962fdabb2e6
 EBUILD pyopencl-2023.1.ebuild 1999 BLAKE2B d64eb47dc442534e666b141e7d02bde62d80ead50d74cbde05dc32b28b143f20e1e6ceab3c199720ae07fa4e26272c034484ee8cd2962ba98dfc9f5db9cf4346 SHA512 d339449a1043befbf8eacbdb9f6874b16be9b54fcc17c0c1070ac4176fccdc04fb488dcef44555031d5aed30179bb3a74684240ec980dc66c67b7b63be1f34ac
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/pyopencl-2023.1.1.ebuild b/dev-python/pyopencl/pyopencl-2023.1.1.ebuild
index 19df443f1f4b..5243792a55d4 100644
--- a/dev-python/pyopencl/pyopencl-2023.1.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2023.1.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+# NOT compatible with python3_11 because it uses the deprecated module "imp"
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 
@@ -17,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index f71d5fb0142a..14b6741f0285 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -2,5 +2,5 @@ DIST pypy3.10-gentoo-patches-7.3.12.tar.xz 3736 BLAKE2B 9283b05e84b385289900a07a
 DIST pypy3.10-gentoo-patches-7.3.12_p1.tar.xz 4844 BLAKE2B 9540d41cbea05ef2239c94088fbd357efccfee2d269385308255c457efb5cb9ca5c3cead53fd08c38238ac66fec9f4bc1ea0507db3e2398de32342d387a3caee SHA512 b6442feab24f0acb903d60edd2a1996e51efbb4ceb5e7f547c3405bbe0c6fb8de6f74556aa5704ae1676b03fdb5ea3d64bb8dc4848d439704e5232366f38428d
 DIST pypy3.10-v7.3.12-src.tar.bz2 23009064 BLAKE2B ad45d90de9ae51803ebcfa202763889f92f7e5c2939331433a496e53ca67dd6eeaf9c61e16cb648945409dff3c6dd6b8a2a01dfe1bed6cd6a9df98f112bff181 SHA512 080520c7de267e17a2823f06cd0a15c108a2c32fc296d6e24782050eb546fa74852d948ede2c381dba110774121b20efc3a07b553acd0ac0db4a844dfc09069e
 EBUILD pypy3_10-7.3.12-r1.ebuild 6027 BLAKE2B 9f9310a65a17ed5cf3cb74c4158ab922a6a3b582b582ccf354f771491ebb28c632cf71744fcc2a783ba153438b11faadf5f48f1fbba44a01d0da433b728491cf SHA512 638cc9f939341d93489fcce30acec54ef8a03b3af0c6418bd6ef353e901270cba10cc9c36268042fb331b8e1dfb94b49e1ef544b5719e954b0146064e1573c86
-EBUILD pypy3_10-7.3.12_p1.ebuild 6029 BLAKE2B 3e45315cb8f22bf5304ee3a75c672a72f85824023ef6c9c7bbd6354ce7484abe142e2cf79a4291876c1e1e20df95d6571021d2655913ff0ffe771ca7d31ce2cf SHA512 416cbc568f2d0d9acdd9efd39843a6e451fdc8a11448b527eb1a6a700a06f745e7815122226fded2ea0837bd988b1c4786ba7bc5ef8a60ec8e01244b14d8ce4e
+EBUILD pypy3_10-7.3.12_p1.ebuild 6028 BLAKE2B 432ebd541f89e11bdc6a3f3305b553478426b8ed63c7ea617074a611fcf9805bbc033b6748ebb6402eb85a5101ea22c8db5b61b7871546eae4663db4ac4fc5ba SHA512 c34126b46f02e91e38802e6a7fa6af82e7f1870a3899f28dccee50f76f851541cad10dd70c6e19a064699cf97133ae02c7a9adfc52f18b81216a9a0b75f695d9
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild
index c3cd1b2bb121..6f7c55894b22 100644
--- a/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild
+++ b/dev-python/pypy3_10/pypy3_10-7.3.12_p1.ebuild
@@ -25,7 +25,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 7b45d43d488f..a991d5a6588d 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-asyncio-0.21.0.tar.gz 29898 BLAKE2B 6455e59a2e28ddbefd54e4c16970d36d22a674406fbc0e352e9886af3a7a51a0ae4a8ce32e01d076e2411f0501548092dfbe3150d87c14cb5e5eb71966bcb743 SHA512 ce557e5f15f3ae745804f4484d590a9f673d76f0c67c2e8ab444e1b17a4ae5ea6021bf55d7ef905643bfbcded6299f207a386fb4dc05ddf20ade25e6618a9773
 DIST pytest-asyncio-0.21.1.tar.gz 30492 BLAKE2B 6a17f9ba89b8181b5fb734af6d0c0904a828156e63df910b4fe4adb9b93e240266063dcca8d97c8f9d784c6d5111796949fe32bb2832921919e41398ccffc155 SHA512 3aef14bade1dddab4320450d60c6909a76c7cf334d8225ad155b474b042d1c692edc5b567fb86ecf6b3453746105c3cecce86d2c6ff5cf6652d5147a8532cfd0
-EBUILD pytest-asyncio-0.21.0.ebuild 1414 BLAKE2B 52ad70e10c5d929dd424d5cf38122e1652704d30061cab0b7af8d85c5581a9847dd89e5b7bbe086739fedf54b0358f81f59b6a5e3a1b7c54e5b965f7de03413a SHA512 537b090ea69731af7cc1f8ae078898ad957f05f5a268b9e85c77c6e0cb2f5521ecb4bf155dc9a4e7a6e5375ca8a9587311578d7334cc0d7ffcdef16666abcd6d
-EBUILD pytest-asyncio-0.21.1.ebuild 1422 BLAKE2B bea4fa88e677d12627e6ad0586212774b71162329c46a6e4d7c71bf988a65dbb786154862bdce830e8f634a0864887870a089bfbe758622e3054c339e322ff20 SHA512 294ac7331ad6ff685dab0531560678b159d8e313069f5ae019bc70da44f47a00e7a3bcaff6b2be05712a52888ed6c76c4eb866dde09cdf2ad5ba4c7bcec8661c
+EBUILD pytest-asyncio-0.21.1.ebuild 1414 BLAKE2B 52ad70e10c5d929dd424d5cf38122e1652704d30061cab0b7af8d85c5581a9847dd89e5b7bbe086739fedf54b0358f81f59b6a5e3a1b7c54e5b965f7de03413a SHA512 537b090ea69731af7cc1f8ae078898ad957f05f5a268b9e85c77c6e0cb2f5521ecb4bf155dc9a4e7a6e5375ca8a9587311578d7334cc0d7ffcdef16666abcd6d
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.21.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.21.0.ebuild
deleted file mode 100644
index 95e4d0ec3e7a..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.21.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/test_pytest_min_version_warning.py
-		tests/modes/test_legacy_mode.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin,flaky.flaky_pytest_plugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild
index 9756a65aac50..95e4d0ec3e7a 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.21.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 2d8ac308e35e..fbc1de6b4fed 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,7 +1,3 @@
-DIST pytest_check-2.1.5.tar.gz 24990 BLAKE2B d7b09fe1f4b2932b4d9cfc12e0cc3a2c8082a97727cc6bec01f0db32b67af5860c8677749bf48068e496896fdf5a6beab57eb1fb39facddfb8defa995ff1ccfd SHA512 b3886f96db1ca20e4d337ea527e38e67faa1d79ace3c2cde2760ff66bc7fb5a77eeca2d3833a0abcf16e6f1f6922a82a8fddf7949ddf78e5238c9018761f2829
-DIST pytest_check-2.2.0.tar.gz 26282 BLAKE2B b6017053133e65b6e13576b06ee7b1905921f807a0b8fe5a58bd19296b6fa5ad936b533124594544ff0f81d585c7012693e2c71a6d157a5160ae8545bb24e27b SHA512 004f96895f69ed905f123c5c213aef4d40f0f31ec369e9280af4e1c8dbd2f29a4a8c5d9f564756a2dd476c57530daf4914b3bd8d0328266c4117ef5245be97f2
 DIST pytest_check-2.2.1.tar.gz 29128 BLAKE2B 758d2f04a5a500367ecca9a95afe21c03e7a52f319403d4bc0af14d27b96b335e5db42ee312217b0788eceab25048266ac135cfeb7d8214908ed5c13ded33b33 SHA512 04843219a1d49385ccac9b60707a6dd595258664b61a0bf31e666502a222d16b7130c8c0ae65ebd6431d58e2e08d90db3ad016dc4591dab7e3c3502296ceff44
-EBUILD pytest-check-2.1.5.ebuild 599 BLAKE2B 67cfe8c00b830c12ceb844d8d55925a001a1d748f9ba82967796507c0e91e78aa6d384411abe819920b6cd081b4726eed4e858fc2aae8ce42c1e7f6cfd53b301 SHA512 2b4ba1c718e43b73a29229540bc7976ecf74760372aac9465331f52aba0f8ad8583955581c1423009ed2c0782914078cfa4568f54ea66c6e629e69373a6450b6
-EBUILD pytest-check-2.2.0.ebuild 606 BLAKE2B a2d4a2892f9cf858ccac8137c057012119ae49aed1860a24ff8531f30556d2a11eed387f92ed2f1e4e93073d47ce07252ecb1d75c93de8b9d48d319857939d27 SHA512 116297080bf34962d3f51cd64476aa779fec7484447655fe787aac4f6a710cdcfdb565ba27fef2e53d7307fc039df4e94176ddcee90399787ed18d5a719e7459
-EBUILD pytest-check-2.2.1.ebuild 606 BLAKE2B a2d4a2892f9cf858ccac8137c057012119ae49aed1860a24ff8531f30556d2a11eed387f92ed2f1e4e93073d47ce07252ecb1d75c93de8b9d48d319857939d27 SHA512 116297080bf34962d3f51cd64476aa779fec7484447655fe787aac4f6a710cdcfdb565ba27fef2e53d7307fc039df4e94176ddcee90399787ed18d5a719e7459
+EBUILD pytest-check-2.2.1.ebuild 599 BLAKE2B 67cfe8c00b830c12ceb844d8d55925a001a1d748f9ba82967796507c0e91e78aa6d384411abe819920b6cd081b4726eed4e858fc2aae8ce42c1e7f6cfd53b301 SHA512 2b4ba1c718e43b73a29229540bc7976ecf74760372aac9465331f52aba0f8ad8583955581c1423009ed2c0782914078cfa4568f54ea66c6e629e69373a6450b6
 MISC metadata.xml 509 BLAKE2B 85ec27b195520ffaf65e8f9a0fe166f0ba07aa22bb8981d558f96d2d89cb00441478eacc47a482bf2243d26b015ff42a1058c2e90a58d7cfbb20bc521b5722f5 SHA512 8d9082c66dde73cd751e3b42fc08ddd3c1815f6a7882d1b659972e5fff64506de79265df97161d63f05e3106c818b0155c2c3e21c861a44d330ff57506bd64a3
diff --git a/dev-python/pytest-check/pytest-check-2.1.5.ebuild b/dev-python/pytest-check/pytest-check-2.1.5.ebuild
deleted file mode 100644
index 5a6eb521467d..000000000000
--- a/dev-python/pytest-check/pytest-check-2.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-2.2.0.ebuild b/dev-python/pytest-check/pytest-check-2.2.0.ebuild
deleted file mode 100644
index 2b390b088d17..000000000000
--- a/dev-python/pytest-check/pytest-check-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-2.2.1.ebuild b/dev-python/pytest-check/pytest-check-2.2.1.ebuild
index 2b390b088d17..5a6eb521467d 100644
--- a/dev-python/pytest-check/pytest-check-2.2.1.ebuild
+++ b/dev-python/pytest-check/pytest-check-2.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 46e7c1e29c8e..804d28ecaca2 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-localserver-0.7.1.tar.gz 185617 BLAKE2B 2ef2bb38c03c3ad05f9ef038f03e071e4d18bf256d76357c1a980f917228392a863bef088f46bd43acae23457a5141048f93d607d1b3e6757f238ce27b9e9584 SHA512 fd32ea020152a17fb1dcfe3f5cccd5c2a26eed18b711f51c5c7cb8534862706e6738651c275e88f3cbad54ecdb59e4b5588e67eed0ff3bbf20c3636e97990ed6
 DIST pytest-localserver-0.8.0.tar.gz 28368 BLAKE2B 87e5491f442c7bfbbdd219f9f559b775dca5272dc9f92c2f8155eaa192b3192331d4c0d08877cc149624173bb1b249fd9271fe193b1ba2ba28dcab7eda8eb99c SHA512 d4e34d8bde3470dbdd7cc3e40f2b88c4d21095c2c43a4bf7452934bc0afa273946282b732924b2fed34b3a9f25ecb170a28c771cbae4d44a0f707090fb7502f1
-EBUILD pytest-localserver-0.7.1.ebuild 907 BLAKE2B bd57591d752b422e53e7a6f21a3b59f669d694b9e7b143320e8a37a383d10e091272c767a58f061b93676b93eeac83cad03a3ab10f290b76c2a306bbaf19f1bb SHA512 fa976f0d53c98a1639d6c9429139d09f29e47d1e1e9bb8f57e6a9fbaf5ad9dc7b69ea569ff71a04699530418788cc09dea7791c2e3bbd5e917046253483d53f3
-EBUILD pytest-localserver-0.8.0.ebuild 969 BLAKE2B 9fc2bb0f19ecf8d64ab1dd7d00cc05a7dbbb3aae58de0a6e496e722871ef04f0d8a3e38b8dfa1abebe3c44c9b133ad52918798197e40bbd95b50ff9178d6f5d7 SHA512 34f7ccc55ff4ba85e3ffb577b6aea5c7a6b16e2bd1ba3886bdea479fdd3984705861a5ab5002e55f94a3892c89bff5723b2d473c5a55f17e40db4aa0cf124b3e
+EBUILD pytest-localserver-0.8.0.ebuild 961 BLAKE2B 2452467d25a95f69775f6b238b3118bcf49f77a9d6bcaf54a7f36468e221398e44e68955f347b106ec23522d72b594a7480540b25a1d1a634ffdf2d690d98e82 SHA512 fb24edaaedfee3a08560f9e186aa87f8246a76303754fa0e639b7696df4618c0aa204bffa03c9f20f9ea059946928513741004e5f8a8cf66cff8f4191caff548
 MISC metadata.xml 415 BLAKE2B e9793de9ce60bde1549abb0983ca145f55261653324785d735c91785a20b61d949c228528faa742d669d52c1f456a36c65a93c1e9a692ec9297d4ffcfc0123fe SHA512 e0e7819a4b1bd41301824727b2204092986ba4d0c56fe1530b40543fcf7b90541933a7b8094f24a0573854b76b9ce11b7b42d2e38d135f61fed9b498f05f98e1
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.7.1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.7.1.ebuild
deleted file mode 100644
index 776adf1d0322..000000000000
--- a/dev-python/pytest-localserver/pytest-localserver-0.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin to test server connections locally"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires aiosmtpd that is dead and broken beyond repair
-	tests/test_smtp.py
-)
-
-src_prepare() {
-	# remove aiosmtpd dep
-	sed -e '/aiosmtpd/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.8.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.8.0.ebuild
index f7374f4e1937..75bffcbd8b00 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.8.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 6cadf231758f..2a3adfb4deb9 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,5 +1,5 @@
 DIST python3-lxc-3.0.4.tar.gz 27278 BLAKE2B f549ffb94c2bc331e0628a344432d4699aed64de466b0d1e9e4338cee8252ca9f5defeb2c940bd29723e20aede23d8a33bd1bdfe57874069e8cc5a61bfe9bf4a SHA512 37660fe97a2171cc3346c31e736ead8a38e328bfcbea621d6b563042fcd1e70c48b97440f6263fb0f6f02a4f1704af2241661bc526921c124a6456c06a497828
 DIST python3-lxc-3.0.4.tar.gz.asc 833 BLAKE2B ed44e595fc7ac3d7c4d64f8a84e78cfe48428299015d7c7c8504301d98511b644ede378feb8e1947e4007f43e97ed4e9aa35b1d1456ae108818b3696e1bdb44a SHA512 5c1faf28545ce26047cf3bd81f90aca48046f63c5d5dd0c18b9a2575cc0735f8a45dea6a78bf4674b9092b82012b26080db727f7afaf1c856edc7ef4dfe5486d
-EBUILD python3-lxc-3.0.4-r1.ebuild 741 BLAKE2B 721cda68b90b31980ee397b5d7527ba948775012db4dea068c746ebd1e9a57280bc00a3c2650c5d025bc2c0da83dd4016ce9392da67f05df2b9d308acb4c6c47 SHA512 ba07c69e803814428af45f155452b4122e6b029ea9173862348348269bdba9435e71bc0569b0f41ee6dbf46d49eb25a4c0de1fd703ee3cc744da3fab0e0660d6
+EBUILD python3-lxc-3.0.4-r1.ebuild 740 BLAKE2B 77fec46468d1fe9e31a0930364db2e882da22464f8cc2134c02716864c5f0d38f67b092c51da6e07926d3867a9968e707e55cda30607b10029c2f24d950d6703 SHA512 a392d5704bb310d0e26ec15095ad26a79ea436d7b8200fff3156543c7eb91a7ea04f71b134c70144a6110764d110d41e682cb8c031ca8eabf5415f30ffc2a651
 EBUILD python3-lxc-3.0.4.ebuild 691 BLAKE2B c3439f6e982cef5eeeecddc80d3e1598b19699081ea7a27116bc0b0cc200763235166a2b28984de7259505728cef2dd04432bfd2abf8870d7f50249a06b0efce SHA512 5612f932db7663f42df2d302b0595f8efd9af1452cf675de58d495dffb9aceb197e9e0985052a0b3fb3a5466507149910da9dc3baf03f786533726ee5931431c
 MISC metadata.xml 362 BLAKE2B e4403cca17caa67b766cecd1a719247e8d9400c20320a8d79c69b90cb1afaa3bdd1f45bd1a20368db277248ac7c4f8f25924b1238169f57ab8db3fad8c8837a9 SHA512 3d9a140ac99917956e9863edf4ff549666b279e8f523736f3e00361b995eaf849f2f810075e3ce11a591ac45c2f98d6425f8a5e8bbb4f1ef521bbfab360442b4
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.4-r1.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.4-r1.ebuild
index acc9c25848b0..01643339bae9 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.4-r1.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="verify-sig"
 
 RDEPEND="app-containers/lxc"
diff --git a/dev-python/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index 8a34fe4e9780..263a36dcc0b1 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,5 +1,3 @@
-DIST python3-xapp-2.4.0.tar.gz 20787 BLAKE2B e225ad100119f90813b0f7657832bb186675542b3476beec639ff4e0771f4c00629c5d297a2ca0392fbd630066ba0a95a6f8553bd01a9f2df18752536a513127 SHA512 7c9afabbc810ffe878e831f7e1ff585ce49abc6d1db3d4ea70deb6630e2bb18f61ded31ae0e075cccae2283cac50b3440204a586f844ba9ee9cfbcb572bf7573
 DIST python3-xapp-2.4.1.tar.gz 21181 BLAKE2B 460aba09d147d64c8102f66d059c6ab1f7c39893ce98844e59ab5954b690d81ab4b253cb6a17f9b3c781dfb5e965d1a4de859aaeff5ef65ab3f67a86a4c6e6c2 SHA512 97045061aa5965adcfe7301774dbd35a226fa9b846e31a7c097229cc417ff4008e518ebd5b600d4ce6a46daa39d51de70d391b6b0a7c78490419d3a96daca6a9
-EBUILD python3-xapp-2.4.0-r1.ebuild 1161 BLAKE2B b281cab1718a499338faeca5aaafdc51d1d9f8b2f56977066650f2bb5e4926f9d3378763c6ece0dae1b3ca757c80429445183c0a891e7d555cea1571768c34c5 SHA512 a4e0c0166fb0b2158d72863d54e50a5fcc2b4f9c798c174bf15e7b47eafcfd16a285d96a72dc7254129dc8897d34c0610fe8ec156d5febdcb280804f8ab6955a
-EBUILD python3-xapp-2.4.1.ebuild 1163 BLAKE2B 77e26b26fe1a33d8a224b4bb6cacc547c1db58f040661a81edc55122fa9cf5c7bc9288fe46e8536599ba1169e1b21c78547e7bf20da723414f5dd54454f45453 SHA512 c2a1a418de704d0ed53beae2e34dc87b4a83f70351fad5bab00f39f9a0b96c7985da5622a2f1a94ac5569f8fcab10a6096e8f57a9d947d627e20187ffcf53b7e
+EBUILD python3-xapp-2.4.1.ebuild 1161 BLAKE2B b281cab1718a499338faeca5aaafdc51d1d9f8b2f56977066650f2bb5e4926f9d3378763c6ece0dae1b3ca757c80429445183c0a891e7d555cea1571768c34c5 SHA512 a4e0c0166fb0b2158d72863d54e50a5fcc2b4f9c798c174bf15e7b47eafcfd16a285d96a72dc7254129dc8897d34c0610fe8ec156d5febdcb280804f8ab6955a
 MISC metadata.xml 516 BLAKE2B e9429fe1f541d1763f644fb18fbef2bef3e105e943a7099792951a63a38c0083ae35e64160233ab48a8556d5bba96ad9031dc09fcdcf24033494d222e25a9cfa SHA512 b23a2d82ecbdb03abce2b3c40579c6aec5caad09b556c513600ded65d21ab56949ffe1eae0b04238f79c9e3c5c95a66a263e23281fcc2d16978c6a787e53c813
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
deleted file mode 100644
index da9d4da44d27..000000000000
--- a/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapp"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	>=x11-libs/xapp-2.4.1[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	echo "option('python', type: 'string', value: 'python3')" >> meson_options.txt || die
-	sed -i "s/find_installation('python3')/find_installation(get_option('python'))/" meson.build || die
-	default
-}
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			-Dpython="${EPYTHON}"
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-}
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.1.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.1.ebuild
index 6fd591cd4289..da9d4da44d27 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.1.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index e551e42c1791..6e35f9c94dca 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,5 +1,5 @@
 DIST pytools-2023.1.1.tar.gz 75472 BLAKE2B a7d83dc55175d17fe7ded758279d236a9cd8f103fe7c9da2994a04dddd8799817509fbdd38466468ce4de2e5cd2984f4906f6f5524462cd72760ad32c6ebfab9 SHA512 0b8d4ec7145a42d9a679b7e08a05aa126c7d4514faa77e207fb154c84e56233b80dd49f388f261ba29e70e2cff836f6c850ea05af81360da8120756a0db35e6a
 DIST pytools-2023.1.tar.gz 75361 BLAKE2B 79c3439587624e9d236e6afd8ab2effa66ebc18c5f297db6bfebaf40dbe139de4851fa29d7741b064260041491a6693201583186a361994a8997eaaa221fffb2 SHA512 1d035f8b5e155def84d084926ab43b7e4c634cf7b2cd3e3914513360570bf87da059c8109e0257797dbe84c4bc36af559c805b252c863f2145113ff681eb5974
-EBUILD pytools-2023.1.1.ebuild 827 BLAKE2B 7faba0a5d63e195f3fcf134a93c8dde721b86f230e33ce3b2530d743893232405d5ac8eddc20575a2d0b476e279cd01b5822aec15c89fbab4f705d0d31810519 SHA512 7bfb1fe916643346797bb42fd44ce305103846799b19da8da7270ef547b6e27e81eb977be29dfba54337c730a93368864e82f46c737148267d356134bb0e7e52
+EBUILD pytools-2023.1.1.ebuild 826 BLAKE2B a1c0b60ac6badb23dd2cb3a7fd8cc407081e1193d79d783b14ad11a461898fa7a4374188499f98ae074596ecf7c5aa91d2f9b370e02d4cc3a54e2b7773a58423 SHA512 407d7e79843566c0c4f78135d98252ec38371a8875a8a9bd7a562769382dae5e6f5c13e49e6e331178c600852b60dba0f82905a26f35d3ca926630b105119e04
 EBUILD pytools-2023.1.ebuild 826 BLAKE2B 54ed6b7f6bba6c8fab398e74238ba07c572679dff47ccb6e83d40e9b13880c91a76e007e1e7a4a661482b5ca2f6d460963c2002052412edf2cf96f92200e34bd SHA512 e4e9d174268fcab2e7a585881a67bf3015efd70c310aae1894053b3447a73eb3f9e0edd653e0fa86034ff8e879796acfe1fcb16978288189fbe49b1134ef4af2
 MISC metadata.xml 496 BLAKE2B d0067ed5726907ed3d635fc88dc33722335e7c853ee4a5a1c727faecdf6a78ab7de4261fe40c5c903908e1f2b8eb597ff3c014044fc7ea02bc357254d544da64 SHA512 c6b546564e9c54bccc55f83310ff194192be0673bfe552e18e29a82e87d2caf4c0d51e42d1675cf5b8f6dff1fa1410676f71c9c0c56273ba6efc4efc608c43d9
diff --git a/dev-python/pytools/pytools-2023.1.1.ebuild b/dev-python/pytools/pytools-2023.1.1.ebuild
index a0307d3d551f..c12818d0d28a 100644
--- a/dev-python/pytools/pytools-2023.1.1.ebuild
+++ b/dev-python/pytools/pytools-2023.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1 pypi
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
 
 # NB: numpy is now an "extra" (optional) dep -- we can remove it from
 # RDEPEND If revdeps don't need it
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
+	' 3.10)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index d821439ae207..27ab0355fdc1 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -2,6 +2,6 @@ AUX pyyaml-6.0.1-cython3.patch 1423 BLAKE2B ff93a6bc36d0ca7b85a3c3c5cf67c57c6003
 DIST pyyaml-6.0.1.gh.tar.gz 120376 BLAKE2B c34f2169f6eb6aa718aeb53dbfaf02590e11e504d16cc85a802e1a1191f296ef9aa2501db683e1a48173ce6adeaeca09f2ab989581dcf1c1ba4004831bb4cf47 SHA512 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
 EBUILD pyyaml-6.0-r1.ebuild 1001 BLAKE2B 5426c1d8eb6e6c3f4a38552cde9b95ba28117754533b2663547ad354c6f34399a6f5181ad2aa19f584d1c964183f905faea2e3530b816a898718f931dd4f25fa SHA512 a287ad775eaadbf63851437e001cc018f4eba7f265e4bc73b4de6d18fa2882a162b9b95d0a46693bb9f7130a00b92beada115eb784ad37a2b25b8cb231b979f2
-EBUILD pyyaml-6.0.1-r1.ebuild 1060 BLAKE2B c9130b65d26c69016a1660886d5a25eba9514dfcbd8ef86de32bb7c3101ea5b80b6760fcb1acf2b16ca7ffbfb028b47879d6adea6471fd5ece306c6136d8756d SHA512 c9679267fda9764197164033ace8e07888433b7e7241c51e8b5909c5a22b48dad9c14eb368138b2b9b79ea39aa87dc70026a4d992e1ec061c1a02a4dd7691998
+EBUILD pyyaml-6.0.1-r1.ebuild 1055 BLAKE2B 4c034fe81b18de47d6a97e7dd2957657d4be835b3a0f231d7267cdb489996f99547b436e1f88ac7a6accc4219f1e5e5a15d044c843df918bf1cdfa3cd2e64ec6 SHA512 b5cf85abca47ac349eb278f2b52f6319ef758e5cb7f522c8e37804abd2f303bea0301ed345f96f363643068ff3f5cd6789884b7794a9db4ced4ca714f2443e6e
 EBUILD pyyaml-6.0.1.ebuild 1009 BLAKE2B f50ab419ecd6f7a493746deac68d0c304f1d95b12553f31595ab502b38b253d1696cdc03bb664f6798908f4774919c88978c3d4a1b41824827918d261736a671 SHA512 bb448d24da014321751473dc002829c009f2bd87e83db7c7b96b2a04ca058eaf05790a85f892f08e7472d7674c5dd0e699bf5e7657b296a0b784e087b5e54dfb
 MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d
diff --git a/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild
index f1368e3c763c..2f042c91d858 100644
--- a/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/reedsolo/Manifest b/dev-python/reedsolo/Manifest
index c48109cfcf5e..5b6fd51471a8 100644
--- a/dev-python/reedsolo/Manifest
+++ b/dev-python/reedsolo/Manifest
@@ -1,5 +1,5 @@
 DIST reedsolo-2.1.0b1.tar.gz 379041 BLAKE2B 860d5d67fb7653b92a8163b72143ff3a5b1a482359339a596acd5e7f99eda1a2d6d208548e6689dca63018f5893d536a0c7040956cfee6077d9016fe7ca1d485 SHA512 1ae25c53f315cedcaaa4530388557c3dba1902856fe1543a061a65dc3c5c4201c1d8a5959786c3bf15a0f9799f984c8ba84e630ad1e75efbe44260346a650251
 DIST reedsolo-2.1.1b1.tar.gz 380948 BLAKE2B 342c2ce63490a8e699dfb584a01b1533bd742693d335c2216426bf3f1b8d82e4dc52a7d9d9dda58fcdc73a7a28687f08235b67b942e1d98e2e0e069eda824d90 SHA512 841766296db6cad2f5d71c9378830d95ec974ae5e7de4624772c92a08739fa9bb94dfc8762c45e2508c53cb603b2a13e0ce64b060021d93c10de94cb2a325aa5
 EBUILD reedsolo-2.1.0_beta1.ebuild 771 BLAKE2B f9e0bb3e215b69846938b4dac8a30c0c4244c38727ca0074c2b77a28432802ab7aa82329f1ddf917bed6b76837c11fb1d7b29219b9f3f378b883afdb8f217f67 SHA512 8ca08fbe7f7dbe4654eaa65301fabd6d452cbc050831ef053dcb7a51754e0d796ff077641a99a6f8c8dcba994e6b5fdb16349e9adb10c7e20f8eec48e61ccf96
-EBUILD reedsolo-2.1.1_beta1.ebuild 757 BLAKE2B ed4a2af0dd9d0069ba9ac4dcc31d398ee82756fcfb7364410db0b7f481e8c1d14da14a8ee6ac326447606317014c69b179efd8c1c125c8124a9aa10f0e57666a SHA512 7c1804774b632e5cb2e0673f18ce386ffeafa3fd3562a61cc4c0db42ee4b6e344d9942d4c305eaad2670996c1f8622cbf33295f9f106418c375755f6821703d1
+EBUILD reedsolo-2.1.1_beta1.ebuild 756 BLAKE2B 70e37690916460f8fc4ccc8a4328888d0c5a7be7f3d452a7d70fce4037ed0b28401afbbcde2483465c3736deca21c8129858a611b4f182254a34b40b0658c7e8 SHA512 6ed72ce04bffeec8b2c45b0ba527b483bddf3851f5cd29035ee2e7edaf5086cc29ce96ff1c07f09ebe03305c2de94707eb5e5978d1cbb37c52162d5bcdbfed3c
 MISC metadata.xml 721 BLAKE2B 3b6eabc895ec14507ea5d7d8e7fd8f90375326fb3a94b5a2c4ed2aa19024d4e582cbe6397687ab3ea3034fcbddce37edbebdbe7b0f332636f7b912e8aa4c4bbd SHA512 aebefdd8281ad96534dfe13cd8f4cbb4bb4ec1f4e4520f48d7858907c02ffa06a91e4718082394c50267b7fac11770936a134ffcc6ecc81a611609b39501fae1
diff --git a/dev-python/reedsolo/reedsolo-2.1.1_beta1.ebuild b/dev-python/reedsolo/reedsolo-2.1.1_beta1.ebuild
index 74c17b4bfdc7..38280cf05963 100644
--- a/dev-python/reedsolo/reedsolo-2.1.1_beta1.ebuild
+++ b/dev-python/reedsolo/reedsolo-2.1.1_beta1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Unlicense MIT-0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index ae39fdd0a3cb..73f60f04ba1d 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,10 +1,6 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-67.8.0.tar.gz 2492475 BLAKE2B 37c34605a58b41e14300e389402fe6debf9eeed20c72ddf53fa798b41484d1522d2b5313c74eb69a687eaf32c225f0931f901f452aebf6f7023b2419d127b808 SHA512 5dda7082fc563ce73d810efc9cdbccb8649fef2eac52f1a902c76ab5ec67a87ff64e36e918d0e3b168f5214d787bdc22e8ef9adeccb77d8d368dcbb48f5fb35d
 DIST setuptools-68.0.0.tar.gz 2194111 BLAKE2B 614a1c69f640ce8d0e510c444e058fecd3810421983a03cd345e43e1148799bed7e5d53ac689a4fe3ce3174d16f2bb719236bd5442b5f06ffc7659d0f4c7d15f SHA512 da6d535a0db6eaf477c8c2148efbc2100fd88a14f3adad44d20e22bf52bee3f00fe86547ea650fe653519bd6ff5f9ef033a55bb3a05fed041e88e78cdfb81d7e
-DIST setuptools-68.1.0.tar.gz 2197742 BLAKE2B 51bb614aac55dd593f49a5b34e6f31d79deea2b379c6c762e35e650e508d69119ce1e7d2ea3bfe501f41780511454e12a3a60d8fa4759a4e17cf4f2925c57d74 SHA512 827e1ed6724f1b6149515ec15528d29648041a9bb674957e2463b2424222378aeff185005c1277ff8fb4b44b5752276d99c1d9aa6d8a152ab80b2d7b1d5b5cc3
 DIST setuptools-68.1.2.tar.gz 2198001 BLAKE2B bd21de32246eb7bd17289536a65e87636c39d8d7712dffa61b07b052fa7e9020fc06fe2de294a4e4782738c4385ff31e6552a6d3f403c3b1da98ea07405d57e8 SHA512 a5a84102ce72f38162b190b91286013cb8660b45f383df04fba65e38c658a5c5b93cdf05f789436618fa596b3ca6688a7c54d31d6d10b729124d3b135660c328
-EBUILD setuptools-67.8.0-r1.ebuild 4381 BLAKE2B 38554c1cfd9f787914b97b05c4386a7ba35b5b9c73e89ec4432e917bf6a53a8cf364bd7212827c52b912f8d5cbcd30d4fdc76fe5c08a8b3908ac6000a7b8134f SHA512 2e5f024be887565df7a0a3cf5804c8ecce6cba96302ee8423afd69e4dfab801647aa4a4fdf349d9a078dcb5bae72e2882187113bce2f3a47242cbb9500444f11
-EBUILD setuptools-68.0.0-r1.ebuild 4333 BLAKE2B de58967946b1d9dc905adc0ade0174401c33887e8a9d9a1a58758b66fb4ec8f67df9a78e7b55f763c06c827930efdcbc2c02fd9e6752b60517300c92d22f8684 SHA512 3afe0c458f48d3fc6c1f47ac6c3d1572c5f3b7f9200960631b4a72b82fbf51de805fd11ddbbd0038165e3ede33b95d011b01ff6afe1cef661d85d8d8d3e69619
-EBUILD setuptools-68.1.0.ebuild 4412 BLAKE2B 4c91d5971e3e5e40ccd2dd4436a2d6cc87fcedd840e9bba9637d59d3b33a0b95b3ee55949760e4b715fff8a233aefcbfea7665aca808e15fc0687e9a75a66fee SHA512 d46bda6128e9441658710a0cefd00fe6c433026e6e172573ccee2a0eba3e9cfc68be4db4f2ab62504e18a9bc3ce1285aee856683ba035ea52387119a2d19a4f2
+EBUILD setuptools-68.0.0-r1.ebuild 4325 BLAKE2B 07f42a47d632ae96d454e8b76758d9e17d11e3dc61040d1167b623e8ec67b533b1264b1d1519a7d302e799f98ced90844670a1082c1bf360fc2159204bf1c99d SHA512 a18d93000cc65606c33047cf8931dc8a852b6aa8b026f289e496398ed778074276fc32add0a753499ed0297bf25d9acf98af9f6a3d9319cfe700a1f085059dda
 EBUILD setuptools-68.1.2.ebuild 4412 BLAKE2B 4c91d5971e3e5e40ccd2dd4436a2d6cc87fcedd840e9bba9637d59d3b33a0b95b3ee55949760e4b715fff8a233aefcbfea7665aca808e15fc0687e9a75a66fee SHA512 d46bda6128e9441658710a0cefd00fe6c433026e6e172573ccee2a0eba3e9cfc68be4db4f2ab62504e18a9bc3ce1285aee856683ba035ea52387119a2d19a4f2
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-67.8.0-r1.ebuild b/dev-python/setuptools/setuptools-67.8.0-r1.ebuild
deleted file mode 100644
index 6241349f1efe..000000000000
--- a/dev-python/setuptools/setuptools-67.8.0-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{10..12} 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}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	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}]
-		' "${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() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# fails with importlib-metadata-6.6.0
-		setuptools/tests/test_egg_info.py::TestWriteEntries::test_invalid_entry_point
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-68.0.0-r1.ebuild b/dev-python/setuptools/setuptools-68.0.0-r1.ebuild
index 2f07f855a1df..6490d47fbadd 100644
--- a/dev-python/setuptools/setuptools-68.0.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-68.0.0-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 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"
+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 )"
 
diff --git a/dev-python/setuptools/setuptools-68.1.0.ebuild b/dev-python/setuptools/setuptools-68.1.0.ebuild
deleted file mode 100644
index 472b35c2a51b..000000000000
--- a/dev-python/setuptools/setuptools-68.1.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{10..12} 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}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	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}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-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
-	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() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# fails with importlib-metadata-6.6.0
-		setuptools/tests/test_egg_info.py::TestWriteEntries::test_invalid_entry_point
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index f497078adfc1..c9305d08f2a2 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,4 +1,3 @@
 DIST sphinx-tabs-3.4.1.gh.tar.gz 524071 BLAKE2B 5aecb9c22a298c1347bf82cbbc16709f3f6cd38b0f0f6e4948411f1fdd79ba17d3e75178b8c092df7b8abc812dd4b0102879774708552a062aad0fe0b0653717 SHA512 b6079d3ae91479d40aaf35926226eb7dd783de7cec0e721cb13a036fc520bb3afda0dffb0669dc5054fc665125c3620261b1ea7ffe685d5b177bc980e3b4d7e4
-EBUILD sphinx-tabs-3.4.1-r1.ebuild 1162 BLAKE2B ea9354de52dc5777625e55d3cdcb062fd3ce8e1450faf12e6fcd9f1b8e581559df713e46aaafa7f5aab730172cf1ad24617469517e053e38fe8a5290efd363f7 SHA512 c96d6519db7b917fdcffa1769ff45898df36ae483a2374d08c637914512274ce63e666b761aeef4864a70afaa707caecc9aba3a5299be89a470a8af87e4613f8
-EBUILD sphinx-tabs-3.4.1.ebuild 1327 BLAKE2B 04c1bbc5e14da69d5ca528273f886709218ee41e86f49e437b1aeb394be9d561898226e4b8f0327dbbf1968bc9f9c28ae3db7ff7874aad974a64ac44e86d7e1f SHA512 9b9d00f17965aa26817845a5534c80b161e316a14231d81fe1940efd675c7cfede80573dd48cc6f874f94b71511533984a8e451944ef512ae4dd3290bb144143
+EBUILD sphinx-tabs-3.4.1-r1.ebuild 1154 BLAKE2B 625a16eefdee3171715602ec94bbcb4a2b9b8233ad5026a4156a71b2186bb9ccdd8c1c9dc1fd1b54a8aca48acc4ba47d92f4283b7b48da5fd08966a116fa9c0b SHA512 e3f85cffed8ad0416dc6c2136b2c1cbbc413d7ad5e8514531a00e9097c1b3b122ea242f4dcc9261c56ee81440d4c6789d80da574f203feb87ffac9f00d25acd8
 MISC metadata.xml 384 BLAKE2B 30013053128e39ca868d7643acbb5da9b87ba83f5fb6657a57dcee48d7322d72d7e7dd5e0d9e27a6b352c968a83f8e71b1c9ca56229fa5fe1eae0641d523a4e6 SHA512 0889534d054123371736de66f805503feab4737fc8b5cf7aa65bbd6f68528f4e871f7c540709b8c34b2d011bd89d889bb94c275e0900f9b3f3701e1628d7a9ee
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild
index 6980b27acb71..27ddebbe3002 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
deleted file mode 100644
index 4f15e269f996..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/sphinx-tabs/
-	https://pypi.org/project/sphinx-tabs/
-"
-SRC_URI="
-	https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
-
-src_prepare() {
-	# annoying, incorrect version limitations
-	sed -i -e '/install_requires/d' setup.py || die
-
-	# fix tests for >=sphinx-5
-	sed -e 's/\(Permalink to this\) heading/\1 headline/g' \
-		-i tests/test_build/test_*.html || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 3b27c41d9b77..924d7c6f6bf2 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,6 +4,6 @@ DIST SQLAlchemy-2.0.19.tar.gz 9425046 BLAKE2B 258e273a1c9ec5584293d08b0cc9de8ab4
 DIST SQLAlchemy-2.0.20.tar.gz 9437690 BLAKE2B d0be093ec796f42868352339f70e64a1a0fbd4e96315ab91b370df79882138763228bc365dceaec736f7dce1d7c6991c7d20ca7dbccb766aec78b7039004dad2 SHA512 3bc463465248f28948a1004a3c18a5dbc02af81b18b4f89155aca6a03ab582010318c3d177c3b5c4caabd49945b426d7e0f23c482aefc75eb1a7252b57241e53
 EBUILD sqlalchemy-1.4.49.ebuild 2974 BLAKE2B 0b594ab300e7e36c5ea266ade8b07557dba21b93b3ab53a33466f37ee5c6edf44cb173cad10d55763ff8e70440c9468fef545f425c4855cdabafa9e33b88defc SHA512 0f8a171ebfd9f96aa70f9bfa20ad1d11d8583483231c256eb4a6ed12116b21063092132e283192707ef92c8cc3d9f915fb83336bbc026ebdcabde2b15aaca989
 EBUILD sqlalchemy-2.0.18.ebuild 4463 BLAKE2B 58a74e191ce542ad67da5bbc514e9f34b4e339d30afe7d7e0d5708d6f58c31d1e795efc4bfa15899ab357b279a5b4a9dee4900c2403569ba971d96e23ea45b11 SHA512 b6d59edb0750d8135d03ae021259b7d56d33b842ea21cebb5499fa5c2bc05c93a8e68658d3303344c03f02727553357c8a6524df2507355564f328520421258d
-EBUILD sqlalchemy-2.0.19.ebuild 4471 BLAKE2B 30d01e5971b8ee0e83084b366fa08c2fbc080025029d152143270a22f2fb3409208f7a965937804b46af26fa1e1c63c1ebff044d705e5a3fcad521e1f2160eb5 SHA512 bdf76ada3724603af7e8adbcd7909a544f0d3d45cf0ab0d86fe24eb4fd3d8372515f892d609786f8ecc99f605bc2e3d09c5ad7ed979f359dd0449c54f5678aff
+EBUILD sqlalchemy-2.0.19.ebuild 4466 BLAKE2B 8e94d1a165ed4d8896cf54e7e045d03c2eadb4daad88718d257efda3dc2cc4bbb6ceb197d4ff7713cbc5da9afbd493a7797ef83cac399e37cefbb442aeb8ed00 SHA512 2b0d163d30a12f39d0790b2b6946ce66eda9dc841835806d82e341120ed163ff748f339bb7fdbc966a23b3e3bcc1662faff624c0248c4f58a9ebc8d9ebf758d6
 EBUILD sqlalchemy-2.0.20.ebuild 4471 BLAKE2B 30d01e5971b8ee0e83084b366fa08c2fbc080025029d152143270a22f2fb3409208f7a965937804b46af26fa1e1c63c1ebff044d705e5a3fcad521e1f2160eb5 SHA512 bdf76ada3724603af7e8adbcd7909a544f0d3d45cf0ab0d86fe24eb4fd3d8372515f892d609786f8ecc99f605bc2e3d09c5ad7ed979f359dd0449c54f5678aff
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
index 5ff64f43c21b..c3219bd27b3f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index cf3bce807b8e..7453824e266b 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,5 +1,3 @@
-DIST starlette-0.28.0.gh.tar.gz 2843094 BLAKE2B a3cb35cf465b4540457cffafe4a3bb32081f542b8a5c730bc7fcc0bbf9f7a6c2c21bcc4297c8f3c5281f6ca787aa03c3ee4f90032155d1aa1887440dc289e5c1 SHA512 344c0581e6d6e64abd51347757cba4eb9bfba6f66bf62a2a5491cd3bb1c332895d6827bc478c00d9dfe3043152e814b6870894577a4e9547ac116c66f75a49b1
 DIST starlette-0.30.0.gh.tar.gz 2844387 BLAKE2B 00457d4913bd1c99fc6972baae56c5ebe84ba8215c6dd4f7875f6d93856ba40454d8a72828e715624bb945dce4abfbe407ed16e289a393af7be980f36389f9ae SHA512 751077fcfe3d344584d8986f3fc2bc25208716ca215db8ce62dfc752008dacd95f4834367f0921ceacaafa6b20409a9912f49ceabc23d7e9e5f636c6fb3646b2
-EBUILD starlette-0.28.0.ebuild 1137 BLAKE2B 35b6093daf96407877ee3b705e67fb9a5ecabcd12f652efdab990618f99e071ba218231d24760de4904fd4da46adc862d7022ddd256e1510b195454a8367c7ee SHA512 a6914801c50ae27c0195dd6fa3e792a464b46a94b3f2e372ca9a78b88cccfa4a777c9a2ee87e9d6dab9a1fe2c134a526f0417cd48bf9ccc3e794369927783083
-EBUILD starlette-0.30.0.ebuild 1145 BLAKE2B 96a1b0e3328e0d0d31cf2f30bdfeb11759f30be9a861844e13eb40f375a95fbc2b6cec2c54734ca300bf256b865d98f2f77c0e0065f7dcddbe3bb67a5fb4d856 SHA512 d3735cee3c781dce763dcbb49fc60ecc980372d9ed20e8d8c2d05c4d50b9df46909632b73b3ec4f02617878e5f4445840c8b8c9fdc54bdd1fc24c42f77c20120
+EBUILD starlette-0.30.0.ebuild 1137 BLAKE2B 35b6093daf96407877ee3b705e67fb9a5ecabcd12f652efdab990618f99e071ba218231d24760de4904fd4da46adc862d7022ddd256e1510b195454a8367c7ee SHA512 a6914801c50ae27c0195dd6fa3e792a464b46a94b3f2e372ca9a78b88cccfa4a777c9a2ee87e9d6dab9a1fe2c134a526f0417cd48bf9ccc3e794369927783083
 MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
diff --git a/dev-python/starlette/starlette-0.28.0.ebuild b/dev-python/starlette/starlette-0.28.0.ebuild
deleted file mode 100644
index e26ea3f5cc28..000000000000
--- a/dev-python/starlette/starlette-0.28.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.30.0.ebuild b/dev-python/starlette/starlette-0.30.0.ebuild
index 5157f33105ee..e26ea3f5cc28 100644
--- a/dev-python/starlette/starlette-0.30.0.ebuild
+++ b/dev-python/starlette/starlette-0.30.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 26ddd79c55ed..048f84cd9238 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,7 +1,5 @@
-DIST stripe-5.4.0.tar.gz 268711 BLAKE2B 2417174ceed571a7b8483992ac15ef9d19a037e5745118c2eec3094f8e848ec49b384f62bd4a136ed046b695bd753efc6064109c30a50aca539a1085b1e056fe SHA512 55351171184672ab55f38ed483078dbbb85216bf80d07726d1bb8848d24ff829a3d464d543182afafedfcaabdb516a5868bc4ac7d16f64f2dc2dc7c1ab2e152a
 DIST stripe-5.5.0.tar.gz 270144 BLAKE2B aab1f824f0b9e27b80e23ecc9267c4cfc9e4b952b14fa30e642587935d6a60076cb913e06d43ee5ee981e3d9603d73050ee92a8dd4dce7f0014839409cad1b7d SHA512 3023574e6b7e3037cb10ff20bf22e6b689f4fdf2f4ad04102b80e8dbe530a4d3f1c179dd9af1dab77f8a7d9da03573665ee22628b8ed35dbd655148b5621fc19
 DIST stripe-6.0.0.tar.gz 262261 BLAKE2B e91fbbda137cdaa78042b8914a85dcd3d75e04568f0d4ad72659d638aaa302f0b404f7893146a1affa7c8249f4f3965f674d6849378f9f89075b48df17c201a0 SHA512 dd0ca09faa605259ac4cf02887cfa7c51583e7d9b560cc98ad91ba161d101daeae7f27adf0650e701dc2fc8094315715125a79389d4765bd4bea74054ed6967b
-EBUILD stripe-5.4.0.ebuild 1855 BLAKE2B 08989ec5ac7408905628fe9d5fdf7095e16f7ad8b4279d52f2c04f5279f4335b295ce027bb73f9d371332f3c59c8defd7eae7bc34a02af9699959f6252c506d4 SHA512 6928f1d866daf73ac3e32387a5fba4a692c18563f262b68885b649950f1143382fa2c02eaac0bc3902edf7261a7207a8248d8620b50f3824435ff22ffa87b98f
-EBUILD stripe-5.5.0.ebuild 1857 BLAKE2B 376aaf9ab9f521966fa620455827642deb0ef4e740c40c18fc316cd5344dfcf18b556e70116f7adb88dd97fdda899ab0bb45c34432974141b544b76d8ea14b20 SHA512 d7dda8e0b512a632a4d60950d8d4d699caea6424369929b7fc5b362ce1723070bb1ccc68a61b2b7d3dfb256062bebe5349d337d6aacf6c61d915ce4e0639885c
+EBUILD stripe-5.5.0.ebuild 1855 BLAKE2B 32f5243b637b1bd18920e2bd38dbc6c1250bf63c683015987cb99492802d2e9102bbf1fd95d71c5df0ef0fbf2f9169d114a4c71bb86a3a0e3984482c0db9c1bb SHA512 1f90a1cf06d7870bd503ba11ae61917c5bd2dd4c1d4d0bc251a8af91913eaacc616b518cb4c8706849cfc33a1944655fd6e50300fbd9601fa525a42ec87bedcd
 EBUILD stripe-6.0.0.ebuild 1857 BLAKE2B c3bbd829c22415c9643c2498654d7e475be1195425e72ac747af8dbabde710b9907d3990ed21415a9fe3a21b8a831953d2075798e791b109f1676b0dcdc9a4d7 SHA512 97c6a3d644f054866a2740a7aefa484415bf63b5ea67b618ca2204722208bacc1850d0c310a47dfa035d107b6c65d82e8bec7a83572e79cd38f4fa2d7fe7a002
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-5.4.0.ebuild b/dev-python/stripe/stripe-5.4.0.ebuild
deleted file mode 100644
index ccf3bbd38859..000000000000
--- a/dev-python/stripe/stripe-5.4.0.ebuild
+++ /dev/null
@@ -1,71 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.159.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.5.0.ebuild b/dev-python/stripe/stripe-5.5.0.ebuild
index 786a0183fe81..bc535aa2125f 100644
--- a/dev-python/stripe/stripe-5.5.0.ebuild
+++ b/dev-python/stripe/stripe-5.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/time-machine/Manifest b/dev-python/time-machine/Manifest
index 1ce878963370..259e9873ab0d 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -3,7 +3,7 @@ DIST time-machine-2.11.0.gh.tar.gz 28075 BLAKE2B 2eb07ac60d4014e5796fefcf5cb846d
 DIST time-machine-2.12.0.gh.tar.gz 27743 BLAKE2B 4ed0c9901edb9c698b8bbba6df80d12b06f344ad6ee8f9e89577264da1f0211774c2d227d02dc1ab0ceb5b905094168d19cdebc00a91a955d216729082ecbc28 SHA512 4708cdc3aa0ec06907d0ee1219ceb074947fc962ab6f0d3606e5273f3d64ca278bb43254d924c04364b967301cf69229ced70d7b1db92b0b6dff1523cccb2f82
 DIST time-machine-2.9.0.gh.tar.gz 28043 BLAKE2B 9a9a521c94b72a7464853661da791b6f57f5155ddc62ffceeb82f808903f4c337e6bf48fe8300bb4f9f5673fd175fd85038a4e80a39e8f3e096c12c27ee790ec SHA512 ecc780a72d279b49d026a8f3f89210cb4c90e02c5a517c08eadbabcb65216a24c603ace39afd76ea1e6ccdef589d5997581d0db7477bb28fe4d1e0510daf17a0
 EBUILD time-machine-2.10.0.ebuild 667 BLAKE2B 76155796a083523d3cdcefb5d4a8aa2c0c092956a0169b247fff8c8dfed6cfd7f965266d3082ed85782e279d39bdb46679aa3ab6caebbed35c7c42664326ccf7 SHA512 d73d636c06915c14323df9edbd9ffc0edab511168c66ca12dc7ef2fe99e97d9c716de59447ab21d03ae05ef5660d4fa3f746f2cde17ab827e1261ace8c68fa9f
-EBUILD time-machine-2.11.0.ebuild 674 BLAKE2B 6d36190a66f13da17b9c8b755275ccba14bda8558fc5b5d7f57f5cf33fd64a21b75f564097a7e47122009748530746c1384c084d157d5a68033f1a2d2b93e66e SHA512 e399d9c6b9af06b6fd67760c0046be313d43c031195fc45c1e782448da35fb0004861d84e116d17ac37caabc34b0b4a0bc8d81ef1c3a0aa1a423a2aaca4ad2b8
+EBUILD time-machine-2.11.0.ebuild 669 BLAKE2B 8d4767b23aeaa9fbb5ffc9f2133d38252aa6c2f473b0cb6a5e33cbbcdf82df47d2ffee4a6c5ec0e229d46d31da16c55632322a57dabfc00ffc09b92fb3764a11 SHA512 091578c7c491c766b3acc4bdd5837ba6be2b024d1c553ece575fb042b935d5dbbdae5c6633a2ad5e67a6132782b7e3e52d8bec46c703d6080bbb8d6bdaa0a1f7
 EBUILD time-machine-2.12.0.ebuild 674 BLAKE2B 6d36190a66f13da17b9c8b755275ccba14bda8558fc5b5d7f57f5cf33fd64a21b75f564097a7e47122009748530746c1384c084d157d5a68033f1a2d2b93e66e SHA512 e399d9c6b9af06b6fd67760c0046be313d43c031195fc45c1e782448da35fb0004861d84e116d17ac37caabc34b0b4a0bc8d81ef1c3a0aa1a423a2aaca4ad2b8
 EBUILD time-machine-2.9.0.ebuild 666 BLAKE2B 31b2cc19c14d0a6265e9f232e3473912a9597530acd7ec92df6d768eb96c85d1aa404212ad0b3a8a16a96006f4db94bdf70ec532f1dd3ae49ec0540b2b52b2a9 SHA512 f39aadc323edc83a608048cf5557846ce4b5f45d30f8188e19d086715dfd9bec5c9d5f3fe229b5e3882a0fc2dca0870e50bcc158417f0078a2d32cb6749281ed
 MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
diff --git a/dev-python/time-machine/time-machine-2.11.0.ebuild b/dev-python/time-machine/time-machine-2.11.0.ebuild
index d6f96f71fc73..9019358637fa 100644
--- a/dev-python/time-machine/time-machine-2.11.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.11.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 8b8473084ad9..d56c88b9a959 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,7 +1,9 @@
 DIST trimesh-3.22.5.gh.tar.gz 12715459 BLAKE2B d838b75acef1615fab5006cd55cd28d649fd61fbecbe076250d3f2acd6d0c6f29481862189105456e9626b15b1f6e557f419cbe49044ccff784d9ea2a8ea4dff SHA512 1756f8a589cff214ef6ecf54f363c906b26a1d7205aa1645cb5f90b691d6c43d71f904939329b599c0b5595b663529b15c4d8a747da50157a22e3020808f3f01
 DIST trimesh-3.23.0.gh.tar.gz 12720387 BLAKE2B 88e57f09c1bc924a59b6ce3744ef3e3df05d144707415fe595f40d411e364591cdd22ed38a46b2004d935ab18f3387753cf66479aaeb9cc1f4d870c1e23ce7e3 SHA512 d4ac6b5c7ea09c84810a36060c6cb9a5366ef177d309d1d0bf2cfbdd0969562394ee03832f9a535d63cb71b5c026fb6bf43b815014230c8e20c56bb69f0fc3ed
 DIST trimesh-3.23.1.gh.tar.gz 12721718 BLAKE2B e6f388c0b3443b46bb6a4e93b049b4a75c5c7af7e24c441f1b0c5c4247ac34d3548722ea24979897c332b4defb69681e5bf714848dd6e3d89af18b2a0adc7e18 SHA512 2a788631f7bb142da5f761ed374c1966b92799a4e4ce52687bf86ee7da3d226466771a84876eaf8fb71b5fc967d69fbce286c4638e0f14a9c8d3e80094079283
+DIST trimesh-3.23.3.gh.tar.gz 12720847 BLAKE2B 707f078c72058510504104fae2e293421df46c52eec307645fbe43f10f13ef3ccf81f4c6c14dcf9947c188b70a46b3b8305a325ddbc516bfa79efa0dfeb3f96e SHA512 20410056a8a50ecc3638247b4636768eb0bbee22adca1a5cd19ea8e25be5d60ab9fa5ff01f7a4e63e7da87afad0379849f67df753484f4e4cd3a5e40ba0b607a
 EBUILD trimesh-3.22.5.ebuild 1888 BLAKE2B 8c7e4b95a97b3d522089f2d75d53c97243ac18175231cd41edae7cc948a3685223c61a4d43d76b182962ed0184e912e2796f6b70e98e79e1c4fc5139b7806afc SHA512 f60002a7775837ea1e6800f2c3a3a2b1124e33258a62683f19f13197bc1ddca16853e993e65ae965a652c53648a5e678e33c2594cb69c21f50158dbdbfbef28b
 EBUILD trimesh-3.23.0.ebuild 1889 BLAKE2B 3b329b14222f1ca0f70cfc138c44c01e6eb9826e76f6805ce7e42a40b177d5e7514d03c8c45375cdd91c1aceca305137cac9b7c6a6c86ad51be9ca5db29967e8 SHA512 a84336ae1aede43effa0a4a44b41ba399703361a05081b44a352f189d7f5a9c219f73e7229eebf4678729b4e5f88a1c940b217adc2748140e1709526e44619c7
 EBUILD trimesh-3.23.1.ebuild 1889 BLAKE2B 3b329b14222f1ca0f70cfc138c44c01e6eb9826e76f6805ce7e42a40b177d5e7514d03c8c45375cdd91c1aceca305137cac9b7c6a6c86ad51be9ca5db29967e8 SHA512 a84336ae1aede43effa0a4a44b41ba399703361a05081b44a352f189d7f5a9c219f73e7229eebf4678729b4e5f88a1c940b217adc2748140e1709526e44619c7
+EBUILD trimesh-3.23.3.ebuild 1889 BLAKE2B 3b329b14222f1ca0f70cfc138c44c01e6eb9826e76f6805ce7e42a40b177d5e7514d03c8c45375cdd91c1aceca305137cac9b7c6a6c86ad51be9ca5db29967e8 SHA512 a84336ae1aede43effa0a4a44b41ba399703361a05081b44a352f189d7f5a9c219f73e7229eebf4678729b4e5f88a1c940b217adc2748140e1709526e44619c7
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.23.3.ebuild b/dev-python/trimesh/trimesh-3.23.3.ebuild
new file mode 100644
index 000000000000..c7b61d98e83f
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.23.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 8423540ea866..0573c1cd3960 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,5 @@
 DIST urllib3-1.26.16.tar.gz 303733 BLAKE2B 94c0cfb8696b15ff7aed25927ba584d0d67b150953586ca4d74ddc8f1d0a95ca447a482cf7d0f95728fad1e7e51a610e29c3e342ebe68e65a86789308544ea51 SHA512 caa58af5bf49644459a9074be659511b56c5d66802153c72ba2ba2eb9c0aafd56b4cd8f8588964ee7d2a9b16a5e114d62298ab1e128710260ed86f1e315b5571
-DIST urllib3-2.0.3.tar.gz 280489 BLAKE2B 5cb68029b8ea2fc51c5abefe212ab4a58269e72f180d16e4c0bbef93284c3298195fa84e2f2d845663436c5397a73653a95d9970594dab6662077f77a11591a8 SHA512 fd586a12b25a30ea801cfd6e207854a0f762cefee54512d742b3fffcc772db9dd75f436f0b998edd32a60857a7bd818bd10f6984e26f2ea47f56b5c545ead45b
 DIST urllib3-2.0.4.tar.gz 281517 BLAKE2B 58635787069b6d8e83394ddacca2c70824c03190efb4e0838b9b80d8e8c1499fa0143e1d38ece4e2a7f9b34d6b50f9805050bf85707d98eb171307ff35f8b215 SHA512 64d55714d871716730af5a691fc222722cffc13b0603ecae597e5f4cfd82297beede2b08cedc030b2419bd446f51c4c6e54f466ad96c71dd0848abbf806b4db4
 EBUILD urllib3-1.26.16.ebuild 2193 BLAKE2B 724c27ff2cd776ada5c8ddb43aab29e8a1a6c7b1a4b984a7b5c8050aa8036e908dc45c8a012fd83d3fe9a5a819578249b73b60d0cb573a47d133396813ecf96a SHA512 575c8e31fcacbe8542ac3067ae878ef0995cc4176d845e287edffc7223a8725af3940bba4b54f77d4f5a9125568076e45415176bdd4a2d470f8b7389129e68ec
-EBUILD urllib3-2.0.3.ebuild 2490 BLAKE2B 8f03791eddc15da0fc344ab9486b89c9004ca6702c827053bf122dcc44770cd49be36bbd058a25d05eb1e37d8f1e08cd717d7b0d0494aa98eaf6b032f4818ffe SHA512 7419687c608874464c6a6bf4eee3cc089913d83d69e15a6162e96c1a900a2781f410613904e0e5ea0e1e287fb303960e662391005c7a582737dac4dd7faa3a49
-EBUILD urllib3-2.0.4.ebuild 3050 BLAKE2B a137223c90ba536be924e0f793059f9b5aae559aff7d1b670373625fa7d4731916db04d1573d12c213f9ee1c7ede962059a131e85804c640d7205e3f2b0ae287 SHA512 6bbe10465e3b6ff212efbde4dc56382878436d64872d8b6c636f92a1aa6e4ebe0e04c361c60c782622f571b9b9f0682cea04de5e62a66b7fcfc10833ca0598a4
+EBUILD urllib3-2.0.4.ebuild 3042 BLAKE2B fb92698b15dfd29a25b9860148eccdd35665a780afdfc543ede495be10847284fd512779e8c2120e0a9de05420376d20fe82a6d172dd6ecfbcaed8d9a6224d2a SHA512 46f4e9f1c32fa6700e18130d67e29ca0cfa25ed7385df9cf02c2c2b3fbf96efd520e70653ddc209a035cce51a8d3d9272e23bebe5e59f9f1879febf9732175e3
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-2.0.3.ebuild b/dev-python/urllib3/urllib3-2.0.3.ebuild
deleted file mode 100644
index fb737ac47f4f..000000000000
--- a/dev-python/urllib3/urllib3-2.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-		# stupid test, next bump please verify if they fixed it
-		test/test_poolmanager.py::TestPoolManager::test_deprecated_no_scheme
-		# fails with newer secure SSL configuration, which removes TLS 1.1
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-	)
-
-	# plugins make tests slower, and more fragile
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.4.ebuild b/dev-python/urllib3/urllib3-2.0.4.ebuild
index 9a53866c278c..09c261bac12a 100644
--- a/dev-python/urllib3/urllib3-2.0.4.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 4153f8289d9f..5522ea756686 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,7 +1,3 @@
-DIST uvicorn-0.22.0.gh.tar.gz 719615 BLAKE2B 8e0d6099e66822e77fb447c279de8f29c820e1f9e24e37629d36349ebd4b52ea8dc69f7fc02a21e9711925e3ad1ec4a95464ea315c7bc40a905810dc9a1ef077 SHA512 61af2df426a5bc060a32730ddf024ca8dd39ccea6800235bf48d7e0c694b9d363cbedd826f498063c6779061af84b6b56e8ab0a466e74291dbbaf5ae995e5587
-DIST uvicorn-0.23.0.gh.tar.gz 722671 BLAKE2B f1fdc09e211c97d9e326b41b197d12ad019e660a1a2fcc0c70ee62c2016a20bbcafb9be759fc9b682185e70e10881c9a3511168eb0e75844973f7c3321d455bd SHA512 2449150abdf7914b47ff8c02732549cd71e63cc7c6440eedfd200340df4e70543232ed1ef47e2ebc6b29fc9a0d4615f542d7d1c603ce2673f121afab63d89b47
 DIST uvicorn-0.23.2.gh.tar.gz 723155 BLAKE2B 03edb0b6c7be001be868636a77b818491d71e28277e22f252d650c2d9452e5018470fa3cf60300a8f4358d548f794e95a1bf877ac02ed30574a14dc56cea9841 SHA512 a575482ed261dff3a74a5e04387b36dda55d5975a635ca5c124770b7bbfcf764ea420b0b78b9396e4eaa8b839031933aefc7867befb46d18f39f3df5115eb77a
-EBUILD uvicorn-0.22.0.ebuild 2258 BLAKE2B 3cfba4ab05902dafeb93eab2cbb7c638fd64ebbc5e5d34d76c7b2e835f84018f2e22bfdfcabb0cb188ce3ca20e21b16b940a499bd1306caedca86da1ad7ef5e0 SHA512 262deed6f1ac23ac103d92fa6581ae89507910022947aba9e3b25896d6bf759a4f9f93abe4430e1aa083f32649dcbf72e6b03da6aa672144b84ea61f8051835e
-EBUILD uvicorn-0.23.0.ebuild 2251 BLAKE2B a2b49ba248bb578da3b5a59aec289aa75b40aae5454e8443c84cfc1673ee1d2495ab77d9e36c7465189ec04d1af8f527f1d70aa105cc350d316bed3d4db4a267 SHA512 62397481d79eb2b8f568d81d57214a84fd1a9359ea4cdd3ee8c81231dc367585bbb68c94b1f400d1910e965897020f8294c8d609e001215b91ed7ff629e202ce
-EBUILD uvicorn-0.23.2.ebuild 2251 BLAKE2B a2b49ba248bb578da3b5a59aec289aa75b40aae5454e8443c84cfc1673ee1d2495ab77d9e36c7465189ec04d1af8f527f1d70aa105cc350d316bed3d4db4a267 SHA512 62397481d79eb2b8f568d81d57214a84fd1a9359ea4cdd3ee8c81231dc367585bbb68c94b1f400d1910e965897020f8294c8d609e001215b91ed7ff629e202ce
+EBUILD uvicorn-0.23.2.ebuild 2243 BLAKE2B 8406e991dc792195be6224a68e0eb2d44f5a4b313d17c5c3e2970ff5a8e35d9d9cbacca827a69ccd15e28e47085e8c332880491bb834bd72e960451ce5174b45 SHA512 dae9209b460024cf24b2c731732c422a43be65c50b22cd63c209ecfa09fb19f029a254230c95b457fd4e5b75e0387a9239f113601ef4b631b27651199f0045e5
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.22.0.ebuild b/dev-python/uvicorn/uvicorn-0.22.0.ebuild
deleted file mode 100644
index 56fe1c9d30a4..000000000000
--- a/dev-python/uvicorn/uvicorn-0.22.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.21.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# need unpackaged httptools
-		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-		tests/protocols/test_http.py::test_fragmentation
-		# TODO
-		tests/protocols/test_websocket.py::test_connection_lost_before_handshake_complete
-		"tests/protocols/test_websocket.py::test_asgi_return_value[H11Protocol-WebSocketProtocol]"
-	)
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		# TODO
-		EPYTEST_DESELECT+=(
-			tests/middleware/test_logging.py::test_running_log_using_fd
-		)
-	fi
-	if [[ ${EPYTHON} == python3.12 ]]; then
-		EPYTEST_DESELECT+=(
-			tests/supervisors/test_signal.py::test_sigint_abort_req
-			# hang
-			tests/protocols/test_websocket.py::test_send_close_on_server_shutdown
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.23.0.ebuild b/dev-python/uvicorn/uvicorn-0.23.0.ebuild
deleted file mode 100644
index 3c27df7c757d..000000000000
--- a/dev-python/uvicorn/uvicorn-0.23.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.21.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# need unpackaged httptools
-		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-		tests/protocols/test_http.py::test_fragmentation
-		# TODO
-		tests/protocols/test_websocket.py::test_connection_lost_before_handshake_complete
-		"tests/protocols/test_websocket.py::test_asgi_return_value[H11Protocol-WebSocketProtocol]"
-	)
-	case ${EPYTHON} in
-		pypy3)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/supervisors/test_signal.py::test_sigint_abort_req
-				# hang
-				tests/protocols/test_websocket.py::test_send_close_on_server_shutdown
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.23.2.ebuild b/dev-python/uvicorn/uvicorn-0.23.2.ebuild
index 3c27df7c757d..4443bb012e13 100644
--- a/dev-python/uvicorn/uvicorn-0.23.2.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.23.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 2a59a6d852ac..ad7606ebfc80 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,5 +1,5 @@
 DIST validators-0.20.0.tar.gz 30665 BLAKE2B 7534c4970ab288cc02794176e0b3368ed2d4035d602d36ecadad84fb4a41407210b22a8ed1230650f4f247ba1552634aa500fea5c2f03f5e13d6e1120e62b15b SHA512 2f3d9caac9246b346e10604758168092ac483fe6e4a0c9470900e49719fbbebfd18e03aca525f8cca33cec224589aee28de3ea9bf5cd4941a49715d4216dba20
 DIST validators-0.21.2.tar.gz 40739 BLAKE2B 0420a1a56c3ceb96062d9a78c78be8151f94eba2a8cc06db7003ceebbb535eb55810289bf5787a24807d9c0556ce0621b7fc159ddd1c62fe28ae0dc61f257b58 SHA512 558630849f6c81b13f7043f5713c160f0cdcc94c7d90c9e13c97ab972c1bf74df9a9d889b50238f7239c6885a34549a8a209b3a325d62291d93073b9cad18d08
 EBUILD validators-0.20.0.ebuild 495 BLAKE2B 4a67c9c95409f1af6445d2b2767838bf81456a1250dcbec431f4547df10215685b41a23c34c1cdeab2899223aa1379087316d18aa28b734a8a25b8d08c0fc88e SHA512 157a1cb29ae0765c335cfeda5ddfe7c16f321b4def5811f937be92cfeec38f5088b5e6cf525c33ca8deda94d2f691075386345b6dfd89a1f09d67090c0bed47e
-EBUILD validators-0.21.2.ebuild 459 BLAKE2B 8e84b55e01fe170dfdb3992b479a6e7d40f7620ecfed28cb00cf3b7f6ff64f2ef2efb0b188799c6c79a16683e18754c47944b73a30552e1960d1c8ee953ca161 SHA512 781824255873caa6efacb19613d71ce74e37a3978cef9d7a8c74784f83c40c585d304a562fb1e45686287eb363f96fe4196d555885b6b2d796c594af040e9254
+EBUILD validators-0.21.2.ebuild 472 BLAKE2B e186ef141c1cac8f83c16609f462e4adf90ec56d0bb046668f0a422ffdd971b2beab67a91ac4b3bb138fbb16f89340dc94ca5d01596e271b2832729d4cee400e SHA512 389139ef1b7b213fe3282f6806f0ba0d08658ec2ac2b881cee40e98a4ce39827fa5a894031b282cd9b39a9d8ce7eb4eb44bc3a5d4e11fac65683900e6cfd67c9
 MISC metadata.xml 495 BLAKE2B 015451b5d08099d0999b05748d5db2615073328fbea76663d0002bec0d99816a636ec897fea8246f5586f8f77239ff0671fb69bcb8a50a3d980e5d9e7ab98b0b SHA512 1ba59825a77655ae8994529da0d0b905db91de3eee61acd03b00b525fb8b3eae382b40ede27d474c2ab8eff791c81d881699877b1a00648201fcfc7ec2fc10bf
diff --git a/dev-python/validators/validators-0.21.2.ebuild b/dev-python/validators/validators-0.21.2.ebuild
index 4ee36505cfe1..da9a907c662f 100644
--- a/dev-python/validators/validators-0.21.2.ebuild
+++ b/dev-python/validators/validators-0.21.2.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 7d98be79a9a6..5388756b6d26 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,5 +1,3 @@
-DIST python-versioneer-0.28.gh.tar.gz 77503 BLAKE2B a4d75ce8a7db057421e36fd75bfa9ec83a41191b999c2a81b3879290424005b521f7b6046debb847bf78eae459ef7247d903f971d2a0c4fce116ec0cd1f34833 SHA512 ef27f4588f1c76eb5da1e108f2eee635707b2427cd79a71880f8df217317329e5fb81b30b1e741f2439550dc73f9a816ebdf47af475862344d67ed2189f92a1e
 DIST python-versioneer-0.29.gh.tar.gz 78801 BLAKE2B e0af2887a8aaf5d4aee14d8370fa47d4ad9f0a5d385382de5b14f34fb1d6388daacaeab48677523b157ef685c8ad6e18b89bc8546ad8c991cde06e5c78da701c SHA512 10dce0923e2a48036117b64c8b746bb57db4b33f9f752ba950bf877319184451928d1eb37693ffb1a4f95afd774a4883cf265b8a82f35bd77b26c0967caa9ad6
-EBUILD versioneer-0.28.ebuild 1238 BLAKE2B 52cca5e3c4526009a54b04a4c8e04aa38379b1d3c04336ee6b404a8ced3cbabfa2134341c60887e2959ac55ae1498bdc4b124e49298b5c56e595dbbccace1aaa SHA512 40432ad507eda946ea131a4eb8f9d7fdba5be10f485dd10aafbc5fbef73f762fd00804ebd310c4bc2d47fd92cc6138eda1db6d124e2c689cc980e5a0d8314c34
-EBUILD versioneer-0.29.ebuild 1262 BLAKE2B 473e360b76b359504235269dac3c28ad5d8b23ece790b2dbad5c7294d507b2e650b5110c11133855d98b117ca5c02a81cc065d34ce3892b4e18edeb0ff70c9b8 SHA512 455dcaafbaa0df284ce82c76182c8fc01dcec5e817375762625b8fd987a34a57e09e6217371b0423c522a29b59c960c669559e24387b1b2de9d42a8c83e67d99
+EBUILD versioneer-0.29.ebuild 1254 BLAKE2B 0a73d015cf527abeb9c19991f6a7780ee2426e9828ae7c251f727f0ca86598b47c97b9701cf241dba3c8d7125272ee74deebe3e9f67123d9973e96420a015692 SHA512 b2226e53fdfb58c2bbf35a28f3fbe60a7b957b20bb6be34f2f381d43b7f2680b2ae0f93222ce3548418e2d9974bc1614afede332801175bdc86dda28fd2ddff7
 MISC metadata.xml 426 BLAKE2B 050a6c51f12ce466d0149041e103227c176f792326f859474c996a38f510544f09a594b6a70036b3cdad78013ff9982316c671e77be6ed2e7f0fa643bf89d320 SHA512 da99aef0b58491715dca230579ecba68bfe357909dd8bd122e790d7f0300e0b1d11cf224ea3a3c76763d593f45013cca6cfe27cc774c6eb90dd6da562a061c38
diff --git a/dev-python/versioneer/versioneer-0.28.ebuild b/dev-python/versioneer/versioneer-0.28.ebuild
deleted file mode 100644
index 640d9859eecc..000000000000
--- a/dev-python/versioneer/versioneer-0.28.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=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-versioneer-${PV}
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="
-	https://pypi.org/project/versioneer/
-	https://github.com/python-versioneer/python-versioneer/
-"
-SRC_URI="
-	https://github.com/python-versioneer/python-versioneer/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="Unlicense"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!!dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	esetup.py make_versioneer
-
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	git config --global init.defaultBranch whatever || die
-
-	"${EPYTHON}" test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.29.ebuild b/dev-python/versioneer/versioneer-0.29.ebuild
index 4e6d807caf05..3f367f37a66c 100644
--- a/dev-python/versioneer/versioneer-0.29.ebuild
+++ b/dev-python/versioneer/versioneer-0.29.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="Unlicense"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index c111018001e8..7fa41c778dc8 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,11 +1,5 @@
-DIST virtualenv-20.23.1.tar.gz 6619074 BLAKE2B 0b35a1439b7e2a9eba9c676457a39d22c4318dd4925723bdfcd5ec36cdae236b5bd6aee44a7e4cea5f1febfac7dbf58a7b0e21bb150529f9b851eb065fbddede SHA512 9a19b8f4aff021f5419c10b5954118adb668294cdeffba7a43ed12f76fc6fc8aed8e53df68277a959deb7a4e81f81ed9b4797c17574c347610c8de8d85826af8
-DIST virtualenv-20.24.0.tar.gz 6315085 BLAKE2B ae80fb91ecf8ba69574f5e4373913e6f7c951d56c8091cf7066f24b7b98d6a25479acca637980117d4e7759eb35d4e2fb9a95fc211360825148cf8ae650db6ea SHA512 7c3974ebd40d855bb859e3af10e341c6e8164d63779d6038bac15d49fdb1b87c564c6f7987d06d2f01fb4009183dfe4e05fa2dadaad44b8a153b7c1cb55b687e
 DIST virtualenv-20.24.1.tar.gz 6338055 BLAKE2B b5d6ff2fa230a094699cd5ef3a289d9f79c35a843e8709009b44c7d5861dffe2072d51c62a623624c3f7b1656d126781ae454a81e3510474e2514ec66d85637f SHA512 7ac4c130df7eb4b7bf2b393505c80ed07824c9d0c09535f1d7483f3926324e0d1c54c0b8310c228e529a9b3839820e943a1d2ff2b06174782f13735c2a1ed472
-DIST virtualenv-20.24.2.tar.gz 6338501 BLAKE2B 8a23dc82dd3cf7e5b5a33427b23f0e1d580c463573145c079cb4d18bb2292c61475b0209c6b249ec8d6eff1196a7695e3bf4a4267145e9f2ebca96a25a11fd43 SHA512 776924af470969503adec4ace6da626828ed0a41d17dcc88ef5b0166bed12f98862c6482a63f79d370cd9226c2b8e118933045d89369486ddad3c4e05c0db713
 DIST virtualenv-20.24.3.tar.gz 6345661 BLAKE2B b6e9db2b59114de0aa419f558b863aa980daaca278e658f7dce55b5b2bef16e88915162d4b5ea31bb5c549582debd22d02b2a0edc7db08c168428395251448c3 SHA512 9cf6f03b50bae773cca2a01be4f74251d3054ea997a0b1236c4e6650e779f219ca51f736eff86a6e25548d5bc0c84e85a1d0cf7d3099848d773d205837c76fc3
-EBUILD virtualenv-20.23.1.ebuild 4836 BLAKE2B 1cff43a4eb81126c501ad1e7f11ea24763d8d1d273a58f0fe2f1be726ecbb88213585eaa909a75c1aa917ea107f2aeb4d23674d536d022a151501ac310263362 SHA512 7f1d6d589bec6431acf06c21bc8fcbe82ce45d73011a24f3325b700646be977184edc3fc64ed7a4624071331bba19fa8ca6c5a4859b91bc4e8bcf6018fbdb9e7
-EBUILD virtualenv-20.24.0.ebuild 4844 BLAKE2B 5aeffed34866fabee497fcb8034fa4c14897c42e40385f4d05c755aab5e9f4dd93d3b201276f2f948f35401287f144d20c2067496d830d789b1a33067bd7270a SHA512 ad5466f8ed5319a2483554547196f0dd8be0fd2f8a0e24b45ec7d339b545563d584bf6f9860baa0e96324430d23f3249dc0750de47a1e39acdeb92a351b1188f
-EBUILD virtualenv-20.24.1.ebuild 4844 BLAKE2B 5aeffed34866fabee497fcb8034fa4c14897c42e40385f4d05c755aab5e9f4dd93d3b201276f2f948f35401287f144d20c2067496d830d789b1a33067bd7270a SHA512 ad5466f8ed5319a2483554547196f0dd8be0fd2f8a0e24b45ec7d339b545563d584bf6f9860baa0e96324430d23f3249dc0750de47a1e39acdeb92a351b1188f
-EBUILD virtualenv-20.24.2.ebuild 4846 BLAKE2B 190a1de9689045a7361e202fbefe8a7bb6e91ad3eb576e4ab0f74a032893c21be7305ab9f323a75b4e1d341140b66453ef1d706670108e705394ddb9ac51173b SHA512 44d4b8e1a742e454e7df7bef51ee0cd6d5d5e6635e0cd9d322c39920945a56163f3d2cd611d37759bdac4828841db087cba2b378a58a9df55f91bbd49de32941
+EBUILD virtualenv-20.24.1.ebuild 4836 BLAKE2B 1cff43a4eb81126c501ad1e7f11ea24763d8d1d273a58f0fe2f1be726ecbb88213585eaa909a75c1aa917ea107f2aeb4d23674d536d022a151501ac310263362 SHA512 7f1d6d589bec6431acf06c21bc8fcbe82ce45d73011a24f3325b700646be977184edc3fc64ed7a4624071331bba19fa8ca6c5a4859b91bc4e8bcf6018fbdb9e7
 EBUILD virtualenv-20.24.3.ebuild 4846 BLAKE2B 190a1de9689045a7361e202fbefe8a7bb6e91ad3eb576e4ab0f74a032893c21be7305ab9f323a75b4e1d341140b66453ef1d706670108e705394ddb9ac51173b SHA512 44d4b8e1a742e454e7df7bef51ee0cd6d5d5e6635e0cd9d322c39920945a56163f3d2cd611d37759bdac4828841db087cba2b378a58a9df55f91bbd49de32941
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.23.1.ebuild b/dev-python/virtualenv/virtualenv-20.23.1.ebuild
deleted file mode 100644
index 97762e957311..000000000000
--- a/dev-python/virtualenv/virtualenv-20.23.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.5.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.24.0.ebuild b/dev-python/virtualenv/virtualenv-20.24.0.ebuild
deleted file mode 100644
index c19439bd8ea7..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.5.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}"
-}
diff --git a/dev-python/virtualenv/virtualenv-20.24.1.ebuild b/dev-python/virtualenv/virtualenv-20.24.1.ebuild
index c19439bd8ea7..97762e957311 100644
--- a/dev-python/virtualenv/virtualenv-20.24.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.24.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.24.2.ebuild b/dev-python/virtualenv/virtualenv-20.24.2.ebuild
deleted file mode 100644
index c811380a9aa7..000000000000
--- a/dev-python/virtualenv/virtualenv-20.24.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
-		tests/unit/create/via_global_ref/test_build_c_ext.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}"
-}