gentoo auto-resync : 25:12:2022 - 20:05:44

212 files changed, 247 insertions, 4653 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
index 0b00d883fc10..6f4971279261 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 174ad9f33ecb..b4481b1267d9 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,5 +1,5 @@
 DIST Levenshtein-0.20.8.gh.tar.gz 36607 BLAKE2B 8c35c47768a21651c7922151f9a4ba24782106fee1cc2eada2b81924b3e340aa929ec8b9944a7ea9cfaf8934da49cc377849e599fedebb6187afdfd486e8b9f4 SHA512 3a248b5d1a18c8afeffaa637c831b07266dd36a094b713c18b7182a49de7df9a3b7316d00e9329e2ae49f92c601e32a61590338e30a7e4f33ffe0d76c6219061
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B a56ef0d6431d51516f69a6a00dabec4681aa3e999fecfd904d34fee2dc1d4e8fca5ef47af6d388b0dcb72a9a1664f4d8ccb4124496d6ddb1306c7194aba06d1a SHA512 12021fce00cc5bb951cdfaba190a14f512bab14cef53b430504400bfa99daa91faa04a819fef750c7e558b0a99698fc52c8f52294d4ce47069efdf30a2d9600a
-EBUILD Levenshtein-0.20.8.ebuild 1034 BLAKE2B 0e85031c2d2e0f3d8fe2b16537eeafc0d9abd39b4cb25365b27e67abcfbbcd9e6a9fd2fb528e763efbe52cba1523f341fc15148fd3e2f44c9b0448517f966043 SHA512 14a5c18366694d3e36b2ed457ee48cd0478874c9596a696b7aeeca8fc44a08e2cfd0c14d7feccb4e68c4bd45684e2a2dafe5a97468b45e9248a4965e70d61e89
+EBUILD Levenshtein-0.20.8.ebuild 1033 BLAKE2B 3a1f66b548a91c00567e687f596a8aa7fb6364ac07a9794d7e953d4db5ff125d62253569ac6ba3aa55fe9084da8b486cbe1b90760ec76fc7e69b97d4ccd22657 SHA512 d61eec029da84a0f3e7fae4d97cf49ed1e0cdb0cbbe0866c6573d59a6ac130048010552c76671418dea0bba6241e3473ce0d69e6294fec0ef5aa2ece41f52f7f
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 86472f1ede4e..b71d992e690b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 35f48e0b0f0b..1432cec0bdcb 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,11 +1,6 @@
-DIST PyPDF2-2.11.1.gh.tar.gz 6460157 BLAKE2B b9b6d1801b24c2d522200636700d26f651a5c877d31d3a72a8b9a8748a8063e163644d8ce115975a122cdfa4ad9f566f932ddd5b8f2f4545c57332f6c9f34154 SHA512 d1742a96db4b1385c0d670c682dd326d2a12e4ef36bff281bdf56b5df463c1a6ae023e40a4c591afc3c7176a73ceb610f23819cdcfebd2ecca7b327c1d21cec3
-DIST PyPDF2-2.11.2.gh.tar.gz 6577234 BLAKE2B a6c7892364c54a44bf005fb105a5fd6f68beb44f54bc437d84d02978439943871ba18178ea9917c44572acc1f67b6647817fd789fcdaa8209ed6e44a0e8fcaef SHA512 4405ea7594c2d6ce691a8421f874ac551ae55f03d3bec32e7384ad0385581ecb4bdf1582f7c3f3d7da64871a80c0e5691fc5cdcafc3cb3d88e89225fd30bb788
 DIST PyPDF2-2.12.1.gh.tar.gz 6581775 BLAKE2B b65a8a82c1d20036705a3a7564a03bc70dfdc66a9c1b8b3e6e2473630a575a98ddf798c48f52d3fd45583220cad5f2029190be9d761aba2a23a3d8f334d3e45b SHA512 2b832d10cb9217de503a6d4ee7b137aa68f98d6c21f0a8db09d722e02c853cc1a5b6d4df78a99e7a0b9681b572b04a133458b05026978b4979cde796433437be
 DIST PyPDF2-3.0.0.gh.tar.gz 6608776 BLAKE2B 636be14b5f3912824703dbfd6137f1ea7b97f4405cb9d6d14f9b02feff6900936f8148424e75c3aa733e144bbd13602404051b2c3c6b63b92c246205b6204b8a SHA512 417a401d1dfaf96e07bf196f53cfe12af50d45d812c48d57db576e596ad8cd029c5b03f801180a12b31c34f9acbb65d5f802b428792cfdb5a18c013ec87c5e37
 DIST PyPDF2-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
-DIST PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz 7198720 BLAKE2B 91d177e7329fd137322972a3a38841cb0611de7f839071fe2fa5ecff0343cbffdf6976f42f4a779f520a8a2bac2d6573c5cd65bf2f1bc68395077e6e9c7322d9 SHA512 0cdaee85f1da12cf678165f06c8d351aa0808137d25f68c07f19f1bd3c929eeb52e604041dfaa0df94665379aeb7d19a43426d724a5e6602b7e4fbe7a62e753d
-EBUILD PyPDF2-2.11.1.ebuild 1258 BLAKE2B 6b3d8dab29c80f5a4bb715b5935ca5144b85efca71c1094a30a1e969a381380b89e05c3b4c1a94706f4f9353c129b07364cf27c100149a5c2b2d28ec46b4d7eb SHA512 db495ae72d58abda661e34fd6d0298abde29081fe9b7c2fdddf4643d0b918ad26f656845cd86f1b9ab0b4a3b8a22055da5412708a76bcff7e4f8ac29e39d2c0f
-EBUILD PyPDF2-2.11.2.ebuild 1254 BLAKE2B 2236bab094856c6a47ef77e2c33fb87c16970d7bbb3f380da46e3fed82c4eec2bc83244c01c0a74b6c42be9c719adb79f57f2d5394f82b2dced6fabbe1fa6bb3 SHA512 f3aa97cc651ac8e60a48231595a85f6a7877aa0699e35ecc2562d5930060ff9766648735b224f01a06cbf398b8c89dd5eed4f7ad4841c1a69dbe933886d86d3a
-EBUILD PyPDF2-2.12.1.ebuild 1254 BLAKE2B 9e0d343d4af12fbba799487a8b3aae62ed4700c0e14eb34b1a9e93aea9aa73a66076c2268e84baeda3e8ecd155bfbc591bf9ab1ca7a85a591917ed302154c262 SHA512 fba59eff20cede212484b7aa06f9b6ba8c9a701e9e7503eb2e0b864ec742470642ae4c8d2f1cb7c29ce02e9fd25b07ee689d517fbeba197391eab7ca208fb7a9
+EBUILD PyPDF2-2.12.1.ebuild 1252 BLAKE2B b196714607c3d9b48cb1df119663805d6f3ee75c473296ef9ac369834fcff0119ff16b2b27fabf4872d180b3f9049f41387ab639242af2b71ed35182489080ef SHA512 a5259a8a2042f2dedf1ad0ed2115f274d7a3b51df12fa115eba48612181ef7aa67c85d0a93ec6b51176f40ab6705db447e9a4bb32addbb9d2342124cf0b99e49
 EBUILD PyPDF2-3.0.0.ebuild 1279 BLAKE2B e802e0c9a382376cd75ddb26ebbf4a388836665a207b203a13c9cb148859c33f94c7c1e7ef22a3c339d8b5f6380c0f8518edaecda7f9fa3b8a5d10c1c39ddb3f SHA512 1f720b13056f554330558c0bc5a36219567bdc6764e4451238fe4b0d5df941c1eb33698c974966f93d65075c460cf15127a2ea2da5321becfe1f50a6f2cf5bca
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild
deleted file mode 100644
index 6604847c81bd..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.11.2.ebuild b/dev-python/PyPDF2/PyPDF2-2.11.2.ebuild
deleted file mode 100644
index 6159dc70df6d..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.11.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild
index 8a2b2a6091d8..b845111f84e7 100644
--- a/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 RESTRICT="test"
 # 150+ tests require network, too many to deselect
 PROPERTIES="test_network"
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 8da511ccebb6..238b8adc9564 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.5.tar.gz 48610 BLAKE2B ea266c09965a6ee62e33d3970b145068271c9e1eb87839782e0100b5db2e90a0c002fc4d6f3d22ef9a5cb8c42a067bb45008b0392a0d8557bc6c5c9d77e6b75a SHA512 20eecd479ea757e3bf9855c7dafe0bbbc0cbc61be26509605a5c9a8026e54bb6e362069ecf4be74733dcf6eec154f6ed13933e334e4455b080e687abfd2659fa
 DIST PyQtWebEngine-5.15.6.tar.gz 48871 BLAKE2B af7c30a0d2e65e12a6eb4a2d3a40d72f94f16a5b4e509f9366be4bfb7d4358b27b3f9c0a7e4a2e7254d38950cbbd6bd4eb88e321949d4d9a44e6ea7e06c2f902 SHA512 f744fb0468ccbc79aad23d941c8e96d537ceeedfae215c7095dbf36b04b3dd042f0ff80aeca25a23715964b7d6db3bc80513f509d15c6dd6bd51e42a1a4e1975
 EBUILD PyQtWebEngine-5.15.5.ebuild 1704 BLAKE2B 20caac3cf4f12af2a1e92726adeac12c97fc658134f6fed6714ed4f1d4acd69d04e3dcc04de2cee2b7053ef4f3fbab5a84188e67d5120ac7f174d88ccb07f238 SHA512 bd84b09ecbed701ea7ff9e22efabc5883c798aaee150ca8f72ffd364cf243c2c19e0ef26204d3b2770ab8ec9246b900152636520c41c5ea9b43fce954b076247
-EBUILD PyQtWebEngine-5.15.6.ebuild 1707 BLAKE2B fae8a7183dd6bc937126a90f41abe16f2412e9a459f812194169924a1d8520e9c669f969e830d4f4319b9e25b15033b5faba6cde537df4389435fd8cfab5bdac SHA512 8bade6d7b4570386ed02f8e6f725a112378ebae60d16fd811294499ce170efb14981da6ea84c6f8ce7826db66106001d628eee4457f91004a6097ccdf5a01070
+EBUILD PyQtWebEngine-5.15.6.ebuild 1705 BLAKE2B c2d9f12f64ee63dc358a01f0d8a3918c3c982e32aec9c9cbb41daee709a72cdc24b6cf5515f5a1afd49da49a7d6e30e8c359aa9f97595e1523732906325efa94 SHA512 b7dfdd3dc70c5f9d193e0880372ddc05a1ef42d08f589fdf56c20e2565a4eb39693e1ad36ddbabc1689622364dc3a5b84e37894e0eb465a68d92e17670ca2ddf
 MISC metadata.xml 959 BLAKE2B 00163e3954184867c30d8e0bf102bf2fc68bcbbefb4169b2aad2521bdfe5f7e505c71f1e5ff82eaa20f0789b12c6d2812557809abf500c05527afc68ab66d38b SHA512 1d58825dbdb183fe56222b25844daa3d1d0fba14aa77674b8f6c3ec683e3c43f7f3173799b97d7aa3d2410e7f874d7386ebf23f9524b27710646ef5d7d1f8148
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild
index 9e5e1036b467..ee187ad44973 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 547fe1675116..6d7e73471fab 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,9 +1,3 @@
-DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
-DIST QtPy-2.2.0.tar.gz 51573 BLAKE2B 5db2be83c74fa241cbec6818fbf5b5a8ecf681fdb2813cd51b011342eb8f0f2463c0a9f251e791f6051fa3276ad1e502f7e51bf0dcd2d3192bd76d0119dc8b16 SHA512 b0e7696c7861942c16749dc5f5ccbfd038f7fc2b1defbf372885223c4100805cada9bbb2f5bdae1f1c642b52d480d6e0048e221d9efd3f3103da54e6e2bfd0ff
-DIST QtPy-2.2.1.tar.gz 52207 BLAKE2B c2fa3e7ab0bcb2fc5610bdbab57daa6e4bbbfa346f46fbba8dd9d5d9e592e4f7a2f54aa0cf7291222dca9c2db4b944abeff36513f044f86fce294b1d00261cae SHA512 9c0887880984aabcc2633ec7aa161726f295ff20c9c95db5bcd9121676e49017b8033412172b257ae29311a1d3fc42b9eb183cc48fe5d64c9a471211ec6fbc11
 DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6
-EBUILD QtPy-2.1.0-r4.ebuild 5251 BLAKE2B fbbb485a5703c749cb2b8f54618120c816cea37965400161c725eb4257ae152d6cade5105d81eea9c82cf978e1f84f7780c2df60ad8026fc66dfc1e6004fbabb SHA512 3ac53baabe109d68d2b42ce1574de34046239c1cff8abe5ae1b724a55b26a626bdae094c028adc485893a5c07a9144a0f8d7ec65836d474d4807716281e911ad
-EBUILD QtPy-2.2.0.ebuild 8343 BLAKE2B 538c9b28271cdb558bf2695fc13fd09087fd4692ffe381b447ac196c4ca86daf216bf7181341387e0a57365a4b7bfb7dea8f52312ad60f24a2d86694dff0aab8 SHA512 a81528f384166f73c634302c7f7481eb3d90e07716ca7adb225284eb619ee9b8d4d3d983ab3fabaf3c63cab83e300cfebc68f73f15d2c3313809bf97cb234a5c
-EBUILD QtPy-2.2.1.ebuild 8341 BLAKE2B 28f1a46ad0a7f06c17ebd230cc2fbbef5e89afa4ad5f1fd5436597823fa144f7bd6b8cd3eba88a4e32a824e2ccd494541ab3c21f0b40b84933aa09a95cd0ee4b SHA512 a07182b7c97911f537bed29503a70e528f2c840c54d19ff358daf5f9df806461f6b3da52f17e90d5cc1fbadc4c960ca80ff85ff383b87ee2b56ab4c123850be6
-EBUILD QtPy-2.3.0.ebuild 8356 BLAKE2B aa4f49cb918d96cbcf3a331675a2a46061ae9e414200fb145fae801493a3f41764fc0c5a282668851cb3d3d32bbab84d8eff21e12050ced35fe814279bedec2a SHA512 01271d57af646fda90c9885936af2312a8eb7792209226838745f339fe0ee4f11a4c95bfcdec10602dd92702cbb274523ed72d225cec8325ed0a9b3b6657ded5
-MISC metadata.xml 3206 BLAKE2B c5f30891361513c0f1242052e119558179485057e38bf41355c1bfff2de038054df314ea5a8c63616541c0c0f5b2f3835d74771cbc764047c8a5149529fa3598 SHA512 0eb58b11a04a1d55bf6496df37d05a1252a67ddf9ddeefba6642959f8c7ec243a32b587de9fc9507d56ac6eada5a5a5fd4e40b256ede0b0b02063151a4e386ea
+EBUILD QtPy-2.3.0.ebuild 8353 BLAKE2B ccbc256023dbcf33a3ce76e96ed087b31f26d13beec5bbb0c6a801ae2b34c9d49557bae93f72b034109a4d109cb8d64150a2f3323ebaaeb11b2eca68f4619302 SHA512 699ba1a0975e115639cf30c88ce711411f5ec9f8af9062d4498131c58a10e4bd8c124c4bdd0da1735f02441e5c94042c4ceb89647f9e3df47827a46d08ffa0bd
+MISC metadata.xml 2716 BLAKE2B 7c62f7b181608c56a8e9be69c05e2cb34e5f450682ea4e7ca6c4bff5f02cf4ff803d44dda356d2be3968464842d421b5ac7320fc4d08a430e7805f6e400a262f SHA512 62509ecf92f89453fea52a8c23accff778a5572b689428838d801470ab30f2e2cb85f9319a75afeb81c284d68fb2abe399714bb1410daa8ec896af1f17763347
diff --git a/dev-python/QtPy/QtPy-2.1.0-r4.ebuild b/dev-python/QtPy/QtPy-2.1.0-r4.ebuild
deleted file mode 100644
index ddebeff472ae..000000000000
--- a/dev-python/QtPy/QtPy-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="
-	https://github.com/spyder-ide/qtpy/
-	https://pypi.org/project/QtPy/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="
-	|| ( pyqt5 pyside2 )
-"
-
-# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
-		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
-		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
-		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
-		declarative? ( dev-python/pyside2[qml,quick] )
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyside2? (
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
-	# Disable Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}
diff --git a/dev-python/QtPy/QtPy-2.2.0.ebuild b/dev-python/QtPy/QtPy-2.2.0.ebuild
deleted file mode 100644
index 8886b6b5862d..000000000000
--- a/dev-python/QtPy/QtPy-2.2.0.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="
-	https://github.com/spyder-ide/qtpy/
-	https://pypi.org/project/QtPy/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +sql svg testlib
-	webchannel webengine websockets +widgets +xml
-"
-IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="|| ( pyqt5 pyqt6 pyside2 pyside6 )"
-
-# These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	concurrent? ( pyside2 only )
-# 	datavis? ( pyside2 only )
-# 	scxml? ( pyside2 only )
-# 	script? ( pyside2 only )
-# 	scripttools? ( pyside2 only )
-#
-#	location? ( pyside2 and pyqt5 only )
-#	sensors? ( pyside2 and pyqt5 only )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 only )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/PyQt5[positioning?,printsupport?,serialport?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?,xml(+)?]
-		qml? ( dev-python/PyQt5[declarative] )
-		quick? ( dev-python/PyQt5[declarative] )
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyqt6? (
-		dev-python/PyQt6[${PYTHON_USEDEP}]
-		dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,serialport?,sql?]
-		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
-		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
-
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
-		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,xml?]
-	)
-	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-		dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside6[widgets?,xml?]
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyqt6? (
-			dev-python/PyQt6[${PYTHON_USEDEP}]
-			dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
-		)
-		pyside2? (
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-			dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
-	# Disable Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside6; then
-		sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
-
-python_test() {
-	# Test for each enabled Qt4Python target.
-	# Deselect the other targets, their test fails if we specify QT_API
-	# or if we have disabled their corresponding inherit in __init__.py above
-	if use pyqt5; then
-		einfo "Testing with ${EPYTHON} and QT_API=PyQt5"
-		QT_API="pyqt5" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
-	fi
-	if use pyqt6; then
-		einfo "Testing with ${EPYTHON} and QT_API=PyQt6"
-		QT_API="pyqt6" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \
-			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
-			# Qt6Sensors not yet packaged and enabled in PyQt6 ebuild
-	fi
-	if use pyside2; then
-		einfo "Testing with ${EPYTHON} and QT_API=PySide2"
-		QT_API="pyside2" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
-	fi
-	if use pyside6; then
-		einfo "Testing with ${EPYTHON} and QT_API=PySide6"
-		QT_API="pyside6" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
-			# Qt6Sensors not yet packaged and enabled in PySide6 ebuild
-	fi
-}
-
-pkg_postinst() {
-	elog "When multiple Qt4Python targets are enabled QtPy will default to"
-	elog "the first enabled target in this order: PyQt5 PySide2 PyQt6 PySide6."
-	elog "This can be overridden with the QT_API environment variable."
-}
diff --git a/dev-python/QtPy/QtPy-2.2.1.ebuild b/dev-python/QtPy/QtPy-2.2.1.ebuild
deleted file mode 100644
index 3f6efa842b50..000000000000
--- a/dev-python/QtPy/QtPy-2.2.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt and PySide with additional custom QWidgets"
-HOMEPAGE="
-	https://github.com/spyder-ide/qtpy/
-	https://pypi.org/project/QtPy/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-_IUSE_QT_MODULES="
-	designer +gui help multimedia +network opengl positioning
-	printsupport qml quick serialport +sql svg testlib
-	webchannel webengine websockets +widgets +xml
-"
-IUSE="+pyqt5 pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="|| ( pyqt5 pyqt6 pyside2 pyside6 )"
-
-# These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 only )
-# 	dbus? ( pyqt5 only )
-#
-# 	3d? ( pyside2 only )
-# 	charts? ( pyside2 only )
-# 	concurrent? ( pyside2 only )
-# 	datavis? ( pyside2 only )
-# 	scxml? ( pyside2 only )
-# 	script? ( pyside2 only )
-# 	scripttools? ( pyside2 only )
-#
-#	location? ( pyside2 and pyqt5 only )
-#	sensors? ( pyside2 and pyqt5 only )
-#	speech? ( pyside2 and pyqt5 only )
-#	x11extras? ( pyside2 and pyqt5 only )
-#	xmlpatterns? ( pyside2 and pyqt5 only )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/PyQt5[positioning?,printsupport?,serialport?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?,xml(+)?]
-		qml? ( dev-python/PyQt5[declarative] )
-		quick? ( dev-python/PyQt5[declarative] )
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyqt6? (
-		dev-python/PyQt6[${PYTHON_USEDEP}]
-		dev-python/PyQt6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/PyQt6[positioning?,printsupport?,qml?,quick?,serialport?,sql?]
-		dev-python/PyQt6[svg?,testlib?,webchannel?,websockets?,widgets?,xml?]
-		webengine? ( dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets?,quick?] )
-
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-		dev-python/pyside2[positioning?,printsupport?,qml?,quick?,serialport(+)?]
-		dev-python/pyside2[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,xml?]
-	)
-	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,serialport?]
-		dev-python/pyside6[sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside6[widgets?,xml?]
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyqt6? (
-			dev-python/PyQt6[${PYTHON_USEDEP}]
-			dev-python/PyQt6[dbus,designer,gui,help,multimedia,network,opengl]
-			dev-python/PyQt6[positioning,printsupport,qml,quick,quick3d,serialport]
-			dev-python/PyQt6[sql,ssl,svg,testlib,webchannel,websockets,widgets,xml]
-			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets,quick]
-		)
-		pyside2? (
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[concurrent,dbus,designer,gui,help,multimedia]
-			dev-python/pyside6[network,opengl,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,serialport,sql,svg,testlib]
-			dev-python/pyside6[webchannel,webengine,websockets,widgets,xml]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
-	# Disable Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyqt6; then
-		sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside6; then
-		sed -i -e "s/from PySide6 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide6.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
-
-python_test() {
-	# Test for each enabled Qt4Python target.
-	# Deselect the other targets, their test fails if we specify QT_API
-	# or if we have disabled their corresponding inherit in __init__.py above
-	if use pyqt5; then
-		einfo "Testing with ${EPYTHON} and QT_API=PyQt5"
-		QT_API="pyqt5" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
-	fi
-	if use pyqt6; then
-		einfo "Testing with ${EPYTHON} and QT_API=PyQt6"
-		QT_API="pyqt6" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \
-			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
-			# Qt6Sensors not yet packaged and enabled in PyQt6 ebuild
-	fi
-	if use pyside2; then
-		einfo "Testing with ${EPYTHON} and QT_API=PySide2"
-		QT_API="pyside2" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
-	fi
-	if use pyside6; then
-		einfo "Testing with ${EPYTHON} and QT_API=PySide6"
-		QT_API="pyside6" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
-			# Qt6Sensors not yet packaged and enabled in PySide6 ebuild
-	fi
-}
-
-pkg_postinst() {
-	elog "When multiple Qt4Python targets are enabled QtPy will default to"
-	elog "the first enabled target in this order: PyQt5 PySide2 PyQt6 PySide6."
-	elog "This can be overridden with the QT_API environment variable."
-}
diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
index 5f7066c51d79..e111f74f6011 100644
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 _IUSE_QT_MODULES="
 	designer +gui help multimedia +network opengl positioning
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index c28298ab205e..e748334bb8e6 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -19,11 +19,9 @@
 		<flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt for Python implementation</flag>
 		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
 		<flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt for Python implementation</flag>
-		<flag name="declarative">Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
 		<flag name="help">Pull in bindings for the QtHelp module</flag>
-		<flag name="location">Pull in bindings for the QtLocation module</flag>
 		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
 		<flag name="network">Pull in bindings for the QtNetwork module</flag>
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
@@ -31,9 +29,7 @@
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
 		<flag name="qml">Build bindings for the QtQml</flag>
 		<flag name="quick">Build bindings for the QtQuick</flag>
-		<flag name="sensors">Pull in bindings for the QtSensors module</flag>
 		<flag name="serialport">Pull in bindings for the QtSerialPort module</flag>
-		<flag name="speech">Build bindings for the QtTextToSpeech module</flag>
 		<flag name="sql">Pull in bindings for the QtSql module</flag>
 		<flag name="svg">Pull in bindings for the QtSvg module</flag>
 		<flag name="testlib">Pull in bindings for the QtTest module</flag>
@@ -41,8 +37,6 @@
 		<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag>
 		<flag name="websockets">Pull in bindings for the QtWebSockets module</flag>
 		<flag name="widgets">Pull in bindings for the QtWidgets module</flag>
-		<flag name="x11extras">Pull in bindings for the QtX11Extras module</flag>
-		<flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag>
 		<flag name="xml">Pull in QtXml module</flag>
 	</use>
 	<upstream>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 3e82f5b8aad5..2685565adfa3 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,3 @@
-DIST astroid-2.12.12.gh.tar.gz 437277 BLAKE2B a1f549db526b1012e76e1da480e779a35971e8985f452eaf5ce1bc6735c5210db5c2282685dbaa2f1720a1e1fa6cf6f2152fbb8c782243cd11e09acc427774da SHA512 61047c1aa31b5b0a80c604194a91341c474062e2f1094316ff9b03641ecfe3ddf25b4a3b26356561f9c16d8b5599694ecef275ce5846792a18bcc0a7ad3e720f
 DIST astroid-2.12.13.gh.tar.gz 437906 BLAKE2B c00462d44c9705dc5b46fc52915e6a44e53e840d5326427d235c9156bc4de58b184271338ebc10a4572e1aace8d4ababd3bd7e440a6ee585aa66d15dfe4117be SHA512 16d062b1a619663b157c4753f1744e56e7d0ef7cace12660feb7f6bc540e54be02638b52c1c877d3eb514e2d7423c4afc71e7d5464880bfd3724ff7ae6d7b90a
-EBUILD astroid-2.12.12.ebuild 1809 BLAKE2B 989055cbea9fa3c74f80b54efe69005c1d9f802aa9c0b6c91105ed77dbafd3406e955e98c4acd8b51a5dfc5126bcef001fa00a8d6dce186cb8011ffcb1cd7a07 SHA512 46c0adf7b503d3716baadad6fc9fb1fe61dff5ca4e11c5225354cdd57b0afb1a05e66a8650dff8e76fdd45062e16ba89c639e24405238c175e6e715b4a3a313f
-EBUILD astroid-2.12.13.ebuild 1824 BLAKE2B 89fa12a7feedfccf2fc90529c9afc6f444b6ee67bf6e9ca16471bb398e4c41a86c177f9549f7dfa86756dfd7bf98fca37cf57ba251621fd3633397ab8a500333 SHA512 e5f9532d03759c36915b13283328b502363f641f06733176fcf5025713cf22230c055b701e0b573f5ce5a61cdfcf729240428bc3218f466894182d7f7fd70d80
+EBUILD astroid-2.12.13.ebuild 1816 BLAKE2B f1f21f45a5b36043905eebd5153754d0a4feb88b05813052898b70379ddbb7350be1440a8a7fec3209f1a664f71dd83e46948283314fa1697e2189ac12d4ef65 SHA512 5042ae5ad74caa9736d55880f623e6d73893de397bf1e594dac9efef4858320ccaecb26c9fbe8fdf905c8c9612a995795af7b7f7c949fe83f8a3c73046577760
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.12.ebuild b/dev-python/astroid/astroid-2.12.12.ebuild
deleted file mode 100644
index c357b7dfaa59..000000000000
--- a/dev-python/astroid/astroid-2.12.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.13.ebuild b/dev-python/astroid/astroid-2.12.13.ebuild
index c9ac52902d32..0d3a355f0dcf 100644
--- a/dev-python/astroid/astroid-2.12.13.ebuild
+++ b/dev-python/astroid/astroid-2.12.13.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/autocommand/Manifest b/dev-python/autocommand/Manifest
index 6abdd2a5d939..adc46c42d8aa 100644
--- a/dev-python/autocommand/Manifest
+++ b/dev-python/autocommand/Manifest
@@ -1,5 +1,3 @@
-DIST autocommand-2.2.1_p20211118.gh.tar.gz 22093 BLAKE2B 186062c0234fc0cc553c5d2a474a5fef46e0de25de8220228715265630fc95ed5f9b64321131322af71fadcc70ef79690652cd555a908b4e8628603a8ee494b2 SHA512 488228c7536f00ff9fbed99677440bfd7228aa64189bbcfb6aad7a92dc698d8283dfbd619ffeaeef883b0e600a90e2a0f56fa79958f144ce673dff53f8d59f89
 DIST autocommand-2.2.2.gh.tar.gz 22188 BLAKE2B 757fd96d0505466e7d3e371e13e931d0dd20d9b02da3e88c2bf85b1b946ef6c67fb14366856fe66c23adab5d635c4bd08d51acc7e55830636cce5aa0a0c265bc SHA512 5ed109db16a0e309ed5107b26db0b70ed8669d73817e82eb5a219650d29f53785aa1f9471b2ac71d21dbffc9f0a13ea0fdf69e63ab534fd84407a1d6741cf5b5
-EBUILD autocommand-2.2.1_p20211118.ebuild 702 BLAKE2B d2f27bc8796fad99781c28694abcec3a496f53e7b859b05d7336b45bc739443029f446d4b1e5c22c9c82fbcc83d883b95ca99d95847bffd21ee2b559594fcc15 SHA512 687c1136b7efd25161331c5aede215c0dc18eebc6cd96dcbb9a6e0a8725cb467184b94da1150c10b4300becdcba7c96dc12136a92b0630f3d982c613efcae8ca
-EBUILD autocommand-2.2.2.ebuild 628 BLAKE2B 40afc227cbbc513f76252e29b2ea6e179b7e40047550574f4a48dffae63d48d04f23fc418579ee6c379a66cfc4366670fac6b5bcda3b982f3dec9f044c152b7f SHA512 679dc9bec12c3899d36fe0edeffe83476aa397f1ff3522b7f6c7930461a3544365553bf19092ee81eff74358a7b77d2ff564684b2cad8f7d0abfef7e51077ccc
+EBUILD autocommand-2.2.2.ebuild 620 BLAKE2B 0b696fb90e4f295c79608cf1719051af4e4b88d33a4bb8fd4fe8e63c712ae244ef48fd40d5c9d634077ff369197d8c2c95b6bcc922e1ad1095d63d21040d77e7 SHA512 35563e8ef4421f90a838c7420475dbc5f1fc045354ef795d5ad31201fd27bd32b55ccbd3df2ab96b4f81e865240684c9c0a13e84bfd8869df74a2f47c98e572e
 MISC metadata.xml 400 BLAKE2B 95ed35eafef6d3e0b7535b90e4d3d6f4972ad285decfb2b8a74b118f30899aabf883399ece61272713bcea1a20d0dc56447fab6ac6c11b05c23f542a1a4074b4 SHA512 2d74432fd9281403f4ca70f5b44bdea14a87bb63f70b3b5a53cd4bd5ba1c9b8af64968e351b0605adaeec0bcf9424902c8df821606b54559b6932226d17e6405
diff --git a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild b/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
deleted file mode 100644
index f13639375617..000000000000
--- a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-COMMIT="031c9750c74e3313b954b09e3027aaa6595649bb"
-
-DESCRIPTION="Library to create a command-line program from a function"
-HOMEPAGE="https://pypi.org/project/autocommand/
-	https://github.com/Lucretiel/autocommand"
-SRC_URI="
-	https://github.com/Lucretiel/autocommand/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autocommand/autocommand-2.2.2.ebuild b/dev-python/autocommand/autocommand-2.2.2.ebuild
index 6cae5f6f33a5..ff16aefc98de 100644
--- a/dev-python/autocommand/autocommand-2.2.2.ebuild
+++ b/dev-python/autocommand/autocommand-2.2.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index f28ffdae0243..9945544a9a4a 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,6 +1,4 @@
 AUX certifi-3021.3.16-use-importlib.patch 6291 BLAKE2B 6ab0b3586c87564e5f92f18a2a9f8f449959962105dc2d0ee348f53d42cad93b0c23c102fe57c224eb449771f0139c38561d14a8fe666dac5666c8be452fad3c SHA512 80d92dbf505f5a4a6372a77e79299cbb9afd7a0770c66c197045948d50d249276e954b09ae36d7c6fef6be4033c775ba096bdae9319286af1c603af33738362f
 DIST certifi-system-store-3021.3.16.gh.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668
-DIST certifi-system-store-3021.3.16.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668
-EBUILD certifi-3021.3.16-r2.ebuild 1374 BLAKE2B d38b75478478579e47e2318722fc870be0d69327960a7cc7e4eb2db86ae2c6baf3c08b36c0144d3bdfad31326d62f044fc8207c8fb32788a1616e22e40538b20 SHA512 59de47ac00ae7ce9fc36021c1bf784a8aec1886c3f037a9f206bfcaa19147ca0c9e72ab61e5bacf4c0e2074eb322a25ad8316e2e0a32e5d413046dc6f8d46b99
-EBUILD certifi-3021.3.16-r3.ebuild 1438 BLAKE2B 698d3843df1fbee5ddb96837e70869df5d10183c2ea15631cb95ed04abb583b36d4754e2dce8eaa1559784c37ccb4bfb40c1e60fb9bf567b9b35bd5669058d09 SHA512 3ee08168ff6c5b70cd66aae1f07e30f48a21ce98496f7d6bd2d1f54eeb62f2f3bafb1c09f9dfdf4f3870302458a77979cfa94e7e2608dcf672c15f080f847786
+EBUILD certifi-3021.3.16-r3.ebuild 1430 BLAKE2B 78b67c345e8b72065c460624320d696f8061f1098797d24d1c078097747e5a3d83a424f6ce2caad046e3ac6d273b6bf7f844c81428a4ea832518df7dcc9d6864 SHA512 d6872518a4a470103fa4e08f69a7d0aab218f1d36a971697613484e8ee96fb65bde9ee7622d2d66aa08b0971c7803112ad5d7c906433309b9f3689474f2d6ecd
 MISC metadata.xml 427 BLAKE2B 12dfba937658c8ecdf591eef8803d721aec4be7f4f78e819d8add5ea85b5b73a9c071ae8d79d7abcedf6876ea53ea5365a7fd9adffc1c04ac4738e9f05ef58af SHA512 b4a027b08e92241cd0eb000e3220eaa4008f3e7b49f52b00b4b6abeaf7d66cfc92597a9633e1e29ff98758f258678ae09c213d332614d3f94e003ff0e59ad74b
diff --git a/dev-python/certifi/certifi-3021.3.16-r2.ebuild b/dev-python/certifi/certifi-3021.3.16-r2.ebuild
deleted file mode 100644
index 279faf00eb84..000000000000
--- a/dev-python/certifi/certifi-3021.3.16-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 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=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=certifi-system-store-${PV}
-DESCRIPTION="A certifi hack to use system trust store on Linux/FreeBSD"
-HOMEPAGE="
-	https://github.com/tiran/certifi-system-store/
-	https://pypi.org/project/certifi-system-store/
-"
-SRC_URI="
-	https://github.com/tiran/certifi-system-store/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-misc/ca-certificates
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-EPYTEST_IGNORE=(
-	# requires Internet
-	tests/test_requests.py
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	local distinfo=( certifi_system_store*.dist-info )
-	[[ -d ${distinfo} ]] || die
-	ln -v -s "${distinfo}" "${distinfo/_system_store}" || die
-}
diff --git a/dev-python/certifi/certifi-3021.3.16-r3.ebuild b/dev-python/certifi/certifi-3021.3.16-r3.ebuild
index ca1efe706415..3b53984dd27d 100644
--- a/dev-python/certifi/certifi-3021.3.16-r3.ebuild
+++ b/dev-python/certifi/certifi-3021.3.16-r3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index b209ee56afd5..38feb9ba0d77 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,6 +1,3 @@
-AUX cheroot-8.6.0-remove-pypytools-dep.patch 2757 BLAKE2B 97628fd6590dbe41e34bf0b93bc1062c424097aeea26a86891e2d2fc049fb7ee7a990fc9b9d3dba9406bdd344e3c25cdd08907aaac11e64d78c73b3ccd9b3fa5 SHA512 ddc88d93c795ea25c56d0b2a1bfee1b0f9c900ec2594d69aa91c639575c86c1fb89accc95992587db76d5c4e438a34f2eceac480c60a5470aee5ecd996140e44
-DIST cheroot-8.6.0.tar.gz 134779 BLAKE2B 97d1a9bf0a8d72d3204972934aa3ac4c97246b413edebd9f38caa802a5343acc426f137addfdc0faec58f6af2d62bc22023e93b14e1b0b07f6be9ffb12e78306 SHA512 26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893
 DIST cheroot-9.0.0.tar.gz 152562 BLAKE2B 5f5dd172cfc8fdd1318b22fc27060444a34343b6b83bbda4bd40c16d7cb0568c356f5fd14b0a7cdc74895d6707077ec54fcae54fb29b0d16a7c06e2cd36b1ee7 SHA512 86ea0dd2cb4cde25f86b489b1d0bb27e3e7c1ba5449759ccecaae689cdcb349b968fd0c8fb8bc8273deff5e32a078bf40f4342f0c5a1f53bb8d2b968f44a453b
-EBUILD cheroot-8.6.0-r1.ebuild 1872 BLAKE2B 4392d43c6eca572c07129963eef6d8ea0fed1a97dea212fe8eba15d1a12a9860e506a3ec1e41bc726272aae9a5228740ae8a02dfdb6b8e780c4bf8da3c5f05bf SHA512 d25b25098dd127bbf59f089b457599271e36eec82746e57b105934838133adab76fae1b65a7132fb129ac70eb62df4dbb982fa5e660e096ff0c75f3f05d68122
-EBUILD cheroot-9.0.0.ebuild 1969 BLAKE2B 0deffd50d152435a3171f587423f190663850c84184e0c9b7d5745949fd9af7bdef4c8f817ce4044b86e7f76e9573fab687a06341d4cd8c67c0b53a859a86d2a SHA512 58556ac85c2ae0d2e0eb9a264806ea59af91fe646440ff11575b089e45f1f8427668b47edf5c556709a5dc859fac1c3f7a3f541509f1b6e08180f5102c11f6e7
+EBUILD cheroot-9.0.0.ebuild 1963 BLAKE2B 1bf883cac118a36e88f73105443918a7070248104e949e47224f4becd83fd10516005482663186c8788fcc8a477e0d53beea00bc36467b7a8d5eea3012ee1357 SHA512 26007638964aa07b39911ae4d83a9a158cc96b6ee48d188cb14d643c6d710b6bd39bd639f4cd80abf10ee4d71b2934fadf56500cc9574a377a147c2a7e3b9cd0
 MISC metadata.xml 391 BLAKE2B 1c9c2af2c1a8bcd3f1c426a87d1a2a97fb88a9a30f9c2f1802b8885329277fcfde1deadf635e419cd7f85a5685639709be33aa746d9f7a04c3ac7d832d084b42 SHA512 c194e8bed8d082ed4ce3f2a7f608085fdcf2ab8b7c730e5c6ad7438cf177ed1892565cdff0feda564681f59bf6aefc327e3d24da0a543c0f043934af27873e95
diff --git a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
deleted file mode 100644
index d3a9411fde90..000000000000
--- a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy"
-HOMEPAGE="
-	https://cherrypy.dev/
-	https://pypi.org/project/cheroot/
-	https://github.com/cherrypy/cheroot/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	# Bad dep (upstream gone, only PyPi package, has py2 code, etc)
-	"${FILESDIR}/${PN}-8.6.0-remove-pypytools-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
-	then
-		EPYTEST_IGNORE+=(
-			lib/cheroot/test/test_ssl.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/cheroot/cheroot-9.0.0.ebuild b/dev-python/cheroot/cheroot-9.0.0.ebuild
index f16d3e17d8a7..18b5c59a86b6 100644
--- a/dev-python/cheroot/cheroot-9.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-9.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch b/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch
deleted file mode 100644
index f1f4fac26557..000000000000
--- a/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
-index 8305c78c..39e4e066 100644
---- a/cheroot/test/test_server.py
-+++ b/cheroot/test/test_server.py
-@@ -16,7 +16,6 @@ import requests
- import requests_unixsocket
- import six
- 
--from pypytools.gc.custom import DefaultGc
- from six.moves import queue, urllib
- 
- from .._compat import bton, ntob
-@@ -330,8 +329,7 @@ def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
-     ),
-     indirect=('resource_limit',),
- )
--@pytest.mark.usefixtures('many_open_sockets')
--def test_high_number_of_file_descriptors(native_server_client, resource_limit):
-+def _test_high_number_of_file_descriptors(native_server_client, resource_limit):
-     """Test the server does not crash with a high file-descriptor value.
- 
-     This test shouldn't cause a server crash when trying to access
-@@ -363,18 +361,6 @@ def test_high_number_of_file_descriptors(native_server_client, resource_limit):
-     assert any(fn >= resource_limit for fn in native_process_conn.filenos)
- 
- 
--if not IS_WINDOWS:
--    test_high_number_of_file_descriptors = pytest.mark.forked(
--        test_high_number_of_file_descriptors,
--    )
--
--
--@pytest.fixture
--def _garbage_bin():
--    """Disable garbage collection when this fixture is in use."""
--    with DefaultGc().nogc():
--        yield
--
- 
- @pytest.fixture
- def resource_limit(request):
-@@ -400,32 +386,3 @@ def resource_limit(request):
-     finally:
-         # Reset the resource limit back to the original soft limit
-         resource.setrlimit(resource.RLIMIT_NOFILE, (soft_limit, hard_limit))
--
--
--@pytest.fixture
--def many_open_sockets(request, resource_limit):
--    """Allocate a lot of file descriptors by opening dummy sockets."""
--    # NOTE: `@pytest.mark.usefixtures` doesn't work on fixtures which
--    # NOTE: forces us to invoke this one dynamically to avoid having an
--    # NOTE: unused argument.
--    request.getfixturevalue('_garbage_bin')
--
--    # Hoard a lot of file descriptors by opening and storing a lot of sockets
--    test_sockets = []
--    # Open a lot of file descriptors, so the next one the server
--    # opens is a high number
--    try:
--        for _ in range(resource_limit):
--            sock = socket.socket()
--            test_sockets.append(sock)
--            # If we reach a high enough number, we don't need to open more
--            if sock.fileno() >= resource_limit:
--                break
--        # Check we opened enough descriptors to reach a high number
--        the_highest_fileno = test_sockets[-1].fileno()
--        assert the_highest_fileno >= resource_limit
--        yield the_highest_fileno
--    finally:
--        # Close our open resources
--        for test_socket in test_sockets:
--            test_socket.close()
diff --git a/dev-python/click-help-colors/Manifest b/dev-python/click-help-colors/Manifest
index aadaa63b5ebe..45f6b4732573 100644
--- a/dev-python/click-help-colors/Manifest
+++ b/dev-python/click-help-colors/Manifest
@@ -1,5 +1,3 @@
 DIST click-help-colors-0.9.1.gh.tar.gz 101042 BLAKE2B 0f40d6d15f8e0a4647212f57e071c49b66bcd2b3d7ef582bd7d8a14135e50028f3ceb07987b5b74a868d998c12886a711f40e1d85b541566c63dca39e43a907d SHA512 ac4ce56ab249f7b98f670a6624700109f20a7c666e006b891d5c9fd4977512a0c94d82f6b43915952179abc946899f85fa1d358cd3d59508ef341ba22d8fc745
-DIST click-help-colors-0.9.1.tar.gz 101042 BLAKE2B 0f40d6d15f8e0a4647212f57e071c49b66bcd2b3d7ef582bd7d8a14135e50028f3ceb07987b5b74a868d998c12886a711f40e1d85b541566c63dca39e43a907d SHA512 ac4ce56ab249f7b98f670a6624700109f20a7c666e006b891d5c9fd4977512a0c94d82f6b43915952179abc946899f85fa1d358cd3d59508ef341ba22d8fc745
-EBUILD click-help-colors-0.9.1-r1.ebuild 645 BLAKE2B 6f9e105eea23af1d896ba8e728269e48da32e884d5724407b38e15bb31e15e015d9aad3dc703554cdea1a7151ce72037256b1721022178951a2d6ec514454512 SHA512 9995b9eb5362ff2249bdfc9b0127ed2caac2a2c32413058c16018747687a6bd06ac8b81670bbd8d4d3b1bbefd5ab3a4c70a31a9607c60fb413abf0d625124dbb
-EBUILD click-help-colors-0.9.1.ebuild 608 BLAKE2B 9825e4a7009c9b7c89bc308d1097c0ff4f6b1a03d7577ae782e6c887efeec096cd1d81fdd6ddf2ca91e72c54c136aa5a8c1bc0a5a2c9526d4d48472a29dddf8e SHA512 fe2b78986e092fc54215abfb86baf2d105968c558b74abae01b8ec94f05f9c86db628a6310e06c39fff71f56cae4f75b15c08274c59db83828e90863758c80f2
+EBUILD click-help-colors-0.9.1-r1.ebuild 644 BLAKE2B dede3e8b17201e70102138ec88e07bd8c1f56d7d6598cf59d10abe9aadf9a902747b8e5ada4fedeb16d82a5061ead2431bbdfd3bf3adaf9f5af29a79e61d089c SHA512 20018dd7621d3bb54dfa0c989959343a658e099ef15d88c2f8a157490dc40653267f5b6b5af32f223696b0a6a9e081a3c008eda3899cb2875e70aff57dd71f19
 MISC metadata.xml 522 BLAKE2B c281d2270d2e8389fcf83ece941af24a414107601d4c840731fbe952d73d71c32fd26276af21fa5ba4b2bdec0f35ef77a94a12a3239c1f053f50c9aff3e90d7e SHA512 45b82c348eea430dda7453b265e152f1d60d7a3aa17365b8d86ad57d17943ad7d44d5029504636e56c0b437a32e12f6e9c446d5fc6bb70fa72c72108b538f143
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.1-r1.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.1-r1.ebuild
index 485d4219691e..d766c22954c6 100644
--- a/dev-python/click-help-colors/click-help-colors-0.9.1-r1.ebuild
+++ b/dev-python/click-help-colors/click-help-colors-0.9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
deleted file mode 100644
index 7cd65645a02b..000000000000
--- a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Colorization of help messages in Click"
-HOMEPAGE="https://github.com/click-contrib/click-help-colors"
-SRC_URI="
-	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="examples"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 0787cf2c445f..c4bc5676d3d1 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-DIST cliff-4.0.0.tar.gz 82758 BLAKE2B 47bc6d15426208c35582e852b7c52620b4fde292f2cc8bba1ba18ca01ef0cb3eda442ec406d2da7abb525fd659e055d08fa64c390a2274a8eea714489435957d SHA512 2886c2697c81c640cd3909c7e00fa50b0e39ed3824c8594d45af30e876cbfa73161be35c668c9bf964a5716bbb2b6e0cfef69526346e1d35156b5dbc24a7dc06
 DIST cliff-4.1.0.tar.gz 82892 BLAKE2B 2d4da66ca6ba86c9f0f33fa36f637363a25ac0ea5c7a1561a4e682769e7ecc97525fca93fde0597062e8f23c4d3334fbf08a305f1c5bb15918e5752a45992d0e SHA512 4bab3404207d21cf8111a6dc1a0ece2c8da5d3bf5ee261b351b7b7ade73f162c4cea225be6fac7444ae95de70d3079e727086fd954fbf56b6d61fb1c7eb4c44a
-EBUILD cliff-4.0.0.ebuild 1167 BLAKE2B 8112e1adc286394be327ff1b8518d06a665bb6ce66dac278fef8f24f5cfaedf4592b9a1ff05a734a2ece7f97ca54d04a050ccc152daa2e57ee53ec9aa14d0bcc SHA512 49df5cc5958ca2d6880be834ca2b32f299f01782f95f37fc121291aabf769c66a898fee027166540500c83dcecc96d62c204b2c73ecd18881cbf3e79befe204e
-EBUILD cliff-4.1.0.ebuild 1171 BLAKE2B 2a1a8b33053d5dc861fb8668fc8d099d95478f056ba5aaffb445d1f01879791220cb6c62853c4db5238529c7e24f1997f8975ebb8824af5192108da760f8d757 SHA512 c355ee124cf3ebc71028c2b0bf4a896c8d2c2aafb3c162ce8953f333272a28ee816cab5e83b51f77a2e01388382cf4be9c4d29de068b52410ea453d2503fc5f8
+EBUILD cliff-4.1.0.ebuild 1167 BLAKE2B 8112e1adc286394be327ff1b8518d06a665bb6ce66dac278fef8f24f5cfaedf4592b9a1ff05a734a2ece7f97ca54d04a050ccc152daa2e57ee53ec9aa14d0bcc SHA512 49df5cc5958ca2d6880be834ca2b32f299f01782f95f37fc121291aabf769c66a898fee027166540500c83dcecc96d62c204b2c73ecd18881cbf3e79befe204e
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-4.0.0.ebuild b/dev-python/cliff/cliff-4.0.0.ebuild
deleted file mode 100644
index edb87d420f38..000000000000
--- a/dev-python/cliff/cliff-4.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="
-	https://opendev.org/openstack/cliff/
-	https://github.com/openstack/cliff/
-	https://pypi.org/project/cliff/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-4.1.0.ebuild b/dev-python/cliff/cliff-4.1.0.ebuild
index 8bf1ddb73cae..edb87d420f38 100644
--- a/dev-python/cliff/cliff-4.1.0.ebuild
+++ b/dev-python/cliff/cliff-4.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 9c1081256768..09f0cec7f252 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,3 @@
-DIST croniter-1.3.7.tar.gz 38853 BLAKE2B 2a05a023300a1e90824fdfe444eb1b2e43889c99d5b070329fc9f11c9e1807c4bb81a0c27c17d3aa92130d91c949e8515b76c7d927a5c583a3a86172f24be446 SHA512 c0157fc3d5b88ae66ee9871bc9e18b835a71f2fe85d66b9e92b05329652e150bdd823976a495b30e62050fa21d3353cffb090c8c99b74f79eba6dfa87ffcb11a
 DIST croniter-1.3.8.tar.gz 38982 BLAKE2B 2b28c7e4e991e9525f073a00ba3b346144ed6d353e95509c1fac47ddf56c645edaaa3927f8ca6615a94d37cd6926c26cd1514a25520a48b39c3028ef79ac0337 SHA512 c0216aedd594f07a9e2fef0f8f4406ad2037f1d4543f9414598e0f2ef81a61615554b1f779ce4e75d36cd5e80def3a29ee57e88c15d5d70da06ac2b861ead5cf
-EBUILD croniter-1.3.7.ebuild 656 BLAKE2B 97a74e04cbb2025661b8a3becbadf2c677061c34fd68bcf9fa5fb7173f4e04d77fd60e3802443fef041509a133838d62c3742dbc605160076cd18a26d86bca7b SHA512 ff46fc214548e114a89e8058881110b5de3924c27e4c2a977df0c6bcfdacd36fa37d5ebae331e9a4e40ddcdc6c6580a30155aa72a11239278f7e6bee11c6ecef
-EBUILD croniter-1.3.8.ebuild 658 BLAKE2B f4b5903279a33bd4546722b60e0d19345cd95aaae5397305b1cbd24e2aab0a612fe662f85f110e5aec6bed70b43e1e2f4d5d4dbb5107ba5a9316fbedd529b7b0 SHA512 6b8bd7c0059d957d3b07185312871c921e8a3d5fe3dc407f3d701ec4787bd1a407b7d6596eb5b342a035cabc075f189631fe3b87cddade13fef83811eb968842
+EBUILD croniter-1.3.8.ebuild 656 BLAKE2B 97a74e04cbb2025661b8a3becbadf2c677061c34fd68bcf9fa5fb7173f4e04d77fd60e3802443fef041509a133838d62c3742dbc605160076cd18a26d86bca7b SHA512 ff46fc214548e114a89e8058881110b5de3924c27e4c2a977df0c6bcfdacd36fa37d5ebae331e9a4e40ddcdc6c6580a30155aa72a11239278f7e6bee11c6ecef
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.3.7.ebuild b/dev-python/croniter/croniter-1.3.7.ebuild
deleted file mode 100644
index 5fedffe476ce..000000000000
--- a/dev-python/croniter/croniter-1.3.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.3.8.ebuild b/dev-python/croniter/croniter-1.3.8.ebuild
index 07402f10627d..5fedffe476ce 100644
--- a/dev-python/croniter/croniter-1.3.8.ebuild
+++ b/dev-python/croniter/croniter-1.3.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 7785d196a9ac..16b6d0f3047d 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,10 +1,5 @@
-DIST dask-2022.10.1.gh.tar.gz 8781108 BLAKE2B 2030cf0670d054a222123ef836573ae7f5e574a879089a57b9a7730ae5cc33e43da2af3b470ce24174169f9045415cf71543aa05fd368b4471111a01982c5b7c SHA512 58b5515be46086a02a895f97db7120423a51651dcefef6f14d631a719e4faa0315b7a32640e4cd823064ae754319b84cc7c74bb4d4e9d904177816115abc48e5
-DIST dask-2022.11.1.gh.tar.gz 8223813 BLAKE2B 1c7f4ed26022673ebb3a337520eee4cfb6c48449c06bfc1906431de6f03b4a4df313630326f96cf5ef8aefdc1306ded21158946997d9cf79153f7d83659575bd SHA512 c954de12d512e5be7d4891e9e702ae21c69e42be703e3859bb2d6893dd600fc7255ce25677bfdf9e119f84450510877ce018ac8ef425291fdf90c04af169e2e7
 DIST dask-2022.12.0.gh.tar.gz 8226972 BLAKE2B 56def762c1899df9b355f54484b77cfde125e85287db488388130c92b388f014b7ddf8ccd4614918a5c6a15513c7fab207b4c2231105880a893af32e768ed675 SHA512 bc29f3735fb977a5b523d7ffbf55a99fd7a386388f1ebec3c44196d3b6870393163e023a2c64f1f8e7b8aae5342b9b0041a6628df72d14a0127513acf7f6c529
 DIST dask-2022.12.1.gh.tar.gz 8233697 BLAKE2B 90caeb7a8a9abc03b035c787ae2f26d5dacbd8da9314b65deb7c38e1990a7d3067b4066c8f2bbb6d8179d03af471374df28e511f000097cb7b031e692e72ccd9 SHA512 1945f5737de55c559aff14c67efeee00afef18ff5dbdc07aa79affd89eb45a0808078bbc7ce24c904168e7c7a74a678a8dc90ed129593777dd25598cb45372b6
-EBUILD dask-2022.10.1.ebuild 1779 BLAKE2B d7794dc3a690c8742b885b288c7600e2696246f9614f7c7f17f033f43ca864c5b22377d4c1d9a628661206b0765fdd0dbeed53d4d6cae31970dc30f3ec34dbc7 SHA512 6b49452b4764b0585bca056eacce39e41390c1de9844187466ed2e97ff23bef9ad19fc8eb8222d5abf545c125a7d39cff4916ff890b09d0dd7e177ccba01e4ed
-EBUILD dask-2022.11.1.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
-EBUILD dask-2022.12.0.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
+EBUILD dask-2022.12.0.ebuild 1779 BLAKE2B d7794dc3a690c8742b885b288c7600e2696246f9614f7c7f17f033f43ca864c5b22377d4c1d9a628661206b0765fdd0dbeed53d4d6cae31970dc30f3ec34dbc7 SHA512 6b49452b4764b0585bca056eacce39e41390c1de9844187466ed2e97ff23bef9ad19fc8eb8222d5abf545c125a7d39cff4916ff890b09d0dd7e177ccba01e4ed
 EBUILD dask-2022.12.1-r1.ebuild 1781 BLAKE2B 819d3197a8db6e83ad410c837d68864fe023039072b7b7cf89fd3ab4972e4da7102a8673df9cc50c25234e982f973f3fb73346d568c31f0c879c823ffae2d613 SHA512 3f46b4680fb6078ea54c9c5bb2764601cbaf01d5d98159e7e174580668766414cfb730e0fade70fd9d7452011ab9d085fe369e977fc4c9f3a2d8f8d744719406
-EBUILD dask-2022.12.1.ebuild 1780 BLAKE2B 24148b6128c95f1b700b3a5f1d53cf1e05147bc234a7092d8d64991c99af531e18664e413d4c35124f6062a25f32da5112846297650c54d719f48a5aa7cd3761 SHA512 559f6e575414a68c1e2db39a355120abd40d60d17ac9bda60919d508e0414776c5a0abeea2e70adf6f19a6039edf101dd20cbccd9079b18cc2b7dcef9f6ad767
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2022.10.1.ebuild b/dev-python/dask/dask-2022.10.1.ebuild
deleted file mode 100644
index 3944d63ad468..000000000000
--- a/dev-python/dask/dask-2022.10.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.11.1.ebuild b/dev-python/dask/dask-2022.11.1.ebuild
deleted file mode 100644
index 8f2f893b8e30..000000000000
--- a/dev-python/dask/dask-2022.11.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.12.0.ebuild b/dev-python/dask/dask-2022.12.0.ebuild
index 8f2f893b8e30..3944d63ad468 100644
--- a/dev-python/dask/dask-2022.12.0.ebuild
+++ b/dev-python/dask/dask-2022.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2022.12.1.ebuild b/dev-python/dask/dask-2022.12.1.ebuild
deleted file mode 100644
index 8f2f893b8e30..000000000000
--- a/dev-python/dask/dask-2022.12.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 05a95ce1af2e..a4f8f21527cb 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,11 +1,3 @@
-DIST setuptools-65.5.1-py3-none-any.whl 1232712 BLAKE2B 7ffda4e3e3e148a2ec55964ddb2a191710e6b5c8ec77c2f1af0cb2427992bce90c1fe309c916e404afe7cac8dcb87e8ef6351d0946432a455bdd91a9b6550884 SHA512 8fe0472001b1589caf81f1e0fe17777e524f003fc414d0a17a431209ba5aa8292741bdf13ae4346227afba2491099ea7369bf767ce621ef3fa38dda7b304b5c0
-DIST setuptools-65.6.0-py3-none-any.whl 1233669 BLAKE2B 7e373901fd822df571141422bb6ca308646383faff85d5e4cbae8907c1e7430045c28ac4b6492a12ca182122e83c8fbb8fdfa0c36d585166f9aa649b8b0d48cc SHA512 5184fcc94393b9f057bf49b5cc822304966c7e6391623b8c5de476f5c765a8d65e72c07a70422c6b7b77d634671808445c19e042cba9080f9d6f9c1a545e1bad
-DIST setuptools-65.6.1-py3-none-any.whl 1233954 BLAKE2B d1ab55e096017b496872ae19af0fd2cd1fa752cf1542c21ec81b8e40a1bf9e8bd4590555319617a987f70e5445af4c9eac560d53ec44e3f7b789fe7b110d9711 SHA512 bf3f45cb3d2a960bda66cc5620acf5660f5af1aac693d49a222f279786b9f2a508e2715de2d0abd3838c6253f21b5c74f8ff20bfa1e5d7265fbe95201e4cf95c
-DIST setuptools-65.6.2-py3-none-any.whl 1233954 BLAKE2B f6662473584fb9f63062d357ad08d764daf4a18818aea2085acd456ab0a60a63955c039b55c87ce5f7df191d983b081360b32f3741ce4d0404190d3d8fce9915 SHA512 f3f726268c62611b76c3c672859914080b22e6960c2ee8940dbf361a253cd92baaddab36e00d83cd67f9b86ad8daebde1c0304d61fc0b8bc43751da913b11c1f
 DIST setuptools-65.6.3-py3-none-any.whl 1233963 BLAKE2B 2bad02cc00293c9b6615cdcee9f2da4d66f83c494904c0467054ec15cb5650a7b72caaa52bb8925aea84eb6becd52107ba10763c2b241216d91072a1319f5d24 SHA512 6a9bf2230840ab90b228b433552e8813a176a9ad5f6dc74b20da412fe96c4a7f1df6095aac8dc2f25bd2393aae731927875eb9e7bc05203907539fb4a3b5c8fb
-EBUILD ensurepip-setuptools-65.5.1.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
-EBUILD ensurepip-setuptools-65.6.0.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.6.1.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.6.2.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.6.3.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
+EBUILD ensurepip-setuptools-65.6.3.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.5.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.5.1.ebuild
deleted file mode 100644
index 4dc09f674370..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.0.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.1.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.2.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild
index 96c75c915768..4dc09f674370 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 613429ac0c6b..17457df9f574 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,13 +1,5 @@
-DIST fakeredis-py-1.10.1.gh.tar.gz 91420 BLAKE2B a88711b5d167aafcf6a74dc538b809a0410c60bff95c82fe81c1236b743d9fc0cacbc9057bcd5df20ed87b22c12b2e9346342e0991556caa51f4e88038fabcb5 SHA512 2a139dde02c00e516959173fbfe5ecae26d20ee56158de9ae7bc57360dabc58e4e919f11ba7979079019d981af8a2cbd17a1d8ac795003e26a7cbcbedd5588a8
-DIST fakeredis-py-2.0.0.gh.tar.gz 112218 BLAKE2B 9bbbf76e6fe00a42d25c1688654906a71b93e65a20f3eca2b7d9fd13eedd48251e832e550b37dc82dcf5e65c686c408b291ba60d04c707df7d7d7f396f00190a SHA512 e291782f27cdfa11520eef3b0bbd0d68ec7479a4630ad1e5a38d8d1d28109049fee0288e104e74f72caf9b04db553cc24f22843bd170d8bdb5efc47b8e9f5d6e
-DIST fakeredis-py-2.1.0.gh.tar.gz 128595 BLAKE2B f0b2e8ed9ec4156702f4e65e683f40cf79e1fde12ac70b16388ba65e9e49c8f4c92ade6f02195cc3755768fb2858d7e4f8970f54fa728c9fb32ac8cc2f68fa4f SHA512 584a2a36185674d0fadedcc6018286c3edc8c36de730ac1cf09abcbe3b0cacf8dd0e4c964a7a0a053509dce0063f48ce13f122d230fbec9965af54c77b277ea5
 DIST fakeredis-py-2.2.0.gh.tar.gz 128817 BLAKE2B 8666427966e6a93cd33f521fbc38ecb9bb99e1c1a23506437d48bc6113f272aa89a465dc794b5130ef6dfa584f75f159fce0e3b6a50e5cb89b3bfe43ebcd89cd SHA512 857033a6362a6088cec715571d74a9aa1eb3eb8356ed904b10831540ce5be62d798a211d52fb3d8effab253e50fdb3f2a530d39bd722d8be357426f53fb41fe7
-DIST fakeredis-py-2.3.0.gh.tar.gz 130529 BLAKE2B 71faffa3953e40075cb7cae3b664eb81bd20715c28766678d21449de768c4e621703ceb7053e36f19a0c6561ea9b83097392886e0da306460c9ca75a0a99c3d5 SHA512 b0a07d04cd95abe69c658f67943afa5c07e6fa43a6e467762061e3c112aa9961f550f9fa5dccfe6f0fd5fb941253840c6cd7e76bce5f256bfb1a400e05252651
 DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3 SHA512 5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
-EBUILD fakeredis-1.10.1.ebuild 2000 BLAKE2B 339ce6cb90e8428fc6e9bfe9b6e8748a454584dfce88518ef4692ef6f1dd5b1109a294c73f3586e1fe5650d746a4debad0b468cbe1465b52cd8dfc310c2b1df1 SHA512 930598092f30e9a84752012377742a8a6926fcc9f41dd360f8345af4853653809e4a9ff8f52c0ad7d6f1c4e0035757c5782905cd25a16e8412503f0c0d7dfdef
-EBUILD fakeredis-2.0.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
-EBUILD fakeredis-2.1.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
-EBUILD fakeredis-2.2.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
-EBUILD fakeredis-2.3.0.ebuild 2084 BLAKE2B 055f7bc849ec4a58b6c7022824ea373f8fc919ca98682c3f5866b43a722798f9a1c7b21356a8d977ed102b51338fd6e5a3d715770ef1fe21e1134aa9b9e22c10 SHA512 523298b98b5b7a6be8bb2ffb9fb19a0a492205dc14574d1356a48e1d74c7e90c99d524b5ac0eaa6e34a8dd52f186091f2fe59667c28638b038e04c4a201b382b
+EBUILD fakeredis-2.2.0.ebuild 2000 BLAKE2B 339ce6cb90e8428fc6e9bfe9b6e8748a454584dfce88518ef4692ef6f1dd5b1109a294c73f3586e1fe5650d746a4debad0b468cbe1465b52cd8dfc310c2b1df1 SHA512 930598092f30e9a84752012377742a8a6926fcc9f41dd360f8345af4853653809e4a9ff8f52c0ad7d6f1c4e0035757c5782905cd25a16e8412503f0c0d7dfdef
 EBUILD fakeredis-2.4.0.ebuild 2084 BLAKE2B 055f7bc849ec4a58b6c7022824ea373f8fc919ca98682c3f5866b43a722798f9a1c7b21356a8d977ed102b51338fd6e5a3d715770ef1fe21e1134aa9b9e22c10 SHA512 523298b98b5b7a6be8bb2ffb9fb19a0a492205dc14574d1356a48e1d74c7e90c99d524b5ac0eaa6e34a8dd52f186091f2fe59667c28638b038e04c4a201b382b
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-1.10.1.ebuild b/dev-python/fakeredis/fakeredis-1.10.1.ebuild
deleted file mode 100644
index 41aa8a40dd30..000000000000
--- a/dev-python/fakeredis/fakeredis-1.10.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-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]"
-	)
-	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.0.0.ebuild b/dev-python/fakeredis/fakeredis-2.0.0.ebuild
deleted file mode 100644
index a75d02ef0771..000000000000
--- a/dev-python/fakeredis/fakeredis-2.0.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-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]"
-	)
-	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.1.0.ebuild b/dev-python/fakeredis/fakeredis-2.1.0.ebuild
deleted file mode 100644
index a75d02ef0771..000000000000
--- a/dev-python/fakeredis/fakeredis-2.1.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-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]"
-	)
-	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.2.0.ebuild b/dev-python/fakeredis/fakeredis-2.2.0.ebuild
index a75d02ef0771..41aa8a40dd30 100644
--- a/dev-python/fakeredis/fakeredis-2.2.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.2.0.ebuild
@@ -22,7 +22,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"
 
 RDEPEND="
 	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/fakeredis-2.3.0.ebuild b/dev-python/fakeredis/fakeredis-2.3.0.ebuild
deleted file mode 100644
index 731d97e0a6f5..000000000000
--- a/dev-python/fakeredis/fakeredis-2.3.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index d1ff33ca6ec2..4d5c22a7f3eb 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,7 +1,3 @@
-DIST flatbuffers-22.10.26.gh.tar.gz 2122181 BLAKE2B 26554240e71df9fafa814cd5c38253db89916ac2cfcf28dc33ed8ff50d73f0c09c97621eae3aeb028453098433a70277864500b99b23a9663264d3c596d46e2f SHA512 c0984fc4738516d0e4a1ddc66daf276b906d39239c4b70b14e194545d7fdeb3ce5ab34397309c16e916ff908a5483ab85283445394e5e14477259193c99ddf38
-DIST flatbuffers-22.11.23.gh.tar.gz 2170419 BLAKE2B 438fa631f00111fed8b8934852350e7b8d8147f21e38cbb28ce7f16fce6d53021ee8d660308cbefacf1038bbd384c67d64d4ddb318890f70b2ae951674956952 SHA512 9a8506688ea1fb55bf138e728aff0e64d79955dabc751c3c757b28ebbafd7f066722bf31f748c8e23e695850bec6c67b532a9673e018ec36868ac236c7f2e50a
 DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1
-EBUILD flatbuffers-22.10.26.ebuild 538 BLAKE2B ad7180c5d947fc9d11773287e65026addba75eef8cce545e71c6e47027840eb45537a473f7b6afacfed19f69a10833102b6d6e4e30a8470024be3383537d3827 SHA512 c048f9181d0c4b96ddf4c32ceddab7c7a7a23c1980225b82f6892cdc5e4b757727d6aa38e00203729410d841ac964ccfb9087e7f3280491968a0cdb1c0c93c49
-EBUILD flatbuffers-22.11.23.ebuild 542 BLAKE2B b21d6ec15ba5ddcc9bebcb7e8fbc99c1a566872b36bca62c8140bfa78d74e295f53f102741d9fe502bdeebe39593476120baf7a21cc15cf8b87203671580c71d SHA512 499fc8c7724cbade732bed01fcb59fb535170bf7a931b249813d2dbc3ee648fcbc37356ad14fcd025374e5b551ee7deb95354145233cc5f602281dc5c05a8b4d
-EBUILD flatbuffers-22.12.06.ebuild 822 BLAKE2B f6f74dc7ac2d6756949bea0edf82c4d650ff7028494c4eddc2f01a0f359c4b2f2dd06347ca4df820de155367c31e9189add0c044e4d7d1e1770be0179778f5b4 SHA512 278799b8bf040261c4fd9d4b6a79c18e28b4a3c35abbff9a59f8c632ba460aa7af9347b5feeaee773fdddeb8ea56703a2e5f4f500a029d56fbefb91ba7e10e6e
+EBUILD flatbuffers-22.12.06.ebuild 818 BLAKE2B 01c2247a6ff76158b02678ac7317acf5d24c52b56cd74d2b7dba17e737693a19ffda29893d4bac02f8c7846d150f6db023c0d07f553175f85a4121eace5f9c13 SHA512 478403037a7e81866f8eac52b1cb78d8d8ab0e6eb8b8f91b196f8f78736be3f2c0c747069828eda0f64eac5cb0f82fcaa1c21566f7a9615774a17dde4b4209f9
 MISC metadata.xml 503 BLAKE2B 632c797040e856e87b7875cb7820b97670f994bac90a3554bca2bfad492420972309fe48b190065b203d7b5be8030bf63fc9658d39c7e24f20fc5f3d8868a7b9 SHA512 76bca368c33e84e49c2ee8e742bb5012bec27fb033915c8c3bdb2957e9d8394e8f2c7fdcabf98770297f6e3489e6909f92755f681aab00218bf3705661b42c81
diff --git a/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild b/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild
deleted file mode 100644
index d39294f368aa..000000000000
--- a/dev-python/flatbuffers/flatbuffers-22.10.26.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-S=${WORKDIR}/${P}/python
diff --git a/dev-python/flatbuffers/flatbuffers-22.11.23.ebuild b/dev-python/flatbuffers/flatbuffers-22.11.23.ebuild
deleted file mode 100644
index 7705da0c72e7..000000000000
--- a/dev-python/flatbuffers/flatbuffers-22.11.23.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-S=${WORKDIR}/${P}/python
diff --git a/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild b/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild
index 96e548af349a..1d23dd5bb78d 100644
--- a/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-22.12.06.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 7e2b75395fe8..28b4c21d414d 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,5 +1,3 @@
-DIST icalendar-5.0.2.tar.gz 101104 BLAKE2B 2e442c8282d764d1985031ef47259094028ec4b86abd03fb226b5ff9ccf7db67ba583df042589e4585d5379cc6675fe1d08141a8129979a43485e51841bfd524 SHA512 830ab3ad8ab100743fbd19ed3823cf1e3d13a8d83188214670b75ed06ee624ce4d52495e31b3fb67495363125f33232a1bedae5fdec467e57566f4f67f591b87
 DIST icalendar-5.0.3.tar.gz 101431 BLAKE2B 4c98880f661c5cd8025e7e281dbd392ff9333c3a4c3850d7826cbbb15401d0916e24c1478ac3098c58709a065f3de21b7d8fea56ad7df40aec06b989a77deac5 SHA512 ee278a4776cbac3dfa99e8931fc48be49b06e3354689c8d5132ff53092edb913c24a61a69dac7f5de3defdb929a6b53374209d3f7a8dd5af53f414e5aadfa44f
-EBUILD icalendar-5.0.2.ebuild 1015 BLAKE2B 215e568a91ba34b61a865fba669f4a6dbe1ef15bbd972d05f4e4eae20502a7363708a36ef279dee651841fcd80007d223dee84d86035e705e8de0f3eb4ee2928 SHA512 2c954a2f3b4d5053cf284e1692753dfe305a496100ea5630f6ab1bce2e8d4ec23db22c57ebf8a5e14c2611f7c4aec284790cb6b7bd7455b4f0b69a55065082f9
-EBUILD icalendar-5.0.3.ebuild 1017 BLAKE2B b67fda0e16185d243a0989256bdd1342469293c0f127692e354bc2b3dfb8e0e797d87d2d4b02a597179b6c92ee50820eaaa15d98ecb3847b2cbb4ee8d31d94dd SHA512 da2af57bca5c43ba592151bd627afd8bc021f0d7649d2eee88af88c551cfd86d43439fd32f8c2d63f999793af9bb153d6985350e4d5be38ca5b8049bf5ee34a8
+EBUILD icalendar-5.0.3.ebuild 1015 BLAKE2B 215e568a91ba34b61a865fba669f4a6dbe1ef15bbd972d05f4e4eae20502a7363708a36ef279dee651841fcd80007d223dee84d86035e705e8de0f3eb4ee2928 SHA512 2c954a2f3b4d5053cf284e1692753dfe305a496100ea5630f6ab1bce2e8d4ec23db22c57ebf8a5e14c2611f7c4aec284790cb6b7bd7455b4f0b69a55065082f9
 MISC metadata.xml 503 BLAKE2B 284f63e95eb2d3015979a14774f8ff9df0df701b81f8aa2c7583f52d05973cfede1db8eb7904203b854165e10640cc50a0e3cf14d9aff090d9ff657c53098cee SHA512 d206db3c1255c8e475c4289c548f0224c7fc507aae513d3c15706998892ef8450400a97bd07dc7d52142a03cad4abae3595d5315d8912586440df74096edea67
diff --git a/dev-python/icalendar/icalendar-5.0.2.ebuild b/dev-python/icalendar/icalendar-5.0.2.ebuild
deleted file mode 100644
index 76308591c49c..000000000000
--- a/dev-python/icalendar/icalendar-5.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-5.0.3.ebuild b/dev-python/icalendar/icalendar-5.0.3.ebuild
index c68083d1dacb..76308591c49c 100644
--- a/dev-python/icalendar/icalendar-5.0.3.ebuild
+++ b/dev-python/icalendar/icalendar-5.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 161d3a1bf99f..dde1535f0f5c 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,9 +1,3 @@
-DIST identify-2.5.10.gh.tar.gz 101506 BLAKE2B e98d3d3ac1bed827041e9eb527dc45e252c71ad565aea226d335fa6ac5e280c8256a571cab620e579c4beb2d16fd1f6a103b53504116ac89342d1d0f5d80e7b3 SHA512 68ee7de92455565fa545e19ebe7b121ff7ffb2aecad0daf033292b0d97bb6676bde57b3a202ceed288d2358354592252040f2d912cc71f1dcbc37b9ced810190
 DIST identify-2.5.11.gh.tar.gz 101504 BLAKE2B 0415e9ab67c4254f3dd096364f518b131568c2180b8fdc5096405bae11854d5ef953eae01ad13292b6948d76f02adeee4607cd9485b705b1a303c44bc7110409 SHA512 cba8df5abacfc4db4305501eb6566ef3c9b3e0557796c046159f60a88ee3d0e206e13b070a01c3f7da74f8abf7a17e1374c40dc61814b5b580d1f8508034c402
-DIST identify-2.5.8.gh.tar.gz 101476 BLAKE2B 2b59ac3cb416c7e3d6bd4031bfed30594b9be70f94d1e0d8e9f436b76e9241cde32f847c0f6b40607d2cb37ff7d67270a35a4d22be4cd6b216324e4eba30f136 SHA512 b43b8ba50d4d58a6d82c99141c708a45317f64693aea567105ed7f3957446e00102ddd303120a9f1238b04b6e0655e1dd6f807f6d878e972c7967a510f8b24b2
-DIST identify-2.5.9.gh.tar.gz 101496 BLAKE2B 045e32b6aa84cedee100332c9b26d1fbbc32f704ef1048ce380fcc40c8a3fcf2e5c96db83058b04d7ead6dea0681ea114e6469d89aa7cd10458ce98cb3f77c58 SHA512 fdecd728bed3828d3a5465943b390ce3aab05255ba06249f462a2367dcd3702ef85fbe57e06562a951e3eeb24f7f417b04d54e30bd711802a8afe37c2e1eb1f0
-EBUILD identify-2.5.10.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
-EBUILD identify-2.5.11.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
-EBUILD identify-2.5.8.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
-EBUILD identify-2.5.9.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.11.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.10.ebuild b/dev-python/identify/identify-2.5.10.ebuild
deleted file mode 100644
index 8ce2bd5b0e7d..000000000000
--- a/dev-python/identify/identify-2.5.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.11.ebuild b/dev-python/identify/identify-2.5.11.ebuild
index 8ce2bd5b0e7d..e32e6d8d482f 100644
--- a/dev-python/identify/identify-2.5.11.ebuild
+++ b/dev-python/identify/identify-2.5.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/identify-2.5.8.ebuild b/dev-python/identify/identify-2.5.8.ebuild
deleted file mode 100644
index e32e6d8d482f..000000000000
--- a/dev-python/identify/identify-2.5.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.9.ebuild b/dev-python/identify/identify-2.5.9.ebuild
deleted file mode 100644
index 8ce2bd5b0e7d..000000000000
--- a/dev-python/identify/identify-2.5.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 0ef989bad42a..4f79d3336845 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,9 +1,7 @@
 DIST importlib_metadata-4.13.0.tar.gz 50445 BLAKE2B 0f52430bdcf63275d16d330fd2ec6a85926ab75cc2c14d0e996dc29a1258ba71e12253dd36f776f280c68cfc0d68058ce52d246fef5eccd9c3b7e5ea9bab5441 SHA512 68deb9b017d89df05b613c564bfaafd9024f9a6b1b14973bb75c0756f29911c6a2516a87b4fad60cb15b66bca79a275163fb8db2cfbd088ab952633de056d1e1
-DIST importlib_metadata-5.0.0.tar.gz 48756 BLAKE2B 87642575d0df14a22bb3b81f68dd6504166fea1148d70b1f2689945d336f9a75257872f8953e0f86008a349ff3500b357dac7d1c381d92e88bdeab37d7392042 SHA512 29efd04c819bf2e6579f5b0ca0cf63c907e162d028244a743929c7c04989a29b84003824aaf2f2bec33867268b3106048380bd18789c790ca2d1cd89a9f678ef
 DIST importlib_metadata-5.1.0.tar.gz 49216 BLAKE2B 6f44926a1c98e21d4ddabe1885d37385f4b8888c35733bf87a00286bb001f403d8c733b3d355da0361bafc65d3176c7d20e46104067e66373c3777156289638b SHA512 9e3d42771f4fcbe334c1b4044415e91abd677f99adbe704fb7cd006659376052642c16b3890458ec9a700b34f75541318060e9563353659d33b4f16ed790ecc1
 DIST importlib_metadata-5.2.0.tar.gz 49561 BLAKE2B 8841818eea459abd9ec8b7741418482b25e8c0d9bf94f34a60f3decd79a9753be2b8be24f58aad6d03bff75e22474642730c4a58911ec4b2c962d3098a9150d2 SHA512 9168af203b60751e5a28c14bdb327c9471f0f4d712f3ac9f8e69cbf3d3c6d999aa15ae7b16c036e47ec6802ca155d75c204e90caf8776a197562b514a36bbb0f
 EBUILD importlib_metadata-4.13.0.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
-EBUILD importlib_metadata-5.0.0.ebuild 1538 BLAKE2B 3d57d5e1714c8189162b180d102a76363264e8e30e1d6a48af4b73963f9ceb971dbfea8233718acb825ce469ebe7078204a030ff925f38172420b4d6c553e3e5 SHA512 214f05f60a537a645ac2b42644c1fd17f11657a073496d2b207125155faa438db3e33981d60c50322d7807f2a9de563164e685db808c60c09182efe9eb1be683
-EBUILD importlib_metadata-5.1.0.ebuild 1546 BLAKE2B 3d5b72541b2aafc21f0c872ff3e96f5b65aecd4b679f72b2194d5fe255aaa555dff7966888e085c51a58eb6c748a6db9e32f24411e43858fd15b1bcb812a757a SHA512 c9f3b1de5dc6c4de27568425ec16a6e8fff5b32db2b4823270a125806fd23d4a9c3b0876c1581c6b5dbf26ae55a4cc9e53c4a07c53499363139f9bf42dbd56ab
+EBUILD importlib_metadata-5.1.0.ebuild 1538 BLAKE2B 3d57d5e1714c8189162b180d102a76363264e8e30e1d6a48af4b73963f9ceb971dbfea8233718acb825ce469ebe7078204a030ff925f38172420b4d6c553e3e5 SHA512 214f05f60a537a645ac2b42644c1fd17f11657a073496d2b207125155faa438db3e33981d60c50322d7807f2a9de563164e685db808c60c09182efe9eb1be683
 EBUILD importlib_metadata-5.2.0.ebuild 1546 BLAKE2B 3d5b72541b2aafc21f0c872ff3e96f5b65aecd4b679f72b2194d5fe255aaa555dff7966888e085c51a58eb6c748a6db9e32f24411e43858fd15b1bcb812a757a SHA512 c9f3b1de5dc6c4de27568425ec16a6e8fff5b32db2b4823270a125806fd23d4a9c3b0876c1581c6b5dbf26ae55a4cc9e53c4a07c53499363139f9bf42dbd56ab
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-5.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-5.0.0.ebuild
deleted file mode 100644
index 2b109eb0cb9a..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-5.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 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
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild
index b3a5bf4e5463..2b109eb0cb9a 100644
--- a/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index acdf8906ad74..3247b13e6c5b 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.collections-3.7.0.tar.gz 16874 BLAKE2B 6505856c1e3bb3fe55d84a5c8804481b2057b738cb37dc613f2dacc9fc19772eec3c9e4c310467ef7fcde09b3aff01b974a2ff8976988fb3802a7c77f35407bb SHA512 6ebf276b662bdd78622c345d64be8b919de8e10e248c78a6107e65a58f4b158ba788685f518d1590028c2bc9a13b1a48c30d5e30f964696a87330dba3b1432d7
 DIST jaraco.collections-3.8.0.tar.gz 17021 BLAKE2B d1439d2ac8e1c62a87f85775d58a1ea30abfb9eeae2d04c00eaaca9452cd3d46c668841073ee41913a52afa519ecbbddba321ec06584c8cab29dd736f4337219 SHA512 3d20c07d616e82c8c2699f2a5e7a0c42e8a4e5314535d4521a2e3457db510cd24019b23128682ac60c34b47fc4b5232ba0fd2e463c199aef6f6eb6d6ee4347ac
-EBUILD jaraco-collections-3.7.0.ebuild 773 BLAKE2B 72cd4c3b4b219d3a82fa23071c599053b05f34fd4820e49539ef537c0a8c4c765ed7d2207d5b08dc90fe480dfdd72c3486f107328d9e0811bef69ee5e3aef7b6 SHA512 d2c62d8f9860fba5e2e0b2cb95cd4590e01776944061d4bbd1a56cacf2d66cae55da2afe7380634a2e2a792ae02f30ae0ff12a97adef0556fc2c750129d93669
-EBUILD jaraco-collections-3.8.0.ebuild 786 BLAKE2B 729ba1b5c3fd8fb36a040a7989ff96240d0f752b0b379770e7b4a07f77cd3f6a47275156811db7abf31eab19e74a4e7e2b81895dae95a3331ce4a0bea1c98ac1 SHA512 1fe24e258d7a1ba09c9bf3c45fd22a10cdf7087de4f61951e7e694dae56ac289de906ce8a9456b771d61982068f81d08dcf957f92878b647ed61ea0093c6238e
+EBUILD jaraco-collections-3.8.0.ebuild 780 BLAKE2B 8e0b841755612dd8cf4dde8f9fdf8523a61df0c0ac46b318e547b02f581e026c1f946f65949bd8196035b319cae7cc96e9a1d62167c18ee5a9e718dcca6155d8 SHA512 0c92b641a07c1623144dc1f84ed209d260546f05e8fe0f1f9997fb54ca22cd4b2fc31e78a2b14f3aa10c14c4e687f3f394785504e78feef95d589e4e97489131
 MISC metadata.xml 578 BLAKE2B c6ad7ecaee92099645bcbd75ed9eff9da2a83268e8a7f828b2dbaf5414228f26b40f09fa37fd156d128742b111cfcacb3e177970b217d4de890ca7262275b26f SHA512 b2602fb629500021bd8fad159ddfcdc76a11f15fe2a51d0d25d5d687ae09170f6cc8438c252e8cb2792ca43bec7be65e249a799582f17c882639e30a9222a0ec
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.7.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.7.0.ebuild
deleted file mode 100644
index 5a3f271420dc..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
index a1cce818d735..393d10fbd974 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 7d1c03260a81..b89ca07ef713 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.context-4.1.2.tar.gz 8315 BLAKE2B 7e8b74c087462401999eb672d922634fa7bfd4f26797a547a21e4f85b12d2e7c8ac208f55eb782a0d74dfffc09e1f5d730b34a25fb83d701e55501a574159dae SHA512 297271b3508e7e979125c6f03962aba0b932337d60b51c4e48e995d60528f4e8bf7e031a877e9c58d8adaf5e3299affe83e01d9ab266e331ce0a131c7b541ee0
 DIST jaraco.context-4.2.0.tar.gz 9308 BLAKE2B 047474e325846a5e01407cd5c6c64da4f7185d3a26b3664f06e3ca76bdb5989fd741a62ab32a667d56a80a4280824e8614cc64a27aa45f97f81d93c344f06f31 SHA512 829284682ead392ae7620c1881e89b7091e7ddc7c1d293c05792f7ce4276a5745554598a222a52ed93a7b2b401d20f3d066cfd32de65ad2f0f3c8c5f5cd2c75a
-EBUILD jaraco-context-4.1.2.ebuild 1338 BLAKE2B dfc304de586f7485722c3ed6f004545ff08502d756e08f3d5d830d3f2dd70487ac67e3d6ca813906c557c7f18eea670320aa5cdeb3f68bcade1e64c6d756813f SHA512 e97fda252c4999c44a0e13a0063b97c29ee607a4691f4028ebf47f1abd9109753c7c1ed60bfc197b9fa75d8ae4c0b2644c45081b76aa11c9f762c1084b9b8d55
-EBUILD jaraco-context-4.2.0.ebuild 1392 BLAKE2B b566410574949a641f75c4be38fe39a643978df96d5452805f52d10f745d40207a450af7bf111e24af05041fc4ccae2554f120636713d776d03690420d468537 SHA512 07da399e6e59ade7ec9034c615c10868877f0df04afbc850018bc088014bedf16cd164259b97b2478cf9b7e8fce718d276c1fb07f5588cebb3b340e6012dbb82
-MISC metadata.xml 342 BLAKE2B 814e419c25d4719a2cd0ee3f8d9d5e82f594fcf1a88fc6547a7b9e0f893451be84b099b35d32536fee97c6ecf401e7b93749968ab4ec5e67d352e4ab9777ee34 SHA512 958abf9745fd7fc9896bad75cb4802b9056e023d854ec3539568ceccbbc4f246327ad794999d083ccac5addc98f56e1bd20e2d705a34c4bab3035ca04e93d63a
+EBUILD jaraco-context-4.2.0.ebuild 1384 BLAKE2B 654daa30dbad71cbabdd95f994eda1edf4cdbf2dcc97261fc1e247b6da3ff0218a21f218ca879f6ab2bc3dba60d07afee45b34ef541e77fa58bf67058f1b0bde SHA512 a63dce5f9739d4bc75f9c32f5c6328c7e59b5386b371e0cace19a3239e4ddd0590a0870fb8e443eb0f9c86f1d7892233d2705edb1cadfc369c005afa03f151c7
+MISC metadata.xml 403 BLAKE2B 32344da5308b2bd5eef6ac6efc6299869f4f82ab67b51a23666eef697a803bcc94993ed67f3047e82ba5500d1b0c49ec1f9b32112855c21aa4b3015c09fa0144 SHA512 13dec82eb1581116d8800e60c99c328aa1bb409fec83044fa5e02838008e4bf5d81bc1defeb59bc353ff4032600bdc9213559bdb745fd6571f53e9edd9dd6737
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.2.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.2.ebuild
deleted file mode 100644
index 90f35d3b5b14..000000000000
--- a/dev-python/jaraco-context/jaraco-context-4.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Context managers by jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.context"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.context"
-		version = "${PV}"
-		description = "Context managers by jaraco"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild b/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
index 53cadb9c3a37..1affbe634cd3 100644
--- a/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.2.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
index b08af07ab2bc..a7d0937c67a8 100644
--- a/dev-python/jaraco-context/metadata.xml
+++ b/dev-python/jaraco-context/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">jaraco/jaraco.context</remote-id>
 		<remote-id type="pypi">jaraco.context</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index e6ac034e703b..465887bd4e0f 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.text-3.10.0.tar.gz 15588 BLAKE2B af615a481c21cfb3d0aa7824ad4a657dc2b629912f9772d25a9930891c222bea1205f1badcfd77502cfe84953873be55006eb6a1e475417296df821aadd94b63 SHA512 1c83dc9247e8c55ed20d8768abcb66c3fb4cdfb9ade3744f3d3c3e705b94e376c7b44fdfe242189001d69fbf28fdb5601ff33b1874495b3c2ad9bdd781265f43
 DIST jaraco.text-3.11.0.tar.gz 15883 BLAKE2B f0f3fe33901a68741cb26270384750f070476ef921bf2822f81dddfc1c66e41016757579e310bd20fc8a7f02b188de96f07bf58db41cca51252e46ebbbddcff9 SHA512 ad3ac412df5e21cef86dc56cdc869a93a660a103a676c1d187e5ea762690b89d61c8f68994e6a891e3d98071b440a052fad60a37f71066e4e11a2cfaf45ae009
-EBUILD jaraco-text-3.10.0.ebuild 1860 BLAKE2B 5e90d080ce2ae213022d4f32b77a9447b9ba38b900934b621a8d2cbdbf951980d6f733efce854425af1751fd7527706a9cb5e42ba790cc214143341798494b85 SHA512 0358f92c9e361e6dc4a95018d5f0bb3f06afa2128a9c1eeadc2a9e96c4d2eedbaced7d26a88d92c426830184478647f726df691c3b341c85d3549927db53e03d
-EBUILD jaraco-text-3.11.0.ebuild 1868 BLAKE2B 79fe03327d6da2721e38cadb289e03d7db72b14f2e88e9577ab701ff09a1b9523d645d3676742de2dce4bffa68be3637e4a28ca876a13c71a4ec468bb6df84f8 SHA512 ab8274d66dd3cece6c31f44fc137aa56c6f352108a2b57230320ab6366c9760006fa6f7a58131d04baf68f2677b868f6e4e0b3768371a11ac5c9263396f81ab6
+EBUILD jaraco-text-3.11.0.ebuild 1860 BLAKE2B 5e90d080ce2ae213022d4f32b77a9447b9ba38b900934b621a8d2cbdbf951980d6f733efce854425af1751fd7527706a9cb5e42ba790cc214143341798494b85 SHA512 0358f92c9e361e6dc4a95018d5f0bb3f06afa2128a9c1eeadc2a9e96c4d2eedbaced7d26a88d92c426830184478647f726df691c3b341c85d3549927db53e03d
 MISC metadata.xml 550 BLAKE2B 147f1a6d5bb65e6ca4a29de497742b1cc69da4f46111512c05518c54c8fc351c12aeb452cc12c0a70974094ddead7014f58a5a2fb546173334ce282e218b8c9f SHA512 fd3bf89a43ca3ebf4be15c1cff79ebc70085b0fa0192fc9a44e6e1e799044ab9935545d4722d3bc6a3989d2a3199432a47f64876ea5b822e8e46fc3c41acd005
diff --git a/dev-python/jaraco-text/jaraco-text-3.10.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.10.0.ebuild
deleted file mode 100644
index 28301b772c04..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.10.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.text/
-	https://pypi.org/project/jaraco.text/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-3.5.0-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-# needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
-# bootstrap
-PDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/inflect[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/pathlib2[${PYTHON_USEDEP}]
-		' 3.8 3.9)
-	)
-"
-
-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_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/jaraco-text-3.11.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild
index 8c1cfbc650dd..28301b772c04 100644
--- a/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.11.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 4c662182e440..c899bb921efd 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,3 @@
-DIST keystoneauth1-5.0.0.tar.gz 267142 BLAKE2B 9c595151287c0f5eff2faa3618e97c1a540e7a2ae4bbf6b76b7ebb5b3a7d0b1443843d7ead98d1997d68ef5def7745b2eb728ff4cde7842a35d46e69b3ea15d7 SHA512 41844b669d8f355525f444b7c837aa6ad6e7efc3e7ce727b6bc6ff441d6b6b49fe8dc2d601d8135ac872484e827cec75c72b613d001f5312e077016d424dcbfa
 DIST keystoneauth1-5.1.0.tar.gz 269600 BLAKE2B 5ea3885f34fe96f9a07f7bb5cbcadb1382ae5b06ae7afb627ad6b25b8b6d17ba5448f78cdcf1d89dd799d062950a8b66a1f58c5779fee7615db97557eb4ee9fa SHA512 1bb17818524256cf1a6a73d9bdd933451dae34f89be0fc6fb6a88f2207ce6b068e086b463abb904b0c9c20a9450b208321026c980e7af2cbbddc5bd75ee20d5b
-EBUILD keystoneauth-5.0.0.ebuild 1799 BLAKE2B 311c0fb4c2da4a9f6e2baef5bebf7e643e21eb26398aaf469ae53b09d9f72e0ffdf740487b7e98e130d65e5d33b787782baa85d4bbb782d5f69e427443d8a2fa SHA512 40286f0a51b2a24c36c7dad436d16391ec72cf3c199e8d35a6a4a6c00a9d8c1e853c5a522eb7c71471cedaa4b9bbd990ea132a9ba391a6cac91d444894158a06
-EBUILD keystoneauth-5.1.0.ebuild 1952 BLAKE2B cf790c234fd5d0a6ba223b4dfec77644dced1cd55624fbd42f743f4c082391cbc5a3a117a0c41269a44333d88d57e0fbe3e397e5a06ea18a03a20844391efb79 SHA512 55d2cb4c7ba3e0a1536965aeaa90621d1c410c3c766368cc56e88e8b51338209a94c11ca8174bde85c35b4a7954bf049d1cdddbad6c10a6af0b205337e87fb33
+EBUILD keystoneauth-5.1.0.ebuild 1949 BLAKE2B 5d48e4ad64126673aab57d9cd3650ec81537b6baacecfd66e3da3a7a3a0ab296352c2507b1fda76af0102b5096ed7c764005a75733ddcc8ffaa5dde44dfdf166 SHA512 ed7b0a42ff0824392537663bfec9d8c1e1688bc2f066fd23b1cb2646c3431bf06dec61bf1c8cc0cc8f387904f8837a3e9932f6bdff5984d08cf46e096c71028e
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth/keystoneauth-5.0.0.ebuild b/dev-python/keystoneauth/keystoneauth-5.0.0.ebuild
deleted file mode 100644
index 2e43f3409810..000000000000
--- a/dev-python/keystoneauth/keystoneauth-5.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-CDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth/keystoneauth-5.1.0.ebuild b/dev-python/keystoneauth/keystoneauth-5.1.0.ebuild
index 3e138373bcfc..67c91b93363d 100644
--- a/dev-python/keystoneauth/keystoneauth-5.1.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-5.1.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 75da90076cab..69bce256d557 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.2.3.tar.gz 491336 BLAKE2B 75a393bc91e40adf65b584f829e8f454ec894b6f09581d7511e8d5a3d534c301b8e06418a3aa896953270e54e70282afa6692b43debb8abdf122fcaeb754f1ed SHA512 904b12826b3fc74dec069e1fd4afb67a8a1962d72962c4ee8c9360deb728b8deb40c21e7bf831122ad6b095172a8de015222a97f47675d48d595c8eabd98a14b
 DIST Mako-1.2.4.tar.gz 497021 BLAKE2B 61b0d7c681e41128fdeff83414de30ffd2282ec6480af61924e35094f674732562297b977f12a0e5cc842ae0ed3f67c7955bb223a0e4f061c773cd4507208d02 SHA512 9a90d245f2c8b5e5efa283d91f762a2fffa40b7f71e7a4b66de7f66f894ad5ba2fa5c04080200b6633bb61d4308db5b5e763b26ae7d93d18efe4aebb2178006a
-EBUILD mako-1.2.3.ebuild 1079 BLAKE2B 5bdab1d2d11422fbbb8a6a915f089c244c1bad9ec99c5b076b8cdf994441aa7eb1dc154b4ffc7765176426d6befbb93ba21232f2295d4bc5960de7073852a8fc SHA512 13d1644d606f0bb5406d5e2939c61556a7bc6d322d3daa1e9a25a85245782d1ef7f6286f9f071d4736131c3a44a20be8c8056727b8ef01830a0d6a3f1b3761e3
-EBUILD mako-1.2.4.ebuild 1087 BLAKE2B 70e3c032f6cf43c69bdefed725ef4cc57eefce352c310653a696bb930015deadb87869bfc3d5e6e369464f1bb8f02b88f026f6905afa218e74ec2c30a3b79ea7 SHA512 75c4547af99db5c19ed40a1aca9d963aa73314e74f01f1be79d4f98143c6ef440c4256e1ec48ab9344ddfcb1e99ef4c904f6c83eb02cad7de6190700980769b5
+EBUILD mako-1.2.4.ebuild 1079 BLAKE2B 5bdab1d2d11422fbbb8a6a915f089c244c1bad9ec99c5b076b8cdf994441aa7eb1dc154b4ffc7765176426d6befbb93ba21232f2295d4bc5960de7073852a8fc SHA512 13d1644d606f0bb5406d5e2939c61556a7bc6d322d3daa1e9a25a85245782d1ef7f6286f9f071d4736131c3a44a20be8c8056727b8ef01830a0d6a3f1b3761e3
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.2.3.ebuild b/dev-python/mako/mako-1.2.3.ebuild
deleted file mode 100644
index 458c821b2cb4..000000000000
--- a/dev-python/mako/mako-1.2.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-	)
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.2.4.ebuild b/dev-python/mako/mako-1.2.4.ebuild
index a0e0b665671b..458c821b2cb4 100644
--- a/dev-python/mako/mako-1.2.4.ebuild
+++ b/dev-python/mako/mako-1.2.4.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 9fd03bf21797..0bc636232cda 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,5 +1,3 @@
-DIST memory_profiler-0.60.gh.tar.gz 142585 BLAKE2B aa7fd9e547eecadc184d4da5830c582a9a9ab9565f3dc9c763caaa7e75698ed6b499d2555e4a93b39d2f80f85fad025b84043e0812cb25dd1511f4ebf8da5a85 SHA512 407e44a410cdb4c7c8cc5ff40198c28012f8b0c6bba88d2d1612681eb621a1b802ef137be62fc64ca9e3c362ca3814433bc12169d7c3827bf97293c5bbb8bfbc
 DIST memory_profiler-0.61.gh.tar.gz 144680 BLAKE2B 418ae6e7433dd58b00c8706209a7172c31ccf57d74255aa670b271bc9d76b339bd582b48886bed7b53062abd8eb421678c911b3495de4d541b949f340aad7091 SHA512 02c70a049107ad4df635e20e22eaaa91fd4e4fd29690b0a7c314e08ed6e076bbb81f85dd97924ed35f7f0133cfd3c7e55b35400449489733beb172debe592c4e
-EBUILD memory_profiler-0.60.ebuild 1795 BLAKE2B 306779b206e489492c8b02af49a7d853d390eef028ff766d5319a0164141aaa2560f64b4067d00fc25f45b0db46ce480f25b776f91ad038785baff09d5ffcb3d SHA512 95f4a018603a6a42a7c66b5b63014378d955e3b6cebc7f3a726ef93a41f169689b5eac8a7fe1187dadf9e377d2353ad9ebb5587a2bfe83ab4aabf3435dfe3a40
-EBUILD memory_profiler-0.61.ebuild 1837 BLAKE2B 38424fe50ad7f007896e47c921d39284d0960a766f29468c6896842ded89ecefeb89b9bacac7bca12843d33bfc63360986bd6ddc9a0f7b054b8580c4dca79ae3 SHA512 ffb3dfef542c0a8adeb0b2329e99d599acee674d6b72a016851dd27eb7659064d58780be27e8cbc794b76d7595c056e93b655bd540f7ea1cda21b058b8f5f051
+EBUILD memory_profiler-0.61.ebuild 1835 BLAKE2B 5c71e96befce35a76cd816931861efed780bf92cb5ff26e35e031c0a7661154accd802e316de34347ad8f43c24524ae878802e33c6ae6f0bef8fec5a30808455 SHA512 2199d0167b0083b23bf92ea00c2da26b9aa434811e98f16797f9e666fecf59343f59b25afe76ea23fa04e6b24dbed8810ee3f653a845fddb66b8b3991d3b48ae
 MISC metadata.xml 548 BLAKE2B 744d692e6a44ddb587b1ae69c5f6ff48fa0f02b8acadcaee34242f810d1404fc6b3c4493a257a70b3af21850e08a17a8ee3758ae9e8af1937b645a2968b5d4c0 SHA512 b7872bfa470fb34a4d60bb9ee976d5a62122b0b701635e305988660952e695f52d9d4f0227518dc9fb337b4a3f6a95dc11b5298f1787ddd100b3f46c34f812fe
diff --git a/dev-python/memory_profiler/memory_profiler-0.60.ebuild b/dev-python/memory_profiler/memory_profiler-0.60.ebuild
deleted file mode 100644
index 65cfca08bfe4..000000000000
--- a/dev-python/memory_profiler/memory_profiler-0.60.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory-profiler/ https://github.com/pythonprofilers/memory_profiler"
-SRC_URI="
-	https://github.com/pythonprofilers/memory_profiler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-IUSE="examples"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-# dev-lang/mercury: collision on 'mprof'
-# https://bugs.gentoo.org/571176
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	!dev-lang/mercury"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m memory_profiler test/test_as.py || die
-	"${EPYTHON}" -m memory_profiler test/test_func.py || die
-	"${EPYTHON}" -m memory_profiler test/test_gen.py || die
-	"${EPYTHON}" -m memory_profiler test/test_loop.py || die
-	"${EPYTHON}" -m memory_profiler test/test_loop_decorated.py || die
-	"${EPYTHON}" -m memory_profiler test/test_mprofile.py || die
-	"${EPYTHON}" -m memory_profiler test/test_nested.py || die
-	"${EPYTHON}" -m memory_profiler test/test_precision_command_line.py || die
-	"${EPYTHON}" -m memory_profiler test/test_unicode.py || die
-
-	"${EPYTHON}" test/test_exception.py || die
-	"${EPYTHON}" test/test_exit_code.py || die
-	"${EPYTHON}" test/test_global.py || die
-	"${EPYTHON}" test/test_import.py || die
-	"${EPYTHON}" test/test_memory_usage.py || die
-	"${EPYTHON}" test/test_mprof.py || die
-	"${EPYTHON}" test/test_precision_import.py || die
-	"${EPYTHON}" test/test_stream_unicode.py || die
-	"${EPYTHON}" test/test_tracemalloc.py || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/memory_profiler/memory_profiler-0.61.ebuild b/dev-python/memory_profiler/memory_profiler-0.61.ebuild
index a5f150e6ca3a..2aa375ab59ac 100644
--- a/dev-python/memory_profiler/memory_profiler-0.61.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.61.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 # dev-lang/mercury: collision on 'mprof'
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index e8f6898497d9..b1f37f5abf8d 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,5 +1,3 @@
 DIST mkdocs-material-extensions-1.1.1.gh.tar.gz 12092 BLAKE2B ad5a085cf65768f1bf40f5dfc4323fc8047495fa8c501474e9b2fd6db141ea0915b13eb5596225b5a823b9e9f315f5de1d5be1a0a717d06e4ac17ddd7becb1b7 SHA512 84937d3e9a4817d80fd19b9d359d3b2fdb6766b58c5f0b0530d84ad555b628da3796bbbacebd1b3ad438cbc148bbce681e7038b2dbe5c086645b2f5426a5cb2d
-DIST mkdocs-material-extensions-1.1.gh.tar.gz 12063 BLAKE2B ddbee5e2a0bf4a14abf74ddb2e412d0a6152b88036e9b06dba4dac720ccd060ec35470fca2c6407be260de75d6ab88b2f464b091ee935c7d91e590f4e5fa5f93 SHA512 e98a4e8a0e30f30557db2ea3d782d18ab75e9115e761af4db2320d2b92b846d996dd1dd170c4a234dd6b9c5bf625a49294951c84b7d47115b05b67d3ec3af682
-EBUILD mkdocs-material-extensions-1.1.1.ebuild 686 BLAKE2B 9952d427c251c9ca749c97a9fbad55d5244a1a34378af7ea86e7c5ab6a58d2f6eb822c96c83a1f8eeafed2dfcd3f3cf0ff196d6ce6efebb8dbf1908488fe621d SHA512 33c379756f4be5a2bc0a23307871ebdc6343b5adff256f32ff05f30a68ee8df6f29c61568c4e432df85d7377a495a73962fcb971207a9ea9d1cb4f2626a2c571
-EBUILD mkdocs-material-extensions-1.1.ebuild 701 BLAKE2B 93199b44ab1d542b59914145f4e3fa7cf30f7046085b87b95a44e6b50c4d8c04aebfa5b4522032750b2b44968299f6ab873a18bf397779e00348d128c28b67ac SHA512 472c42f3686115dab72fb90734f37c61f77260bd5e5c28a1367e40b8cce9f4c933f42bab010c014b039a5379f97a6df829bd5d96925767e9723d9685c031e3e9
+EBUILD mkdocs-material-extensions-1.1.1.ebuild 690 BLAKE2B 93593da84ed91d92b9258d64655a040f65cc096196c325a807208cf032b7c6a74e437dbacfe1de5ba164f0927bb4a093ff84db9dd7bd6cf49d3b1d5202158423 SHA512 54363b23a7e638de4751f38cb4065756e385effa72eeb401d2f2399bd0aa156b075961bb5a9511e8c7f36811a811e4c38aff882cf63df8866d3f2ae57c874e55
 MISC metadata.xml 451 BLAKE2B 3deb46d9e68b98525a9d7d31d2ccc0cf3c142d2988dd01636f037bec1b0ebfb07bd675c402fba89f6c7d171444e693b1c070eaee27c9a0ce94d48a1edd73b58e SHA512 add6b4dc2b6a8032aa3edf9ad22f02edaebf4cfae392c2920db40c201adedb20e6f085de59f2224a3fa037060c7cdb3dc238d3174a97f95aa35bc3bc8618f3da
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
index 6f190ffc97d3..1364fb534847 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.1.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Extension pack for Python Markdown"
 HOMEPAGE="
-	https://github.com/facelessuser/mkdocs-material-extensions
-	https://pypi.org/project/mkdocs-material-extensions
+	https://github.com/facelessuser/mkdocs-material-extensions/
+	https://pypi.org/project/mkdocs-material-extensions/
 "
 SRC_URI="
 	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
@@ -19,9 +20,11 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
-RDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.ebuild
deleted file mode 100644
index 63c169c7c5de..000000000000
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Extension pack for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs-material-extensions
-	https://pypi.org/project/mkdocs-material-extensions
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-RESTRICT="test"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 9825b3fdaa96..62aa90b0ac6d 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,6 +1,4 @@
 AUX nautilus-python-1.2.3-gcc10-fnocommon.patch 6095 BLAKE2B ca0f7c2f46d3fc265cf2649c3f9f58d8bcf88212cd62065cb6f30adf2094e206eafb48354bc25bcc1afb887703b8d05d2a83020ff6382021edef130d5509ef38 SHA512 267171aadd5fcc825ca42e91f94dba72260017cc0aa4bc12874fef4773d46c6b47c1fc093e5043b3c77161cf2a51b78e6882ac8cc60c800c870d325108ce15c4
-DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
 DIST nautilus-python-4.0.tar.xz 32184 BLAKE2B cc910de82e54cd687d23541a0b283a70dc5a0626acebf8787110ae1b5a4c080741c0879968816e217a4da968a77169d79b6614dd055f1ae57999a9a49f2553cb SHA512 f70f825b821f266caafd1b347066de01462b8256ec126072042d09dd7fd6c9324847d5ddab65671589d0a411f8b8fed428dbc94806ac679d646861c66c3a0dd5
-EBUILD nautilus-python-1.2.3-r1.ebuild 1067 BLAKE2B cdf21d7b587351d3fe71c712d560e2cae11d9798750aa2fa5f4996827b3e15786336c454fd2c969c3d02305b1729de9bae802570bb50020df02b9f8545083dd1 SHA512 e9fee4b5843833173d5f6c032f716fb2550f0400fc9238643cbda83f5690fe3f723d2a41737cad50268c7a255e2530a1f2093a84634a0149b02cdfe183983ad2
-EBUILD nautilus-python-4.0.ebuild 1181 BLAKE2B 00a383aa8b356bf9d76b10478dc13938690db3ad2ea613935c848e26cb447030f725bb0ba69b08539b9e4c36a44e6b36b3ad84579bb38e41a45718f48d737a5c SHA512 2d54ce454a166a92d32dd744a939e4dbd302d39c81da95ed835e03181c71dc552c35a98e3fc2acf0e587276b92483b94c8081002d4acdf3efd161ef98dedacaa
+EBUILD nautilus-python-4.0.ebuild 1180 BLAKE2B e7aa63f73af3db09fc203b23b224450e8e124e8259f4794aa2e603d69b50a7d775721b1de4d0804bc65ec374a55eb181a32802fdd2191dfbdbaba7f3089ba11a SHA512 e33fb968da213639d46ef6c9ee85c894d7bf89fae57c43a4d1cc5e90d2e44132276e963f984c226d80745e8ffd73eb1eff8d4d995d620eead7ba60f1eba776cf
 MISC metadata.xml 356 BLAKE2B faf70d4fbe0451757ccedb3d4c316fd8d4528adc79a559eabb3e8e55e026729d20bcef8113d35d3c0e6f4c17ba36eeae4230cff1876f5c8c2d4ce9a4ba0f9881 SHA512 a17c4dbc5f2f06617086a7b5a9c82eede6236cca667f5fe765ece5eaaba9a909aec03234bd93cab339c0449465df41aade9ac4176a70ab95218485fdf4705a72
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
deleted file mode 100644
index a6648b0c2fdf..000000000000
--- a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="https://projects.gnome.org/nautilus-python/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Require pygobject:3 and USE=introspection on nautilus for sanity,
-# because no (user) plugins could work without them; configure itself
-# requires pygobject:3 or :2 and >=nautilus-2.32
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/nautilus-3[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-# https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7
-PATCHES=( "${FILESDIR}"/${P}-gcc10-fnocommon.patch )
-
-src_install() {
-	gnome2_src_install
-	# Directory for systemwide extensions
-	keepdir /usr/share/nautilus-python/extensions
-}
diff --git a/dev-python/nautilus-python/nautilus-python-4.0.ebuild b/dev-python/nautilus-python/nautilus-python-4.0.ebuild
index 3be075f4cd61..ed5dc43ff8a9 100644
--- a/dev-python/nautilus-python/nautilus-python-4.0.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://projects.gnome.org/nautilus-python/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="gtk-doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 356c68ced8f5..12252ef25941 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -9,6 +9,6 @@ DIST numpy-ref-1.23.5.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6ca
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.5.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.23.4.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
-EBUILD numpy-1.23.5.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
+EBUILD numpy-1.23.5.ebuild 4902 BLAKE2B 8ba84f69d84dcbeeac302a4b6434f7449bec6a78df02ca755b778e10c92fe1f27ee67b64d971f9aecf4e92eab0e3a59a9c8b0ef4482d76ddcdc8f6434bb524d4 SHA512 fd6913eadf68a8c1999dcf44e5689496309ef0ef5a33fc5b6264856914db5e9c92d41bb5c839f2d914dabfffe2423bb21fb576bfb8388e20b6b416f3ea4572d8
 EBUILD numpy-1.24.0.ebuild 4282 BLAKE2B d5eaaba3ae3d79fe14f8977eaf76735ad2d1c47869de92417a43e838d21a6394ed90c1edc74481fa5765c2476ab5590ccb35ae6a52c65c2424398c0da8bcc16a SHA512 fd7a7a0a5c835bab062236d39da59e4c4f078ea281d2a4fae9ad03723a0ac67458eebf0c524623b7b00f6488393b012a81b7e8819cb381fae017358ef506b7be
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.23.5.ebuild b/dev-python/numpy/numpy-1.23.5.ebuild
index 18d0a7787bc5..cdbbb668a472 100644
--- a/dev-python/numpy/numpy-1.23.5.ebuild
+++ b/dev-python/numpy/numpy-1.23.5.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 350b71672c0d..79ad0e1faf55 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,3 @@
 DIST openpyxl-3.0.10.tar.bz2 2427596 BLAKE2B 7422e15d1852d7ce6fa7547cdde2ff6cbe02ccdc13d0a48272cc0f544ade8283833ccfd006d83cca0ac719b2354af76e220522655cadad8dda11bc39ddb6de30 SHA512 1b06ed6c17ab15c277a46cb83db030ba37424a718962070728a8723db50e3fb6a77078b26e04aaee4a924686cacb2c6413742f7aa3533c0f9ecfabca9757af56
-EBUILD openpyxl-3.0.10.ebuild 783 BLAKE2B 332ebbeb5c147098fdd8e0a448f27d398e434acb3059f3b8cae9cd881f97e44fd78c0a9803a941667872325f77e29e4f9f0120f6c3f814caeb28c0a559ae2a84 SHA512 3538002bd35979cc8ad99810de41be44d517dd161f9f8bab0732f9223a13c8a160cdbe8e1e4aea632e61dbcfa3665a23add78cfe8ad09ae327a05fa6f11383ea
+EBUILD openpyxl-3.0.10.ebuild 817 BLAKE2B 33754fcbe3f0a32086309d30737095a710a0eaee883dd28d79e6b59d09277f16cc17246f320b371210fc7a64b725b4e3a22d816266581fd094b7334a06d6c63d SHA512 c58e55067bab0bd01ca67cae42c2d35def191ef6824c7bf2a476fa12ea9e6f9b6882c71c3c132b9a45d66f7ac8c69cce1c0b6b309fcbe61078b1d165dadbd14e
 MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/openpyxl-3.0.10.ebuild b/dev-python/openpyxl/openpyxl-3.0.10.ebuild
index 4b9fd449a041..43282ecc4b7c 100644
--- a/dev-python/openpyxl/openpyxl-3.0.10.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.10.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 	test? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+		dev-python/py[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 10143768136d..230f732f32c0 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,3 @@
-DIST openstacksdk-0.102.0.tar.gz 1083232 BLAKE2B 30be836257fd63d6f2f3c3ad8d55af4261e5fe882f1597a442534d65aa3763eba693b4df393f359cdb239fd5da620aa712472be883e406bdf5d70bd73c257683 SHA512 34aaa0b85977c47a3b03988ccbc1d156d35600e893e0f59f8fe02a1fda4bf9fcebcb4d6b765efe5a2acfd0d9c03eb7954ef1917a0a5696196cc8484ef2865958
 DIST openstacksdk-0.103.0.tar.gz 1094619 BLAKE2B 66b4375469b2a8a48640198f94fa6d893c3f5d0e93a20f00dee868d6ed2da34fe367ec885691a06f9b4c056092837b5dd1033201922cb909fc7124456c7b6369 SHA512 175166fbf0aa851ff51c86b99d10cf30da6fe7c516e2d6020061fdcc9627f7d4630e3cc9ef3699be52cf298088f2f80240061e6a851a13effbd13d359a6dab26
-EBUILD openstacksdk-0.102.0.ebuild 2725 BLAKE2B 7748c0c53561e2994a1fd86e9293970356ae0982732fac479a7d4bb6c0b5c8326abea5c614842f32625297cbf40fc586ba483d2fd9f10bc4e122435c41e8f289 SHA512 098f6b7e32e81f7a945bcb91a869ef49e5ddd99c4ca38510f6c50451a233efdc0f71ef045bb0225d29587cd04c053713904d76c9083d867a58aa5da459142081
-EBUILD openstacksdk-0.103.0.ebuild 2728 BLAKE2B 227aa4fcb2d0bfcd7cb93016273b46ba7e1bdb057fad7fd14ebef21251137a77beb8306846493572cc8006d6a5767afa323adfa7be17a3761f795dc2c1c40671 SHA512 4e904128a702fac20ab4c305851b47e21b1d9b1b221784a442f9f6516de9a22a2d2d5da85d6c880029cc9efa8f90de4b49a08586d5b1c224a3011fd6a56cc877
+EBUILD openstacksdk-0.103.0.ebuild 2725 BLAKE2B 7748c0c53561e2994a1fd86e9293970356ae0982732fac479a7d4bb6c0b5c8326abea5c614842f32625297cbf40fc586ba483d2fd9f10bc4e122435c41e8f289 SHA512 098f6b7e32e81f7a945bcb91a869ef49e5ddd99c4ca38510f6c50451a233efdc0f71ef045bb0225d29587cd04c053713904d76c9083d867a58aa5da459142081
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-0.102.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.102.0.ebuild
deleted file mode 100644
index 90876d7aa28f..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.102.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-0.103.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.103.0.ebuild
index 3a76155d34cb..90876d7aa28f 100644
--- a/dev-python/openstacksdk/openstacksdk-0.103.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.103.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 1aa62c71a00e..1b1b0c4a1bf6 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.utils-6.0.1.tar.gz 102652 BLAKE2B c4a636bf3b049150499566520067215a34a965f3998202a0d006d5ab83a8c20496ce265ad57327747770d3cb090c2f814ad67c9c27ed00e1bcc0e10fcfdca899 SHA512 f005b7910909182ef7bcf1ff80186d352f1cb2222d08c0f83fa391ee7ca9e57699e29a07027774a24af3b1b5f503222292b0ccf4cb88acf025bce5ebf47f61ac
 DIST oslo.utils-6.1.0.tar.gz 102843 BLAKE2B 8bf3889bcf82fd12589c58b2020164f1183fa9ed19491a05d252a6157841651259e3b2f412affb5d53eff4bf7f21e34a4666fdb91106652a937c79b5fd9c1c14 SHA512 ae86fe4dfe2db25c682ee533a16830fc3e03eb408ae4acd832b6aded9d7d93fd91927444f054b594b4834e338c8f13c48d0c9796b224923adc1d0df7f6cfb84a
-EBUILD oslo-utils-6.0.1-r1.ebuild 1415 BLAKE2B f31895ef08778a76206018c69e2a133a37210d50b82a5bcf64f77e7d1cf96441d17fa8796605dcda700e4a98e9a90823ff78da05de32dfe5842c6a731666d539 SHA512 cabcd9e86f0057a04efd962bf1824b8db0bffe6b754c287a73f2edb0807d92aca363c19c9e61b33eb8ec445d549b35c9335a7910bcea3f6359ad701124e9f106
-EBUILD oslo-utils-6.1.0.ebuild 1418 BLAKE2B db83d43ab74b1da3dd2cc23685ff0dcd0b3d67efb03a28918f1564de2fc1afb26b9a893a3b4525e7a9b1f14092d85b639939fae1c364a6e668bce68885af9705 SHA512 81400f5ebc6b008f308cddc985181c2992e8bf51615d32fe628ddb38a9ea3f856955470f74c3a44dfae6dbeeccb72ed3b007354f6c240a730c68b5ed8dd00e15
+EBUILD oslo-utils-6.1.0.ebuild 1415 BLAKE2B f31895ef08778a76206018c69e2a133a37210d50b82a5bcf64f77e7d1cf96441d17fa8796605dcda700e4a98e9a90823ff78da05de32dfe5842c6a731666d539 SHA512 cabcd9e86f0057a04efd962bf1824b8db0bffe6b754c287a73f2edb0807d92aca363c19c9e61b33eb8ec445d549b35c9335a7910bcea3f6359ad701124e9f106
 MISC metadata.xml 667 BLAKE2B 2d3b1f3c01b74c3db8239b0711f6b10488cc17b214509a64607f3112e7100eb39f2d8774639d47a40cbad6786e7dee1430327a78b357b516325e5d06babcdee5 SHA512 e97a4a1f3718a69d39706d816f17018a7d57fd81702cd88ee01f9b849405f2f08769d381c5e41be84d8ae0c69a2a977b0dcb3ee1a481502ebf49f5ad6a5d6a95
diff --git a/dev-python/oslo-utils/oslo-utils-6.0.1-r1.ebuild b/dev-python/oslo-utils/oslo-utils-6.0.1-r1.ebuild
deleted file mode 100644
index fbddc394fa35..000000000000
--- a/dev-python/oslo-utils/oslo-utils-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}"/install -name '*eventletutils*' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-utils/oslo-utils-6.1.0.ebuild b/dev-python/oslo-utils/oslo-utils-6.1.0.ebuild
index d953fd2334eb..fbddc394fa35 100644
--- a/dev-python/oslo-utils/oslo-utils-6.1.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-6.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 7656797637f3..92ceff178ce5 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,5 +1,5 @@
 DIST pandas-1.5.1.tar.gz 5199286 BLAKE2B 17d98870f3397d7a9289a18708021a614b1d456e2ea99dae8927727aabb8aab73bd31f25c3035947f8f4c38404e7d971bf999500b300307b19a2cf6029763d0e SHA512 e5f25f21f17f36c6488f14fbfa391beb9f1989652de01cb8346d2826dead9331fea27295ee1e6f42d0875f2f1a91fcd23d606edd339432589bca5ba8d89e5ecd
 DIST pandas-1.5.2.tar.gz 5201551 BLAKE2B c6a8156a6c116f1b576837882e4ad4ada6cf21bf72acd673d74bdb1dda4f97f88a5e6422e8f8ad2fbbb85a334cd68cb0abae316d5826c54a85baf8b325ab6183 SHA512 1e6b653ff418c839895946123f90fffcfafd57f24dfbd6bae4e9988893b7d57d6276ed101112c8f9730af53f600d006fe3a53bbed597c0376856f2cfc90c1f05
 EBUILD pandas-1.5.1.ebuild 6844 BLAKE2B b0b347e79125283d136c1fd8792ce26a9bf08ea9a2fc8f4f6310ecab9fb1a75ef7fcda60bef12bf08150586b86e0ea49250a491b21bc81883a4ab5cbcf5d19a5 SHA512 b8f5f35ac4c1e36d565dbf90e729c2e088e2d214f9340cdc1a085b8af7d0850fe16f22b814eae6e0b0949c6c3f4ac86f0d37c8449caf869885158350d85800e6
-EBUILD pandas-1.5.2.ebuild 6850 BLAKE2B 3a609bc77c708551a04cdf6734c492c7aba0e83223fb59976d12d126be7ce2feab7f18e146afcf4a39bb510377aecc31902efab9ab3790483c986cb12989b553 SHA512 a18046189859268d43ac0f67dc43a57a07f072547e3f5c2f1d2b4b320e8763b19638b8d0ea76fd667b2c2169dd4938c09233cc2f0db77ec2431cf9f22a1e6eb2
+EBUILD pandas-1.5.2.ebuild 6846 BLAKE2B 521569aec2d938c3b7da152afda72124c0666838a050e7a6c9dc5438ea34d0b6ee210f845c9dc47abfc77dffd9ce7f33bd97e8a7d89a6268478a8b3802708212 SHA512 3b30aaa3e9fdecb3e42bed851ff20279fea48a15b7490e6c82047d989ee14aca0f1d9707e360c72b3cff5ca336e1a32ba507661528b6f2b220687cb99cdbe80e
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-1.5.2.ebuild b/dev-python/pandas/pandas-1.5.2.ebuild
index 9b507e23b10b..b1fd2a274a6c 100644
--- a/dev-python/pandas/pandas-1.5.2.ebuild
+++ b/dev-python/pandas/pandas-1.5.2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index ee78ca77f867..1df446c87cf2 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,5 +1,3 @@
-DIST pdm-pep517-1.0.5.gh.tar.gz 314932 BLAKE2B 5a0adce25de4aaa1d57d859223a3632c01f31d9be947384c9a1707fcb413f0a1d1434c9c6bee868ee0c668fa89cc78ef6d4831a4a2b1150607bc5f8173e61cd9 SHA512 e5cde819476187f4ad5caaa0dddb9409fbefb241e0548fb4ad9df4722de3c7b532aba969b399afade0bfd3d774ee5cdcd3bc9ece3a5ebfb2d5a2a6f3280a6ab5
 DIST pdm-pep517-1.0.6.gh.tar.gz 315755 BLAKE2B 7b221d9ddc9683521e901177cafd2ffd2908af4acbe083b4a7d6525a81ece64d3768331135451d45ffc5c40c67c8c72802d75d52fdf85fa89a13f30110436a13 SHA512 5aeef3179d508d2acaedf4b99df41e64b26537120e586a01870651d2b379e2e5a1bf42934ee28a4b285cb83fe10ead073408b6b7d022ca1f55653533d12a2da1
-EBUILD pdm-pep517-1.0.5.ebuild 1308 BLAKE2B 0c890bfc9e6e47e6b06040df4c3ca16071055d7e74e1981283d698df73e4e7638c5dc90af0e3e22935f96b68330c31833d51a3180a74a357a24399b9ddb45cea SHA512 132748053bdfb7b72b743f3228fa70af78a179285f8c607fdb81e3aa4cffa331ef7a239f397eb5644b2efdc4ee7476b5ff4035c6a468d5e3a4110e5ebc08a419
-EBUILD pdm-pep517-1.0.6.ebuild 1352 BLAKE2B 16b55ad60e93814b6b15b34b38e9515e9fcf3aaef08a320b533ff27b64f8614b9bebb79d756c9d75e89f1ec30e9c65ff665f926971a7cd6f1894e076f6b2ca7b SHA512 9c7da185e355b32f4ab9eb89c585d05bf820b40bbb9d46c8cfb90b656a3784cc18891b52589f20bf92e45a8df01f233292e6f08778158e7c70f6017accc84fcb
+EBUILD pdm-pep517-1.0.6.ebuild 1350 BLAKE2B 78f501195d32f4ef8ccfdc3ff71ea116374abaeb9d2bc1b70e2598997992c00cca140b23072e48142b1b626ff046a7c823871a48ed2ab7ba734e4e4aedeae1c5 SHA512 3c28e5fde08226c21c2ef167099009fdca8dccda2ed48948288db63d73de9df50d60ab3d46458b0192e3162a25d045b81eeae5d1b4dc9726f7504fa755985d8e
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.5.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.5.ebuild
deleted file mode 100644
index 28197c2edb5c..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.6.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.6.ebuild
index 5efa042e7407..42db048f2eb8 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.6.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index dfdc89b62e1c..ceee0a8e06a9 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,7 +1,3 @@
-DIST pip-run-8.8.1.gh.tar.gz 22443 BLAKE2B 4f87e3ec9867971916a0d5c463cdae63c7bb95ba457ff6e04101c1c37ea8728e2db2bad805b10bb6843b5ded1cb095d0f493b02c8a6e73aa4b782b849aa5ffb4 SHA512 ae964ca96f0be33fdb33974061e75486c443fda5edf0cf43247e8bd293d9a6a87d2cd421100578ed5179f13c9f46ff10ec730e0b403982da7e8aac22651268ea
-DIST pip-run-8.8.2.gh.tar.gz 22900 BLAKE2B 2dbcd18b46abe12c1020a045578a6548468bba0a098c85b0345dce634c61510d6e02feba356831f8531671eabcbcb5b520f15b23864c69bd708e3e2f0ebd125f SHA512 0250f55b49bb3eec10c78b217285df522bc00475dd9bdc710c107a8569e66b2ae643137da59a07c0f6b5e1254a9a920de3212f6befff245cd797947d3fdf95dc
 DIST pip-run-9.0.0.gh.tar.gz 23171 BLAKE2B ca1bee27f4d1826029aa2520dbad9807d22ce66326fd917f0b7687284ce3daf9abcd45e593d735633fb86186ea88ffa0b71780f9b56e27458798763db309bd9d SHA512 117b2260fe628dcc5aae47335ab645c2db47ca9b4d5cd0446ef11bb399c0e91df3a32b61aa7a228aca4d7b837228ddb41fe010896f7debf5fbca6111398cce73
-EBUILD pip-run-8.8.1.ebuild 963 BLAKE2B e176a68ad10beab276e7150bd917d9d3dd5507e8000932e6afae6bc662838af36d5f377b9515208b12e4464eb5fbc2c137c1f1531e3891eb616d7f96c4b9c56a SHA512 7f72c4b7def3b9b29fa49dffe2accb678a696f9742846e2a812908f1bba2039867a003f45f005d2f61a1c7604c1f100ff447601a05e5718b8651454737f87191
-EBUILD pip-run-8.8.2.ebuild 971 BLAKE2B dff0d2ebcaf36c770b18ef542ee8a66c2190801742bf23da0551495330a1861c71001c235744e0b1edd7e7c0a4b19147c621443c552f8eca3b6dde890b2e3bbb SHA512 b0bac62e0e1176bc626a15ee64183923a2061c8a43f312e53d6ea52e9307a5525bb2d4720a682156154f4c28367e743ec3f8fe81f8ff181dfc08084ce1e8a31c
-EBUILD pip-run-9.0.0.ebuild 971 BLAKE2B dff0d2ebcaf36c770b18ef542ee8a66c2190801742bf23da0551495330a1861c71001c235744e0b1edd7e7c0a4b19147c621443c552f8eca3b6dde890b2e3bbb SHA512 b0bac62e0e1176bc626a15ee64183923a2061c8a43f312e53d6ea52e9307a5525bb2d4720a682156154f4c28367e743ec3f8fe81f8ff181dfc08084ce1e8a31c
+EBUILD pip-run-9.0.0.ebuild 963 BLAKE2B e176a68ad10beab276e7150bd917d9d3dd5507e8000932e6afae6bc662838af36d5f377b9515208b12e4464eb5fbc2c137c1f1531e3891eb616d7f96c4b9c56a SHA512 7f72c4b7def3b9b29fa49dffe2accb678a696f9742846e2a812908f1bba2039867a003f45f005d2f61a1c7604c1f100ff447601a05e5718b8651454737f87191
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-8.8.1.ebuild b/dev-python/pip-run/pip-run-8.8.1.ebuild
deleted file mode 100644
index fb88142bd571..000000000000
--- a/dev-python/pip-run/pip-run-8.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Install packages and run Python with them"
-HOMEPAGE="
-	https://github.com/jaraco/pip-run/
-	https://pypi.org/project/pip-run/
-"
-SRC_URI="
-	https://github.com/jaraco/pip-run/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/path[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Needs network access, and another test dep nbformat
-	pip_run/tests/test_scripts.py
-)
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pip-run/pip-run-8.8.2.ebuild b/dev-python/pip-run/pip-run-8.8.2.ebuild
deleted file mode 100644
index 120e2a6d2bb7..000000000000
--- a/dev-python/pip-run/pip-run-8.8.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Install packages and run Python with them"
-HOMEPAGE="
-	https://github.com/jaraco/pip-run/
-	https://pypi.org/project/pip-run/
-"
-SRC_URI="
-	https://github.com/jaraco/pip-run/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/path[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Needs network access, and another test dep nbformat
-	pip_run/tests/test_scripts.py
-)
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pip-run/pip-run-9.0.0.ebuild b/dev-python/pip-run/pip-run-9.0.0.ebuild
index 120e2a6d2bb7..fb88142bd571 100644
--- a/dev-python/pip-run/pip-run-9.0.0.ebuild
+++ b/dev-python/pip-run/pip-run-9.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index b71b1c8294c8..7d29b9e1aaa2 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,5 +1,3 @@
-DIST poetry-core-1.3.2.gh.tar.gz 539267 BLAKE2B 43845f344f8b492aa5dae5608b8d67b41efab33c60999cc61d8476e08a9ec9870328174b371d0735624c5f11dd2ce15e19e2c984653c7349dd0c3a687dec0123 SHA512 57fca4925889bfcff9335c0f76ea0cf8b48de1cb7bdc83bab8ceee452d6a6d64c4eaa169be17fb32ee59f453256fde1191e5c36382c4be27b74b5e3c8dce7703
 DIST poetry-core-1.4.0.gh.tar.gz 556575 BLAKE2B 6a0860f965bb7d554f1f13c46d76727b9a763dd3dc04a1d889ca894c30ad91e46931308981560fadf70348731f080322da9c9590248b7877e02eb81f4009e02a SHA512 31c9b42ae8e4ec5c4cec93604a5ea72642fb89717867d7f43fdf930835c7e1da97b0251870d86841c30b1bf0ee7b167fc6a8dcfe939beb5b40acd7e24dfaede7
-EBUILD poetry-core-1.3.2.ebuild 1620 BLAKE2B 41931afbcf5767a54fb5df962676cfbd0fda0274de861431ab0f343717f1d725ff42be41b5268f5aa760013163164a07bf5b417065607a2ceb3d230b5cd84534 SHA512 541c765d3e42be2192d490a2cc86d668ffc5940909d47197de21d95e0863bd37fdf2eb41c625f44d9611c2fe81bbf9f7008756dad00951cd49c0e9988fee6df0
-EBUILD poetry-core-1.4.0.ebuild 1628 BLAKE2B d21b2534abea4c369eeadde7fd2d2ff6a1b1baf557a44454fbbc5dbd8ba506656aae294a35b64efa5f33127a76ad9ec32b71c0105bd3a90e2e58bd9253e724e9 SHA512 fe519e3c99aa9daf15bc60f3074b492381cd54a86bf915399ee45f54b6765412a653a537ace5fe817f01bb3dcb6143618ee80f7a3714f8837b6ccb6440a44c0e
+EBUILD poetry-core-1.4.0.ebuild 1620 BLAKE2B 41931afbcf5767a54fb5df962676cfbd0fda0274de861431ab0f343717f1d725ff42be41b5268f5aa760013163164a07bf5b417065607a2ceb3d230b5cd84534 SHA512 541c765d3e42be2192d490a2cc86d668ffc5940909d47197de21d95e0863bd37fdf2eb41c625f44d9611c2fe81bbf9f7008756dad00951cd49c0e9988fee6df0
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.3.2.ebuild b/dev-python/poetry-core/poetry-core-1.3.2.ebuild
deleted file mode 100644
index 8427d857ecdb..000000000000
--- a/dev-python/poetry-core/poetry-core-1.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Poetry PEP 517 Build Backend"
-HOMEPAGE="
-	https://github.com/python-poetry/poetry-core/
-	https://pypi.org/project/poetry-core/
-"
-SRC_URI="
-	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# check inside src/poetry/core/_vendor/vendor.txt
-# (note that some are indirect deps)
-RDEPEND="
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lark[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pep517[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# These "fail" bacause of glob file path resulting from newer versions
-	# in our tree than vendored. But those don't affect anything.
-	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
-	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
-)
-
-src_prepare() {
-	# remove vendoring of dependencies
-	rm -r src/poetry/core/_vendor || die
-	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# needed for migration from <1.1
-	distutils_write_namespace poetry
-	epytest
-}
diff --git a/dev-python/poetry-core/poetry-core-1.4.0.ebuild b/dev-python/poetry-core/poetry-core-1.4.0.ebuild
index c76206f1717a..8427d857ecdb 100644
--- a/dev-python/poetry-core/poetry-core-1.4.0.ebuild
+++ b/dev-python/poetry-core/poetry-core-1.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # check inside src/poetry/core/_vendor/vendor.txt
 # (note that some are indirect deps)
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index b1ff274b33d6..b8dba7ffa4b4 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -3,5 +3,5 @@ DIST pycairo-1.22.0.tar.gz 342295 BLAKE2B b331a627aea3b5fabaf9bbc089b5bb975178ea
 DIST pycairo-1.23.0.tar.gz 344623 BLAKE2B e0551e2d4259d509f3165682b11852f28f0df93e6befcd398ef95bc5f0eed0818dc72a05a9b085148d4369e9b3283bc4d91ce032c6c88a3b15962c83eb03db57 SHA512 fc0cc878cc716a6a2baf89a193facfcd89970c884afd3bb9d7fbecf42894ddd191988a8f0fe79100786509f17fbe4f1990eca33a5299414b2df2539d66de5abf
 EBUILD pycairo-1.21.0-r1.ebuild 1122 BLAKE2B 088bb708641ab60be2133d13057bce3155dc8fa78a61cb0913f70a4a3dd638a31c73368915f076ac12f9f1062d15bae499aeb1447a711f3158a52f489ddb9353 SHA512 3f88ee9496d7b8036ce20e84a0c955e2c92d032f8c7c18c131bc95ab9cdaa0f0edbf8cc682e45824562537c00670b2ddff21858842234572861e36fa44c6ce15
 EBUILD pycairo-1.22.0.ebuild 1184 BLAKE2B 39fd40fe16b66a55bffa0604c20df3ffa5bfb6386c22d2a2988571774d3e2669b0bdc509c299cb40784a3d2d7373dd8905b959b8f0b4fd6b3f1016c053862792 SHA512 6953dc63b7f06b72612cdc0f93f7440ce42387b336cc91ff68b08db169a70979c259d0a720d67e452060a0b76344a0208ae01bf3de60ab139a0c2f37a60ba257
-EBUILD pycairo-1.23.0.ebuild 1184 BLAKE2B 39fd40fe16b66a55bffa0604c20df3ffa5bfb6386c22d2a2988571774d3e2669b0bdc509c299cb40784a3d2d7373dd8905b959b8f0b4fd6b3f1016c053862792 SHA512 6953dc63b7f06b72612cdc0f93f7440ce42387b336cc91ff68b08db169a70979c259d0a720d67e452060a0b76344a0208ae01bf3de60ab139a0c2f37a60ba257
+EBUILD pycairo-1.23.0.ebuild 1177 BLAKE2B 6b181bc385a126dffee7b8b5eaac7d6b0208ccfedfdbcffde382dfc09aae65a9224b47895f695b3c0942a5908f3eabc0673649216d245cfa3ecf37b9f6f821c8 SHA512 c965218749d36712e058be64849d6fe183cc9d78f7c0dc221cdd1d86f4fa1e8e3dacd1d54e921ab2829969df34f92ccabd8c0c1c0cd51982d8d67ea2f523f448
 MISC metadata.xml 368 BLAKE2B 5e0f85e23bc56113927d28072c7178d27fc058b1e90851150c55e9e713edb96dd5daa79df8423f6719032538c9448d8afa9b750961bd82a5bcfae2d5e228c6b6 SHA512 c1e81ed2f535c8050f18950a57b71aa871b965c57d1e5ca8e8a4c48ecd643bc9ec326e046c1aea9f3f41124b9fe765a0b9b46a541c28f325cae7038cea66d086
diff --git a/dev-python/pycairo/pycairo-1.23.0.ebuild b/dev-python/pycairo/pycairo-1.23.0.ebuild
index 2c8700960b25..56427bc16995 100644
--- a/dev-python/pycairo/pycairo-1.23.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.23.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index dfbcd07de7d0..02695e7c3b9b 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,11 +1,5 @@
-DIST pylint-2.15.5.gh.tar.gz 1312932 BLAKE2B b8de4e16122ba0bea4cfd9ce3ec4a12abf5e408d7f9d60875eaac781a962c0d01af7691b3c110f2b895bcb7c2d47e0f868d5d52171594aaaecb53ea045a179b9 SHA512 a6e123ab516ef12be0651dbe144814d9f3f9263d61c259d79e9505ee3b4011b33e302281067aa5bacd504fa079f3a7aaceee4d1f9aad127bec8ebeddfeb2afbe
-DIST pylint-2.15.6.gh.tar.gz 1314945 BLAKE2B c084f419dbefb3346e75af204e576fb4b720f15f865ed8ab3e7bbd017edc3ad78c5c2f28ca26600bc40a79d8bcffc20bcde51144257374c8fbd8c63580d85192 SHA512 6e44c288dd243cb1cd8faec645edc9a60fa3fe852f189d2527c4382a415f16b612808f9d15072f5e22c4106a4ecc2f5746bea898ac76c9481a4d1eb8b30fd778
-DIST pylint-2.15.7.gh.tar.gz 1317019 BLAKE2B 46a163b41b2675efe24e04ca052ac2e9c88d075b551bb83c7d7369dd3b53c54d1f7ded12ff99ea0d2f4651e315e760fabb89149c1cc5c91676a2da2444d07a9d SHA512 6e6b544babc5c56f2e59fea7e907ea88f9d6456cebaf50ebdfe935edcc70f8b6b0d52665df7f7a2fec11578a7d8b7aea32c09aa3729aad38e9375df19ea7709f
 DIST pylint-2.15.8.gh.tar.gz 1318035 BLAKE2B 39b6a604af8e1b8d54640d9088f9a527ae2ef74535adb0fd655647f972193a955564a2acd0fadde723cf873b0765d362c9cd7dc2d8cc984b8fa0ec0107ce8968 SHA512 c5b59ca220303d66804dd55990e6d62e2cadc2ab7654e47d7ec5e16749b40ad557f43f7b8919c79e48e4b60dc1f92169df7bc312bede279b8f97aee223d9b0bd
 DIST pylint-2.15.9.gh.tar.gz 1319840 BLAKE2B 6c48b19698e4692085d010eb857dc036cf67f94f6b82df3427b00a793f410e9b6b6ef7a5e868163752aa37355e8712c4ff48edb9b740f7d254af69370058e8ca SHA512 868d39011a545ffe719bd14dc4f99d59fad2487160900391cc91bec419d1c3857012b950a1bff790cdbdcb4b9120f83faf7c6b8adb1fd033db5edc54fe7816a1
-EBUILD pylint-2.15.5.ebuild 2464 BLAKE2B 2bf3f42db574d61e67fa83910df8af134b4f8b32b831d0f521ef624009ebbef8308bed9acdaaaab02b5720412a1e618facf52e7bec3611eb71f5084ce382abfa SHA512 268783cbec0e35d9919a33e8b60fc4403b256b068eb2f2e124608ef3bcada544317daa16b99e43e628bb302c0e95400999b4e29e6e985b9782a473e577d3ccfc
-EBUILD pylint-2.15.6.ebuild 2472 BLAKE2B 19016922b61bf37c353823a2b08c3805b83d640c570a528fc3b41681d2aa4eb1f12b488092c241fded6fcfc050bbff82d9f805f5e6cd628f8aae76b4d67c71b5 SHA512 7108609cb88793acada884eb5ebebba6080d3afbf230887935c0b09e5a7d78b6cbf38a9b812161f7afee12aa9f54d3e5a89d0c65d4f081a8801c5b1177831761
-EBUILD pylint-2.15.7.ebuild 2479 BLAKE2B 71b1014d5ddf9c8954692358bed02108cf2adfd055fcfa8d4e2f337ec7693d8c5a7831781c5ac5d51aa520e729ce548d440c9d68adf9f659ad5bec9728a4be68 SHA512 d3ff5bca5fb0843d7385bdcaf2858d7423f1b708363630b58cdc6f2495cbdbbdd3a4b396c32e98b538165b06b3d7b87c5d887063ca0aa1a9da7ecf2f3ac67c1b
-EBUILD pylint-2.15.8.ebuild 2479 BLAKE2B 71b1014d5ddf9c8954692358bed02108cf2adfd055fcfa8d4e2f337ec7693d8c5a7831781c5ac5d51aa520e729ce548d440c9d68adf9f659ad5bec9728a4be68 SHA512 d3ff5bca5fb0843d7385bdcaf2858d7423f1b708363630b58cdc6f2495cbdbbdd3a4b396c32e98b538165b06b3d7b87c5d887063ca0aa1a9da7ecf2f3ac67c1b
+EBUILD pylint-2.15.8.ebuild 2471 BLAKE2B 6a23c3032572cfcf8a1f3666d6010922cd7c2520bf142d878c09bca1b5daf791a5207f57a8328d7b51ebe82eb13d37c0e2ceddf081e99969a2d70415a8e4e9e6 SHA512 b81320ff18b37f4547f71c7bb64dea52e2b8b2f3504465bf76fb588ebe22d3ff8d99cc2adf65e74a225d68da3541b04643c09c65d8409343ae44d8d9a2baad2a
 EBUILD pylint-2.15.9.ebuild 2481 BLAKE2B bb0904aad9cf9dfa2075638cd9b7d04f116a0be510faafbfcd9e6e30ac826b92053131fa89547a73e0709cd0119657742cbf394d594b25dd9e689d9d82742f7a SHA512 7dad8c92a38bf02015c40dd7c2ae58099b888af653dba40a6ba22f2ec10b25e155f124861973979214780440a8515d519cdd0311797cc945784d924ddd1f0422
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.15.5.ebuild b/dev-python/pylint/pylint-2.15.5.ebuild
deleted file mode 100644
index 549084d3b53c..000000000000
--- a/dev-python/pylint/pylint-2.15.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.14[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.12.12[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-
-		# apparently fragile, needs unpickleable plugin
-		tests/test_check_parallel.py::TestCheckParallelFramework::test_linter_with_unpickleable_plugins_is_pickleable
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.15.6.ebuild b/dev-python/pylint/pylint-2.15.6.ebuild
deleted file mode 100644
index 09a9e2a10b7b..000000000000
--- a/dev-python/pylint/pylint-2.15.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.14[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.12.12[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-
-		# apparently fragile, needs unpickleable plugin
-		tests/test_check_parallel.py::TestCheckParallelFramework::test_linter_with_unpickleable_plugins_is_pickleable
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.15.7.ebuild b/dev-python/pylint/pylint-2.15.7.ebuild
deleted file mode 100644
index 04f602fed263..000000000000
--- a/dev-python/pylint/pylint-2.15.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.14[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.12.13[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-
-		# apparently fragile, needs unpickleable plugin
-		tests/test_check_parallel.py::TestCheckParallelFramework::test_linter_with_unpickleable_plugins_is_pickleable
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.15.8.ebuild b/dev-python/pylint/pylint-2.15.8.ebuild
index 04f602fed263..94bf7ba47207 100644
--- a/dev-python/pylint/pylint-2.15.8.ebuild
+++ b/dev-python/pylint/pylint-2.15.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 2e22e7133184..c8463b6de09a 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,3 @@
-DIST pyopencl-2022.2.3.tar.gz 468218 BLAKE2B d747014c4cdb4d4303aa03fa16606f032b193497cf20909fd9e449f3c02e3d61dce55e44e93e769e4ec8f9c5f859c8d0a0f13bca1f1350dd7a29f6d92bcc3429 SHA512 b16feaa6d8a00cebb4f8c87d2aabed3472c45484eb5ecd530cb8e3478cfc9a41386203ab8cac0450b211f3330c36b3c52846e73a31e346784182f2ca9e6f4123
 DIST pyopencl-2022.2.4.tar.gz 468743 BLAKE2B 52c0d1bfc1f01eef853efb334434eba81adfaa57d98592663145b3124110765f2afa936331e36b534abadf8d87a5c606ab32ab4452e0b8e87f1ee41c1ef2548c SHA512 b1996dec89a6921216d624e5e38407dd7ada77f137e9c245f9c2dd634dd33d208ffdad57f84739e7942c64643c37ea2d044277fed85eefb362bbc331f4be3ab0
-EBUILD pyopencl-2022.2.3.ebuild 2043 BLAKE2B 71bc88e3ce59a64612e91dbe1985f198815e9e0f13e3773b13c26ef101ecbaa88279026640d342c6ba7b0d500da36b6c6d9f8320c3104183e66953e648749bbb SHA512 eb1d85310e0a24ca3ca280c3d0d40e0c189c31ec0e0d152ad0838521ae5b1538d697129b0d1ac1edd075128af28cccd4f00b661d913f404179b023d4ff4e0eab
-EBUILD pyopencl-2022.2.4.ebuild 2044 BLAKE2B 6083d65ab5496d9291bb4b7fceb41b5fc1edc466f4151be6ddc4770311c956f7e310d668fa811b37c568b7010bf59d7fd2b4f6a8434cb6f5982c9e5b20f17a2c SHA512 90255f6c485fc35319289dfe3945b459892d99801645a5bbaf08c52f1c8f0b63587ff2d62a5d8f75f24e13f9e66f0197ea98e43420ac8ea435770334ff51b669
+EBUILD pyopencl-2022.2.4.ebuild 2043 BLAKE2B 71bc88e3ce59a64612e91dbe1985f198815e9e0f13e3773b13c26ef101ecbaa88279026640d342c6ba7b0d500da36b6c6d9f8320c3104183e66953e648749bbb SHA512 eb1d85310e0a24ca3ca280c3d0d40e0c189c31ec0e0d152ad0838521ae5b1538d697129b0d1ac1edd075128af28cccd4f00b661d913f404179b023d4ff4e0eab
 MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/pyopencl-2022.2.3.ebuild b/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
deleted file mode 100644
index 6555792f7d0d..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="examples opengl"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-COMMON=">=virtual/opencl-2"
-# libglvnd is only needed for the headers
-DEPEND="${COMMON}
-	opengl? ( media-libs/libglvnd )"
-RDEPEND="${COMMON}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	test? ( dev-libs/pocl )"
-
-distutils_enable_tests pytest
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_test() {
-	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
-	local -x PYOPENCL_TEST="portable:pthread"
-	# Set the number of threads to match MAKEOPTS
-	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
-	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
-	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
-	pushd test >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2022.2.4.ebuild b/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
index 253582817f5b..6555792f7d0d 100644
--- a/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 28fe1d011cb0..4e53f70b1cac 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,7 +1,3 @@
-DIST pyphen-0.13.0.gh.tar.gz 1976723 BLAKE2B 2a2934cabf13f1b77477d131622cd2f03c342557bdfe3b2f7cfbbf31c4538850e021e074798d80300f87b2557f87cbf3bbeafd01da03b38a7036609e61e140ec SHA512 67897cec0b213a755af53ac21c61ddc1ac573a724658543174c3f88adb5f3db367fecf3afb1e7035c0d5b87e624daa2fe7650cb6e44c63d3b9ef6962bbc5d9e2
-DIST pyphen-0.13.1.gh.tar.gz 1976786 BLAKE2B f836467ab8d75f48ed17bccf629193a0c3009a8fc6af114ef86606d468d70aa68f3af5d9dc77318282825cf3d21f661b2a4a93cbf305913ead5cb11de74f474e SHA512 230aec57f0a2db11f30b15115e5ed59ce19aed60120de24783f58ef831854ad7e236ae1da086bca01f9a41cef24f8402d9e0bf9251f6d55c38aa624fd55d4a3b
 DIST pyphen-0.13.2.gh.tar.gz 1998017 BLAKE2B 7290cf7902a3dcfc9355d39de40a13b7aea20252636bdcdcd70436f59ca493dd287f96f365323c3e2d45dfc989e5418db4e3fb676602d123182c33b715ac7d26 SHA512 63bd3411c3120e73cd484eef3c3a280e9f8fee40f9aaf3fdca46c3ddf545aeb462eb4214fb239bd6a1fb6c065d5a34290f39763985e85447f413fc0af0afdae8
-EBUILD pyphen-0.13.0.ebuild 634 BLAKE2B 441a38792522c335bee9cb1192c8ff22362cd2c8751c43f1ddb0b6b98920ff730ec94ba6dc9e42108f5c8c4748e5d1fd918324a197a17d2c3a44dff0162e4dac SHA512 3427a5eb8aceb0f2ad404fb6af65906ec0771b56802e152f5d735baa432a7f4dd3edd17a6c513845da3086f83458b2a4caa91d5f7690c13db1c0c2037a575e22
-EBUILD pyphen-0.13.1.ebuild 598 BLAKE2B efe89f7a31f0f86742d57dedc3119da85676cbc69a31bb62230fd7683129951be7b785311ea1e596cc8c52194cc456e4d076557f095513231fc75bc6bb66a534 SHA512 6113ea47574b662dd6f02f4702b6bd3adb9ddcffc2b8f13c0ee397023196e084080524ad9cf6c69466162935c632fb26391658f6baafeea8f172bed8e53979e8
-EBUILD pyphen-0.13.2.ebuild 598 BLAKE2B efe89f7a31f0f86742d57dedc3119da85676cbc69a31bb62230fd7683129951be7b785311ea1e596cc8c52194cc456e4d076557f095513231fc75bc6bb66a534 SHA512 6113ea47574b662dd6f02f4702b6bd3adb9ddcffc2b8f13c0ee397023196e084080524ad9cf6c69466162935c632fb26391658f6baafeea8f172bed8e53979e8
+EBUILD pyphen-0.13.2.ebuild 596 BLAKE2B fdb94d1eb66d57dcf4ff0fd7b302598f391be30cebffc3e12bb544b187e965e1406074558013a699d83a1f731a12efc90560bea75b3f3101a752e67c4711b559 SHA512 c5c139c05c76d5f8114ecccbfb7301c2df2ca9426fc4a9d2e512fbc4daa3b95da77fc07364393920db11bf89eec474f18648faea05a4ed670301737fbbf413e6
 MISC metadata.xml 386 BLAKE2B 884bd76d980e70fcec706674b5363dfebc74931eac7a2e06cd77e5ca2cd7a72ec0673e44dd05a17dd16f91b7d43b7f97c996bb3994045adb008d97b64ef40c0f SHA512 20752bbbc3c47d4a6f1330a552a5c02bb5fc036f3656c067cb6ebcb4ac2fe2e766c343ec90542aa3ff7465d0726fcf705118ac03d743508ab135261fb115f8f8
diff --git a/dev-python/pyphen/pyphen-0.13.0.ebuild b/dev-python/pyphen/pyphen-0.13.0.ebuild
deleted file mode 100644
index 6a0b0835f6a0..000000000000
--- a/dev-python/pyphen/pyphen-0.13.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-HOMEPAGE="https://github.com/Kozea/Pyphen"
-SRC_URI="https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# avoid dep on extra plugins
-	sed -e '/addopts/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyphen/pyphen-0.13.1.ebuild b/dev-python/pyphen/pyphen-0.13.1.ebuild
deleted file mode 100644
index 8e9142ded36e..000000000000
--- a/dev-python/pyphen/pyphen-0.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-HOMEPAGE="
-	https://github.com/Kozea/Pyphen/
-	https://pypi.org/project/pyphen/
-"
-SRC_URI="
-	https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P^}
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -o addopts=
-}
diff --git a/dev-python/pyphen/pyphen-0.13.2.ebuild b/dev-python/pyphen/pyphen-0.13.2.ebuild
index 8e9142ded36e..e8239222450f 100644
--- a/dev-python/pyphen/pyphen-0.13.2.ebuild
+++ b/dev-python/pyphen/pyphen-0.13.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index a8d5f8fb9900..377b6121afc4 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,13 +1,3 @@
-DIST pytest-check-1.0.10.tar.gz 15603 BLAKE2B e51dbb2806bdac73e202b14668c76675979113f661eb339a1a3cff07069d3d4709869d67ea2cb6384483ebde8b68288026df9b7492b17ea67c79ee95e6865809 SHA512 dc3a80b20637eab8adda085ca8172bc3bde75bd47566972a07cf226bb38771933a531d99e139d7c220cc149715fd7d98ab964f72e0b520e8dd3df7633a6e5a90
-DIST pytest-check-1.1.2.tar.gz 19090 BLAKE2B 25d483c29f7a357b26d6153582e9ca0a4b6f6c5c97baf9e8a12403de6993f44fa4d4eea370f1c800036062abffb68cbcf826c210f7eb32ef4fefcbfde031674f SHA512 64e74e399cecc6733aeca7ca88dedb110029394548c0b3e27d0f35e034887fbb9a3d6a2da7b30e52a5fa68f535e15373173ffaf391afa02783009e5edb6637d3
-DIST pytest-check-1.1.3.tar.gz 19461 BLAKE2B e6ba332f3326992842a50323c6062283c3227d15526cc0f33f51a90455e7a30f0f53e96907896eeecce4a13b8e6fafcc8112eecfc844310200e107e92150d3d0 SHA512 af89cc90de9a72600d79947d2f771fe878dc55add754dae447afe8c0df47745842c35867ebc104825189c119858a7ddde992e91b48dab4f9e74fd71e7b55f51e
-DIST pytest-check-1.2.0.tar.gz 20105 BLAKE2B c8f8a8ec38a3f6162fa43b90d757c3fd0867bb3ec2e04f4de2fe194aeb75041d925220f2b6fe222b3ae9d4dde8202680f9712b5b4c9a90224e9f0c0c81925b6d SHA512 585e727a817106f25dbd59aa6ee7f06565d0d216caa189001b18aee1f6e96aacb07e0886af6ca96fd36dacae1246a9acccee9b23341afc51981c7c496602d406
-DIST pytest-check-1.2.1.tar.gz 20677 BLAKE2B a6ead4a45db9f8d3cb8226be08559bdde4df5ff0b0015213a36b354257cc6995603e93e645367008ff08a85640121124029fa4d6616423c674e0aca1097b51c4 SHA512 dcdbf099e5cff63aa6ce3aa96a7aef9b59382baf051d3682a7775d90e6c14718dcdd540d1467073d3e747f6bf587e8e0f05f280ee52a4b1e56d2db1c4d982ea2
 DIST pytest-check-1.3.0.tar.gz 23763 BLAKE2B 95f98c679aed6bd1a16ffb72a4da0e0177d83c785343aa8c102c1e31f2a148fe78bf3aa49630bebf1b05a338dd9d2d075eb02ef1dff8e63175af22cf3f194ed7 SHA512 4c513f01d2f7a9302afdb3be7ff3f9da6f3b0af8469bab85bb103a6a16b4955c238251b2c46643d71d18c1476976cb5e49ee3c63d6752c8ac2591e14cda9db34
-EBUILD pytest-check-1.0.10.ebuild 807 BLAKE2B c3aa0f860155660588326f82afa57021271c19a9afe01d378dbdda6f87753f5056442557e0b3c09044cba9cfe4fb5ff3cd47eeadef2ce3bb5ffa94dc23132109 SHA512 1104ee4ae8b6a41f5826efdf9737d52a53148987fef67b7d28649f8e89cd4abb175e4ab0882735d281cb1de1ef9fc8a4a3667215c26827417556a74d9720094b
-EBUILD pytest-check-1.1.2-r1.ebuild 643 BLAKE2B 41e4324942061a428d3f191177a2dda6f7cd249c607684e310810ae03d4035d5a0f6b8bbfa349a9fb23604121ca297e7576509fb5acdcefd3df3e28dbc603a51 SHA512 d783f0baf0441dc4c9df3de9e1b13dfe93834f957ca357423ccd355ebc6496422beba89712ed31ddacfb29bc19b0a7ee73a70eb9f2d63e7da9911be953728860
-EBUILD pytest-check-1.1.3.ebuild 643 BLAKE2B 06465b07cbd78fab1c8a914698a152f4c12924eb4114f64b35620e9640938bc7eeb2ccc417764e6440269f792d305a2570ee5f4e84e0af988828133044f4b91c SHA512 73ff6df7cac7028df988c0633b661442d9836e735032e6f668fcc5ba500b1ebfa223144666174d6d1c06019d168332b3eff0507f90507dc75e79ea2bae8821ed
-EBUILD pytest-check-1.2.0.ebuild 643 BLAKE2B 06465b07cbd78fab1c8a914698a152f4c12924eb4114f64b35620e9640938bc7eeb2ccc417764e6440269f792d305a2570ee5f4e84e0af988828133044f4b91c SHA512 73ff6df7cac7028df988c0633b661442d9836e735032e6f668fcc5ba500b1ebfa223144666174d6d1c06019d168332b3eff0507f90507dc75e79ea2bae8821ed
-EBUILD pytest-check-1.2.1.ebuild 643 BLAKE2B 06465b07cbd78fab1c8a914698a152f4c12924eb4114f64b35620e9640938bc7eeb2ccc417764e6440269f792d305a2570ee5f4e84e0af988828133044f4b91c SHA512 73ff6df7cac7028df988c0633b661442d9836e735032e6f668fcc5ba500b1ebfa223144666174d6d1c06019d168332b3eff0507f90507dc75e79ea2bae8821ed
-EBUILD pytest-check-1.3.0.ebuild 643 BLAKE2B 06465b07cbd78fab1c8a914698a152f4c12924eb4114f64b35620e9640938bc7eeb2ccc417764e6440269f792d305a2570ee5f4e84e0af988828133044f4b91c SHA512 73ff6df7cac7028df988c0633b661442d9836e735032e6f668fcc5ba500b1ebfa223144666174d6d1c06019d168332b3eff0507f90507dc75e79ea2bae8821ed
+EBUILD pytest-check-1.3.0.ebuild 636 BLAKE2B 887989e706f1578298ae4a36f418b3bda9d20fbd1e1743c5f6df7f902f5235d9db5d44368fc09c636dc0d6652919ce3fef2ad66a994d9dc79469ad4ed2536585 SHA512 469e591a1f90f2daeb17724a4cf7f58bbdfc3db7543c75100104246494d835c482ae3f85e8fce9ed7e9f6a167684e75d79df3d213eb885f5a08db786a733c004
 MISC metadata.xml 509 BLAKE2B 85ec27b195520ffaf65e8f9a0fe166f0ba07aa22bb8981d558f96d2d89cb00441478eacc47a482bf2243d26b015ff42a1058c2e90a58d7cfbb20bc521b5722f5 SHA512 8d9082c66dde73cd751e3b42fc08ddd3c1815f6a7882d1b659972e5fff64506de79265df97161d63f05e3106c818b0155c2c3e21c861a44d330ff57506bd64a3
diff --git a/dev-python/pytest-check/pytest-check-1.0.10.ebuild b/dev-python/pytest-check/pytest-check-1.0.10.ebuild
deleted file mode 100644
index 6e39e332ac34..000000000000
--- a/dev-python/pytest-check/pytest-check-1.0.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest_check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Fix expecting result in case pytest throws deprecation warnings
-	sed -e '/fnmatch_lines/s/\* /\*/g' \
-		-e '/fnmatch_lines/s/ \*/\*/g' \
-		-i tests/test_check.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-check/pytest-check-1.1.2-r1.ebuild b/dev-python/pytest-check/pytest-check-1.1.2-r1.ebuild
deleted file mode 100644
index fcf57cb94962..000000000000
--- a/dev-python/pytest-check/pytest-check-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest_check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-1.1.3.ebuild b/dev-python/pytest-check/pytest-check-1.1.3.ebuild
deleted file mode 100644
index 9a459557d506..000000000000
--- a/dev-python/pytest-check/pytest-check-1.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-1.2.0.ebuild b/dev-python/pytest-check/pytest-check-1.2.0.ebuild
deleted file mode 100644
index 9a459557d506..000000000000
--- a/dev-python/pytest-check/pytest-check-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-1.2.1.ebuild b/dev-python/pytest-check/pytest-check-1.2.1.ebuild
deleted file mode 100644
index 9a459557d506..000000000000
--- a/dev-python/pytest-check/pytest-check-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-1.3.0.ebuild b/dev-python/pytest-check/pytest-check-1.3.0.ebuild
index 9a459557d506..e631d25e8f8f 100644
--- a/dev-python/pytest-check/pytest-check-1.3.0.ebuild
+++ b/dev-python/pytest-check/pytest-check-1.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="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-describe/Manifest b/dev-python/pytest-describe/Manifest
index 95ffcee9222e..55051a3dddf6 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-2.0.1.tar.gz 9793 BLAKE2B e7816cbc68e1ed1e2686ce3437cd0f59a52191d5413dbc9e0d6f9530a57728ad0917d86680b91228aa55ce689bc16c4da83595f87d82f9be9c4ce222c46fefea SHA512 c74362d5f1b0f3ff6d35d9049e82b7dc54be6755f1daa13366c47dee1ab9f1b1085d8c9719952d75c3c6c58b76a2c5f6b0162c78e53da71fe09bd91ed27f6bf2
-EBUILD pytest-describe-2.0.1-r1.ebuild 731 BLAKE2B ca6c10e3e8c951c1db2707ed239714282f7b7d08423795fedb8d935a141fb867af44b09a40e271e8ddaef8afb49e19cc6e2b7f1c6b5b992ddf75d7c07de846f0 SHA512 c5b9d09b8ae885782da1e02f5b3353183dd23b3eb70e0149f10a33f8929c3204a4e7895edaad3b3ebeab49e0d2edc6709b6c1686d9980e75a341019ddcdba42d
+EBUILD pytest-describe-2.0.1-r1.ebuild 797 BLAKE2B 86359fff347c543ca3bcfd7c9e7a7a21c26d870ba009ab61ff1c76a7a6fa49c5cb8d6c7ee0974c504cdcecf13c1db3c41089bbd0c22f45e6968c863baa6bc2ff SHA512 85bdaf45bdfc59d0270fbd57db5b9475672821997dd98b79c0c091688702dade4ae5e4ccc818f1928e1f195281111edc84a6dba04fa5069e79375803fd8745c3
 MISC metadata.xml 409 BLAKE2B 00d21d44dc08a1a7166d85d5be7ce30b7af5d36e3e28bdcebb5f4495f9a5508bb7bc7f534aae9c242b0708a5e7c8bda4e693a2b05efac94e4283b1c8172ac5d0 SHA512 60e89b39de96adf0c7b80aa46b67544bce41c95eb2076e6f546f04ae46cf7d69709f89b9475c8e5b821b52afa9b3c344f2f5d7789fb2ceeba49facadc5d4c56b
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
index 36550c410a31..b739cdca9b44 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
@@ -5,18 +5,29 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
-	https://pypi.org/project/pytest-describe/"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-describe/
+	https://pypi.org/project/pytest-describe/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index f14a14d949ff..97452c8db877 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-httpserver-1.0.6.gh.tar.gz 83737 BLAKE2B d0db97227bcb3336a4bd944cf26e2d3e96132baee5991cdff901a1f546174e977b6472458911fc6b92bb13b6d3dae499e0bf3507be265385601e838c4781f0a3 SHA512 5eacfbf159f3a09d73f54da8f3ff885b8d2138e430af27df6039a30e63d7ebcbcf088efe8e7fa56ed50b66ea5b7e3ad7a61c0e8a57d5cb100c2a063df7b6f5c4
-EBUILD pytest-httpserver-1.0.6.ebuild 869 BLAKE2B b87c9271f35018008a6033b89074dc97a179e55832a827d62d70035cd2358e697d219363b453de533337120da8899c12f89b4c0ccfd223c07bb75f64df93e8ec SHA512 5dcffbca6a69d8b0040f849d7d7b2dbf2ae5e5349aabda262aad238cb2d6638ce493c93552284e2a84241d3778a42f50de38840f4b3b194734e8c77dca36bbef
+EBUILD pytest-httpserver-1.0.6.ebuild 864 BLAKE2B 334afd7f5dbae7201e9086658e1cc547db40affc7e4077a8cfbbb8811c7cc484de18bbf82fe812bf41a0a4ae8cb61c01a1846138463ff55de91a6884dd4401fb SHA512 38ee9c76729a7d99ece5e70b78e8d63f15fd7d1861a12166e84e9cf0aee422f91d129caeda20da4073ae4ab03a141623f5e0bffcaba5be621d1f3a01bde471b3
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
index 7150db56970c..0fadc69c0418 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 4c36cf92705b..195158506461 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-mock-3.10.0.tar.gz 28384 BLAKE2B 2f51f8be34094054b8f7864eb083dde00800adb73af668444d21c95d8f159594bed0f68694e7ffb0e24da402a4865f37c07d85622ad00f130ccdb4e3d189bf9a SHA512 2ad6866d581a2999899e399ef5516d478a6172f52923f03703e3e3708229fb3b1178c91225b5cc90734c96abcb48fea517b11e0fc193da6fb592295395c14cd3
-EBUILD pytest-mock-3.10.0.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
+EBUILD pytest-mock-3.10.0.ebuild 1229 BLAKE2B 29af04b1ff9673403a134f46ae050b8ae0e8fda2a70167f5e8136fe66a42ee495275cd9d8b59a124a9a0f1b7669da52145df90e81782eb32a5fb0ff32104c406 SHA512 bda85887257541974abadfcfa9bd1d26a8d48fec815ae321df720a63f3c2c933c30b554e28a33da239b80ed4f1fc6c535708fa117e291fe9dd54ae98d82c6773
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
index 6266e8ce070c..c71b9b8faec7 100644
--- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
@@ -31,6 +31,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# obsolete, upst. e2016928db1147a2a46de6ee9fa878ca0e9d8fc8
+	sed -i -e '/import py\.code/d' tests/test_pytest_mock.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 62491ec023a3..1f78e53f691f 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-rerunfailures-10.2.tar.gz 15863 BLAKE2B 9f317f3a39ac234e145a14d532d2727bb9fb5fead65c05372cf95268e0f589f9de994cd3c47e75dcb354c996595698c43fccdea5134d2e1921429c8ea7b71451 SHA512 8830610276e2cc172ee372ae4d8376bc6329138751ea2737a4def6af32d05c112c872a7a180ff554018058c05ed0d109927dbac61f748586257e40b0243f03c8
 DIST pytest-rerunfailures-10.3.tar.gz 15852 BLAKE2B 1063f55f4145eff4db22f121620cb3a53ad8cd0c44580578bd5027c4bd8005af6d33e0da8d67fceb7b8abe91f22c591e7b42b7a810cb5c7d8b5668b0a48eb3f2 SHA512 30ebafdb221d7ff8c46d50795b1a342b55293eaf60f5a012c631e2333dcf3114bfc4ed5210705edba4ad33a8f215ce7b5988362750149fc5e9463e4c3fa93860
-EBUILD pytest-rerunfailures-10.2-r1.ebuild 899 BLAKE2B 523b954d54f811a155b4b63232c76f2da365f2409e391fb50b831e38c680276396f6d4f4d0c6425a5808c2b875230fbe8bcca19790b1f5537faeddbfbd7ec2de SHA512 45347b510fac16dd65b82feee2ae6a81f7acbce40ae108d570431030cfbdbbfd71b500564177cb298d8b5053186b25e788226463e5cddb1fb019a10641723342
-EBUILD pytest-rerunfailures-10.3.ebuild 811 BLAKE2B d10386cf0bd51587ee62ca9946bc9b034b3edb2c82fa4d84e0648fa1c5974754848aacf0a45c569879464083f05253315f4643cd53283a497ef5af9dd69001ef SHA512 7449a3b2ba68a36a937a0da17f82987210214b9ee4de548995e33a80cf5d0f424368626735b5c496d0c68d493ab00dd81cc861285739b73fb161743e8a42f2b6
+EBUILD pytest-rerunfailures-10.3.ebuild 803 BLAKE2B d2af6d053ff574d78e828bc6b2e4ce281fd6413118b9b1cedc8a79b2d34bd7a66c23cc461368a81aa530326c6441492b3c92354303ed0652e89d31518964c3b8 SHA512 b96b9bfbba2ff7a9cd614f99b394fa951de30bfd17ebd88231db7bdd4eda05e5be21e1daa2697efe63c1a446f0783b1a542ec1da0cae1e3a73bbad18c4894063
 MISC metadata.xml 432 BLAKE2B 3bbb0bd303a26d2a336563f187160b3b023e6d7a3a776922dee4853164d7461f395e840b2c0ba1349687d24050ccb5fd18166aeec397c9b21a1aa0e6b536b795 SHA512 f372a1f73a4dc3e60f66bd6049cddb4d8cd8fe53bebff2a6d194eb3d5872adab9b7ac226971696fb24a8d4e4744427c4d4148054fc51a94f63320d428ef80d52
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
deleted file mode 100644
index d87d0f5754ea..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-rerunfailures/
-	https://pypi.org/project/pytest-rerunfailures/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_rerunfailures
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=,xdist.plugin
-	fi
-	epytest
-}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.3.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.3.ebuild
index db19fb8cb3d3..f793e1ca76c6 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.3.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 648b35804472..09ed1192a368 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,7 +1,3 @@
-DIST python-nbxmpp-3.2.4.tar.bz2 131867 BLAKE2B bfe0fe559b62e0ba526adac810bf9ed4e491349ce8535ea6ab3d476a1b1c18accfeb450a327b1e81994f2960a475b872169a61aac67d1f16767bad18f6e5e223 SHA512 4ac1c69741b4c202c463ade601bb027f4a5442da1052e2657b1319f2b9bb6dd723033b3dcf175d655205f2e918ef1b7e3e93410fc812c847d2da7ceb48420d37
 DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
-DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
-EBUILD python-nbxmpp-2.0.6-r1.ebuild 775 BLAKE2B 48695b7203542f64726780e76d40867dfc84300606216f66c2bdacffc924f374f3d75053744646476ec14170c0256cc467396745877dc302ecbc9eb9beda7d87 SHA512 578923f71a4f12afb3a78c23efeab70ac6c4859bce84a9dbc4019e1646593e0813f48f092bce3273095469957ccc79a853802a3f2794bfec79db94c64d5b4f1f
-EBUILD python-nbxmpp-3.2.4-r1.ebuild 749 BLAKE2B 866d7ca9a604d2dccdbe37106015c9e97d881b14b636210c6268a967cbae2b8dbda1decdde926beb50f1bbdca65f7c995d46665386dece17dd7393f0393ae87c SHA512 801a98e2620648d92fbd1f5de5c27733a8e476ac7d34427ee4fff51784b0b8f9cc38288a2d500d0feb4e47bd1f2b2489d9923dd4817dce1f67d2291875064a0f
-EBUILD python-nbxmpp-3.2.5-r1.ebuild 751 BLAKE2B 76af1437f651309af45fe97d01e17d5133b903a27a5190ca45b360ecd2842bc1c6aab6c976544322623dd259c66faefa9f003a707318cea98af0601a5f97947b SHA512 d2d8eeb47a8fe56c0f09e2251bd4dbb26fefd152fe303aea40c4f1b558fa19c1771bf79288eb60bd021cb92b62bd5664decc74ebb25ac79303fffe94c0d0efbb
+EBUILD python-nbxmpp-3.2.5-r1.ebuild 749 BLAKE2B 866d7ca9a604d2dccdbe37106015c9e97d881b14b636210c6268a967cbae2b8dbda1decdde926beb50f1bbdca65f7c995d46665386dece17dd7393f0393ae87c SHA512 801a98e2620648d92fbd1f5de5c27733a8e476ac7d34427ee4fff51784b0b8f9cc38288a2d500d0feb4e47bd1f2b2489d9923dd4817dce1f67d2291875064a0f
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6-r1.ebuild
deleted file mode 100644
index 4f63273ed92d..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:2.4[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4-r1.ebuild
deleted file mode 100644
index 3bbf41814a17..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:2.4[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.5-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.5-r1.ebuild
index b0bb1169e3fb..3bbf41814a17 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.5-r1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.2.5-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index bd64d3dee364..597f336c4a91 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-neutronclient-8.1.0.tar.gz 304482 BLAKE2B c68426197913b8159efc590b0e4db4d9ac7abf7f3dba197d7f429b1fd489f7b545ba674a6acb3a395f529ec0a0009c06b8dea892f6c7895ec23d7172bf14c294 SHA512 d6c735c9a5ff0af1f3187d6cf46221138cb2f1dc3df2260aa9a7d10b0668137efa29d2e3cb6e2169b2d0801e03f6161aa08c0d499d9c9eae86fc8a1d32697e26
 DIST python-neutronclient-8.2.0.tar.gz 305020 BLAKE2B dd09015fcc91028300c4185f208a7d532734c3b4ce1a616855eda6a25afb73be620548301ba7e42144a9ce33983c7966818f43f5cbbfbb8695b61c837d89831f SHA512 b8ff0b143bd4f8d99c5e8778e6669a80231f81dc353674a1d9964df53db9b49a0347d613f9d9c13b8e8ac355d2b50795cc27712cab2d798963ae0e8d5e4a5564
-EBUILD python-neutronclient-8.1.0.ebuild 2242 BLAKE2B 652582a9b006c17bc92c9f6c29fda3385677d7d6a7f4869420ff1b979776a6eee2b049a27afbc4440dedf607cf70a5611cf9adebbc5d9f626bb11b48c0df7271 SHA512 a1271d1d26ba54fe0c53a488459452ed40a56009a81fc31e25c954a9a803beec2dcd922168735c3e45a2ec065f535ffda06d8ea748ee6e20e76436b9f5e57f64
-EBUILD python-neutronclient-8.2.0.ebuild 2285 BLAKE2B 58a6cb0033bff425d592e32b41ac5fb1fe14e257fed5751c1d112dc6b1ebd1bb68d96b9cb9f578904c59a1f64f729da59670fab785094b7bdf263da3a2493c68 SHA512 8862e45c0c7be99273965cf80cf7e397eaba61cda91b4515b588bbead204aba8e9fc3a2b2d13c12e217291162d05b12b9636ed8c5529f223d20ff060366b4651
+EBUILD python-neutronclient-8.2.0.ebuild 2283 BLAKE2B bf82e888f5d63a259b5a30c4f77326b76a7f0a69612ee1062bc3645f645c23ea92598b3a2ae7800016432b43e4cd6963ea5a42f546584db9a67762e1fd85ecb6 SHA512 efcd26013e82d1748371433db4d054bbdf8e48dcc93e9f6085fc42b2ebe7ee549d70896f1d11b0d68d48f887b5c039fc6a9f22c093f304f8b5800fd535372537
 MISC metadata.xml 645 BLAKE2B 7c6f6fa18789cbd9334a7d611b47f5d2b9b0110a2c15cfcd50b95a4be593e8d5c7fa5d53a2db8a82c68c6e9f75db668cef4b4dfa7aa446f4cada0db80a669acb SHA512 035c9734f11c8b8d1edad8991c527d51060f58a171dbacd26c62a37cf8b061df318fad31ca352c17116e77e7e2338a85cfd8ee8550b10a2f93eb7ca3be3fd192
diff --git a/dev-python/python-neutronclient/python-neutronclient-8.1.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-8.1.0.ebuild
deleted file mode 100644
index 143e5e0a0ef8..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-8.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Needs osprofile
-	rm neutronclient/tests/unit/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b neutronclient.tests.unit
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-8.2.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-8.2.0.ebuild
index 11bb470a36ef..e3c42b45d362 100644
--- a/dev-python/python-neutronclient/python-neutronclient-8.2.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-8.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 4a08e93f6ded..d8969dfb0b9a 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-novaclient-18.1.0.tar.gz 337772 BLAKE2B 593b47e86401e83ca9b42a62bb42e531becc8ca66fb460675f3bfacea237c6d643dd38cd41abb0185714c5ee1afae10c5aea269f16672cd5131f6058e08064d6 SHA512 907acbb3b9aae0c0ad463425260b2ca4ff968efd9ac2113b36d19dfa5bced29fca0ca6f549b479b3b6089b9b6e558f3ae31617edd99e2485eafe8403893f6501
 DIST python-novaclient-18.2.0.tar.gz 337940 BLAKE2B 8b019d55089688030696a3407cbc33df09b9857fc63173a4ed4983374a35593612e43e99b0b840e239fccb42b31d97d16502d0284734789acb7b647b001b17a1 SHA512 3321449f143c253a494477296e2b4ccb20ffba877f0257b4f5e39c977946748275018c8b4094b370d2d4727325c9292a5f2c6f3f11478bd13469174de9d19390
-EBUILD python-novaclient-18.1.0.ebuild 1936 BLAKE2B 1a89bbe275a97f304b1938c7d77a726577d8635148fcada5f82ade89a6fb4fbf7a3e06a5c98d92560ec107ecb7dafda8c108e882a1bee9ca142982529848d400 SHA512 73e1c7c7d8365772660e71977e7cf7bf74647c012e9fd4ffe53f6c8eb84f41aad916a8a68c0afff2be9851839599a26dd8072b1b13670ef2aa371727f47101c7
-EBUILD python-novaclient-18.2.0.ebuild 1939 BLAKE2B 8da9bc0c9a39468824acc0ae1370e9da16c4af9073e1c17e6ddaad12e9e584770a4c05b28c344e104c0ad1dac40220bdfa0e3a4d86b15c1fbf50ad61cb6dfd3d SHA512 a39ad798b009659f886a1895b2399d5bbfc01cef3af8e440abc34479a7fa7dcf881c761606b8016582c4c4954e0a82f70ff848c44ac94b214e2bdd2886638e42
+EBUILD python-novaclient-18.2.0.ebuild 1937 BLAKE2B 9d469ed2ff41e592846df7e9b76f45705801fb6c1d66616c1926e027545217b7e9b749e35badd7113f0b9a6c46bf9869a4a5fa9d672d14408a8c530ccdfc6580 SHA512 09040f777947658559dc0502cc466edecb49e3d49cf62e7f856919e0e6777c8317528d5e1bbf7ba0107cfc17ea86b5fa10e25c70f26f407066eca4e6e673814b
 MISC metadata.xml 893 BLAKE2B 42037d5052de72a81e2aac430fd14d107a0fa723c4288cd7f599bef817975ecc6b1dfc82b754ace2a50e4f9e0f5870cc6a43a3f0722d7647a38322e6cfde7eb8 SHA512 f89bf49eddaa5803ab953abc2dac189252095e529071cbd6412c15885e0a890a8e73a71295d3c3f9ebfb16bfe321316693c104d330037d112d03e04eadbf5a4d
diff --git a/dev-python/python-novaclient/python-novaclient-18.1.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.1.0.ebuild
deleted file mode 100644
index 2dedbf4cdc28..000000000000
--- a/dev-python/python-novaclient/python-novaclient-18.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-# Tests fail with dev-python/prettytable-3.4.0
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		dev-python/python-cinderclient[${PYTHON_USEDEP}]
-		dev-python/python-glanceclient[${PYTHON_USEDEP}]
-		dev-python/python-neutronclient[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/openstacksdk[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		<dev-python/prettytable-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
-	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b novaclient/tests/unit
-}
diff --git a/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
index 1d18673c8259..aa9638733608 100644
--- a/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 865c543da16f..02180cc253f3 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,5 +1,3 @@
-DIST python-slugify-6.1.2.tar.gz 13302 BLAKE2B 600ac1cc37cd0001ca3c08cdccb4655dd3754f7673596eada2dfb6adcb6c190f0e5644bd1cba4debf0fae42ae183b3d81acdcc09270e3ade94076d69ba25895a SHA512 3748c18d469032fc002318fbd5730b96a6f8430ff7b0b1a9afb4c19d4dd8e7528400682fa6b2fcc11ec4230917d7e7f61de290f5b199935d77d5335006af0ffb
 DIST python-slugify-7.0.0.gh.tar.gz 13257 BLAKE2B 6d50fd25ac89caed3a970f4cce786d9b61de68386fc183659c0d884877edc934e121ad07316259af08deb61a30ac33f0076a90b2d5a650dfb113e6b6416addfe SHA512 c22743a28ffb273546541eaf59d2a7beb9070a7f81e504acaf73d220c2be83a87d02012b5841076539ba6bae5778dd47309ee7ceef9f8479c993dda6b3e09837
-EBUILD python-slugify-6.1.2.ebuild 594 BLAKE2B 380f92dec445d336032dfef1275603db24ee4db779c8e1cbbe25df03d0ac6a81a26f02819147e01b80fc13624919d147b40b8c800424da89b79780a366484535 SHA512 d84326a73774731dfabe4c63604444bd3a21441ca7fe5ee932546f89ac19161f1bd5d372cf1d0291636aec26fbd03942ef56da32fdd38a80c5d0c82a72b2071a
-EBUILD python-slugify-7.0.0.ebuild 601 BLAKE2B 274201fc7a7ea4f6cc141fbb663e5239809690ba40c73576f4e49ec85007825a78a4adbe0880c6f8f4902448e2bc94254e95046a573decf737eb07b5c92ead1c SHA512 651019a1d7210c9231c034c37b5e5306fd7d3bf20a12c57d3f1c93c57d39c07a711478f5d2471c79715977f10c9ab30825d301b0c529faee627c95fb59648358
+EBUILD python-slugify-7.0.0.ebuild 599 BLAKE2B 88026a3ae71298e893f442bd860e61871a9db40441eeb66d40d4d5f1d24db330c406cc5059f56e34ab8efcf5843a56e70e3045c57b5d44de7df2a6b5c9257784 SHA512 0a9a92f419da35dbf9194299a6f75b53a856485fe773e5cb58ccf1e2ebfaebdf2eed98ab1bdf84429dc2b0d6998cd340622d9d16ad8dc41fc66bfa85e44dac5b
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-6.1.2.ebuild b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
deleted file mode 100644
index 7a7756dadee1..000000000000
--- a/dev-python/python-slugify/python-slugify-6.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="
-	https://github.com/un33k/python-slugify/
-	https://pypi.org/project/python-slugify/
-"
-SRC_URI="
-	https://github.com/un33k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/text-unidecode[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-7.0.0.ebuild b/dev-python/python-slugify/python-slugify-7.0.0.ebuild
index a12154fd4646..d2e01bed3b32 100644
--- a/dev-python/python-slugify/python-slugify-7.0.0.ebuild
+++ b/dev-python/python-slugify/python-slugify-7.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/text-unidecode[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 213804f01858..fc364e957e16 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,5 +1,3 @@
-DIST pytools-2022.1.12.tar.gz 70346 BLAKE2B 6f3fc1b55185e0ea7e680a089d66c7f64b9d3312ebf02c3fdba776f49d6156ccb83f5eef9139f1c6f9e17448f102c38661c2cd07e33277923f9379a017e72194 SHA512 66a4a60b26ee543a774322583a22105f5e886cb86956b4edb95ae361a5aa6cff28b1bcf6ad84b9e2f68c81bb11f5a18bd2e8d0335343550a6e9bca4cb0e9c0e8
 DIST pytools-2022.1.13.tar.gz 71650 BLAKE2B d12a1081ae2dd063ff4bf04a8e364dc35730b89a1e937ff9a470d2c3a9a1f53f5eaa5eb328831f659f1db1f4e03d2522ad8a4126da67cc5b4ef3798589b4a309 SHA512 305c78659b2a32a3d64dbecd4ca2f860554690ec74455c3dfaf3c5434a3e37dfa9dd733d2e5a14736ef5a09bb2c923e7eedde6851e99472f87c849d005fd2e78
-EBUILD pytools-2022.1.12.ebuild 872 BLAKE2B 14f780554979838b3ce1f717836d6a6af0a19cf55ff9fac3925a5578e27526ff2daa78da64fd240d0cef9d483722045d03f6d32091aa2fa95d1f303762fc64aa SHA512 bf8bd973a4c88c160ac44f0069a166ff02f7e6a7509d2d0ac70f03f8593d03394af68a987e784d80001c4f70e6886632b00a08108e5e9c99db270d62422d678a
-EBUILD pytools-2022.1.13.ebuild 873 BLAKE2B 1c5166a57cf372cfc829a6ac48d9a8bd82d01d3d070102de3684f9c8704e153ed8170dd6484426041cdb8b9233b48415ca2a85efa99fb857d7a5bf0aabccb3ef SHA512 706aabb92944ff2201ba02423cd9e2a704607cb7ce797d26a8a11b683689eb77b60dfd0e538b0b49aa88eb79f3cb805621d8aa7101182c2bf2acb5ee39a3a310
+EBUILD pytools-2022.1.13.ebuild 872 BLAKE2B 14f780554979838b3ce1f717836d6a6af0a19cf55ff9fac3925a5578e27526ff2daa78da64fd240d0cef9d483722045d03f6d32091aa2fa95d1f303762fc64aa SHA512 bf8bd973a4c88c160ac44f0069a166ff02f7e6a7509d2d0ac70f03f8593d03394af68a987e784d80001c4f70e6886632b00a08108e5e9c99db270d62422d678a
 MISC metadata.xml 496 BLAKE2B d0067ed5726907ed3d635fc88dc33722335e7c853ee4a5a1c727faecdf6a78ab7de4261fe40c5c903908e1f2b8eb597ff3c014044fc7ea02bc357254d544da64 SHA512 c6b546564e9c54bccc55f83310ff194192be0673bfe552e18e29a82e87d2caf4c0d51e42d1675cf5b8f6dff1fa1410676f71c9c0c56273ba6efc4efc608c43d9
diff --git a/dev-python/pytools/pytools-2022.1.12.ebuild b/dev-python/pytools/pytools-2022.1.12.ebuild
deleted file mode 100644
index 8a9239f4c385..000000000000
--- a/dev-python/pytools/pytools-2022.1.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-# NB: numpy is now an "extra" (optional) dep -- we can remove it from
-# RDEPEND If revdeps don't need it
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=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)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.13.ebuild b/dev-python/pytools/pytools-2022.1.13.ebuild
index 48afcbc4cb49..8a9239f4c385 100644
--- a/dev-python/pytools/pytools-2022.1.13.ebuild
+++ b/dev-python/pytools/pytools-2022.1.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 # NB: numpy is now an "extra" (optional) dep -- we can remove it from
 # RDEPEND If revdeps don't need it
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index 8c0155c7ee49..732bc6721bc9 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.5.tar.gz 39008 BLAKE2B 475a47ad99bfbe8f85ebe246eb7c394d0855732fc6bf0dd887bb32ad02bacb1f34dadc5506d330add64bca5b353824e773d2b1e971e78d9cf9dc2438d12b4f62 SHA512 ddb15bb1d917117a2b19ad169ac0f8b8c7667d7ef8ee4c266cc30326429bb3627d41d84dc390ce0036d0b0f110e1d2da47d06d4e4d03a8be98cedb5ea3112246
-EBUILD pyu2f-0.1.5-r1.ebuild 702 BLAKE2B 662d7350b001b3d489a5ec5a27f0f884366d79bfd93a45321292de82edb807130c90b8919ecd55ef37a5568054aa3cce5c5c83203eaa62cd1b2749506f5d63bc SHA512 18615341e5f24631bec9c367eac09bf7dd90f86de9cb3fbf8bb98cf073c0b202e795a7908cbd852dba843b1b66163d80fc23088188f1d07fce71aebef703d1f8
+EBUILD pyu2f-0.1.5-r1.ebuild 989 BLAKE2B 6495ce1c055cba2f5aa0e08d4881af72e945f7650c85bb5c45ece5bf5d7dab60bb40f15330f9c17ccf04cb17f77e92f5fb910042a111cec32657f562b1a12f92 SHA512 dee984a170398faa90dae5d911fe06c9b35b5c8da42272e2fec5fc16e3600e65a3c260dba327e9ced04c66fbfd0bec8b960896f333d526d7788b77eb5e8eec62
 MISC metadata.xml 365 BLAKE2B a79d187c19602699fa11ff064ca991aa5ceefeeaab5f8b2bb1c9888ead8e23dd3bd4566b17a8956390c0db1f04e4d4fd601a1a667491aed4c30959d312efef49 SHA512 03eae2c778e036e9ef06f25d2ff97ce1865a7b44edb32f59b751121e303a7774c78c258cce889fa4af1932f51abdedf282137c8ba573f5dce1a00066636463a9
diff --git a/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild b/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
index a69df87e81ac..5d49690f8d77 100644
--- a/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
@@ -31,3 +31,13 @@ BDEPEND="
 DOCS=( CONTRIBUTING.md README.md )
 
 distutils_enable_tests pytest
+
+python_prepare_all() {
+	# adjust pyfakefs usage #888223
+	sed -e "s:CreateFile:create_file:" \
+		-e "s:CreateDirectory:create_dir:" \
+		-e "s:RemoveObject:remove_object:" \
+		-e "s:SetContents:set_contents:" \
+		-i pyu2f/tests/hid/linux_test.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 0a4f94580f85..25551c02f68c 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,3 +1,4 @@
-DIST python-quantities-0.13.0.tar.gz 107187 BLAKE2B ead5c223892f65c68ced2265356f8c1e5374f80a1507ec561370e56e28e8965217a7b99f5c46cb83a5f6a1b1f12eb9f501844650488871d48794f13a4383df38 SHA512 ec0a61d8df8e48e7ee08cab5c899a8c8ad96b964ee0132ab130f272f062436d91e6370aac9d85453eeb3d95e17e79e8dfb80412397eada1f0a4310c0494fa217
-EBUILD quantities-0.13.0-r1.ebuild 632 BLAKE2B c27e0158a6301b56cdc980c7ed70c33c1e41a0d7fa69f7526fbd6789fb348842d4d740a071fd558d9b006de0e3a1265f78cacf932ed930c9d9a90e8025ed565b SHA512 0c3057e588acb400f2963f909adfcd624788abf7d17184b8238f44078b2c7cb9d5a4759d7976cbdf694e8f50ff9f853f1fc53e4a86d5d9150ecf77d3838dec97
+AUX quantities-0.13.0-numpy.patch 2382 BLAKE2B b129afeac02154cd3e81d5c1099f637b610ec37210b5b5342cb35c3218316b7c848b5b0a78c35b7f197d76ce6d9ee1a56ee2319fa825ca3d3a953efb27d4853a SHA512 936aca8312de80f9c03ba08aa6dbb43527bb540bba18924551baacd2a861651b2d6923c5899adc21d555da6c11229d11b5ffe253d47e05023cf2e2efcc773837
+DIST python-quantities-0.13.0.gh.tar.gz 107178 BLAKE2B f5fe69ed1d82bc90620a1cabf4c68f676330a2b09e8590bedf48ee8c46e3176d57e0dc6374d1112377056cd1138553d92f0bcaf0a68e2600e3631226e2262afc SHA512 d108b0f5bd834aeb7443693175d54b2b01fa9110cc57f0356681374ce95b5f57e39253d9c8166365aabc379f2f26bba3a827689ceb6c45595345e140b4cd7ad3
+EBUILD quantities-0.13.0-r2.ebuild 723 BLAKE2B 1859adbe4079c7d98b3c6511ef4082b71b7ee0ae822097e93a2abe4935451879946c4c7eedfb3362c29f4ac370f0fe623c2555d05a78c0a9f80c3711e491f730 SHA512 6021093b1d64a3d98e4d502c889c0ab229d3d8858c2997af03663c45e8b2e9b4ed13a688aecf9926f05e0837dd9fdcb0e3ff14e5cfefc18ba6225a01e6cf8d7d
 MISC metadata.xml 646 BLAKE2B df1d2cf46f590a90d168f7024d52942531f8b570418aeb9e5ba82882b8b8be86f57a15e3c652246ce08e42ddcaa2813ea594a45ba15e9db9bb80795736e0eff3 SHA512 0ba5443c1554361cf079ae651ffd70b979bb70f6f22049470bccd07537aa967a7e3c1d46b7c580319c4941aae984906a40216c5eb108a9f1aa95fa0680c75248
diff --git a/dev-python/quantities/files/quantities-0.13.0-numpy.patch b/dev-python/quantities/files/quantities-0.13.0-numpy.patch
new file mode 100644
index 000000000000..940bc846d687
--- /dev/null
+++ b/dev-python/quantities/files/quantities-0.13.0-numpy.patch
@@ -0,0 +1,68 @@
+From 29852b895d5d39006d1f129397cffae3578a694e Mon Sep 17 00:00:00 2001
+From: Andrew Davison <andrew.davison@cnrs.fr>
+Date: Thu, 7 Jul 2022 10:03:32 +0200
+Subject: [PATCH] fix failure to handle units with floordiv
+
+fixes #205
+---
+ quantities/dimensionality.py        |  2 +-
+ quantities/tests/test_arithmetic.py | 16 +++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
+index cea68ca..d54f96f 100644
+--- a/quantities/dimensionality.py
++++ b/quantities/dimensionality.py
+@@ -238,6 +238,7 @@ def _d_divide(q1, q2, out=None):
+             return q2.dimensionality**-1
+ p_dict[np.divide] = _d_divide
+ p_dict[np.true_divide] = _d_divide
++p_dict[np.floor_divide] = _d_divide
+ 
+ def _d_check_uniform(q1, q2, out=None):
+     try:
+@@ -273,7 +274,6 @@ p_dict[np.subtract] = _d_check_uniform
+ p_dict[np.mod] = _d_check_uniform
+ p_dict[np.fmod] = _d_check_uniform
+ p_dict[np.remainder] = _d_check_uniform
+-p_dict[np.floor_divide] = _d_check_uniform
+ p_dict[np.hypot] = _d_check_uniform
+ p_dict[np.equal] = _d_check_uniform
+ p_dict[np.not_equal] = _d_check_uniform
+diff --git a/quantities/tests/test_arithmetic.py b/quantities/tests/test_arithmetic.py
+index fe5670e..534702c 100644
+--- a/quantities/tests/test_arithmetic.py
++++ b/quantities/tests/test_arithmetic.py
+@@ -52,7 +52,7 @@ class iter_dtypes:
+ 
+     def __init__(self):
+         self._i = 1
+-        self._typeDict = np.typeDict.copy()
++        self._typeDict = np.sctypeDict.copy()
+         self._typeDict[17] = int
+         self._typeDict[18] = long
+         self._typeDict[19] = float
+@@ -132,6 +132,20 @@ class TestDTypes(TestCase):
+                         self.check_rmul(x, y)
+             dtypes.pop(0)
+ 
++    def test_truediv(self):
++        q = Quantity([44, 40, 36, 32], units=pq.ms)
++        self.assertQuantityEqual(
++            q/(4 * pq.ms),
++            Quantity([11, 10, 9, 8], units=pq.dimensionless)
++        )
++
++    def test_floordiv(self):
++        q = Quantity([45, 43, 39, 32], units=pq.ms)
++        self.assertQuantityEqual(
++            q//(4 * pq.ms),
++            Quantity([11, 10, 9, 8], units=pq.dimensionless)
++        )
++
+     def test_mixed_addition(self):
+         self.assertQuantityEqual(1*pq.ft + 1*pq.m, 4.280839895 * pq.ft)
+         self.assertQuantityEqual(1*pq.ft + pq.m, 4.280839895 * pq.ft)
+-- 
+2.39.0
+
diff --git a/dev-python/quantities/quantities-0.13.0-r1.ebuild b/dev-python/quantities/quantities-0.13.0-r2.ebuild
index 10138c6a4687..72f622668aa3 100644
--- a/dev-python/quantities/quantities-0.13.0-r1.ebuild
+++ b/dev-python/quantities/quantities-0.13.0-r2.ebuild
@@ -10,10 +10,14 @@ inherit distutils-r1
 
 MY_P="python-quantities-${PV}"
 DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
+HOMEPAGE="
+	https://github.com/python-quantities/python-quantities/
+	https://pypi.org/project/quantities/
+"
 SRC_URI="
 	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
+		-> ${MY_P}.gh.tar.gz
+"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
@@ -25,3 +29,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-numpy.patch
+)
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 2249572ac7af..ae8c4a248e2a 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -7,5 +7,5 @@ EBUILD rapidfuzz-2.13.2.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b9
 EBUILD rapidfuzz-2.13.3.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
 EBUILD rapidfuzz-2.13.4.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
 EBUILD rapidfuzz-2.13.6.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
-EBUILD rapidfuzz-2.13.7.ebuild 1112 BLAKE2B 869be657c1ed01eaa8efd4f6f58afcef22b95cc1be244f9bee9967f8ec8ed014ddbdd8e586481256ba97d3e13673c1fad84a4cfc958b2ea2a860c979281d3a4e SHA512 099af29455dc485f86a2409991ee5cc0d302e1c30c5c36249eba9513f1141b3f9b8189a3288b30c4deef03073a2cb8ba520968abef2973f5ad6a9e1c12a9a4b0
+EBUILD rapidfuzz-2.13.7.ebuild 1106 BLAKE2B 2313fa07af61260b6cb462fe18f50a04454e8cb2dfbf1e68b78523bc5ae9b42c6c4fbb4ec41496cc6bf7e417a217edbd1d6c8e8e360770f7d6e96bd9d4c2a081 SHA512 b1cc7b4a284125a0ceb4cdfa1822f7d28328e43d96e8fc3f64fe5e63995823155a551b993f3044edf3479a3ba27728ab430db8a8d0a93010b8470ba4b7dc5bcc
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
index f2d8defdd62d..f79473694de5 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/rapidfuzz_capi/Manifest b/dev-python/rapidfuzz_capi/Manifest
index 651e63955eb4..ab019b3765fe 100644
--- a/dev-python/rapidfuzz_capi/Manifest
+++ b/dev-python/rapidfuzz_capi/Manifest
@@ -1,3 +1,3 @@
 DIST rapidfuzz_capi-1.0.5.gh.tar.gz 5908 BLAKE2B a5f3c27c2292800527f0e0558e0f25525c2865a6348fbbe36da8d5a96e5524c68154bfba8dbfc3c174f759dde14a95c64e47dd6669166beb035bd1126741569b SHA512 b62c6fdd0e5d0804f7c1ef6f6b5e007afd8439720071fbdf1440232c62925e794a6ae33774a33ef745ebbd4ef956a85d2bf60934a7d568d39d1e590467f26bcf
-EBUILD rapidfuzz_capi-1.0.5.ebuild 570 BLAKE2B 1c8957da4a9c88d7c417403ae32dd3ad8e46290ccc03bd941e58552a7f9cc5b26e7ad6f84ee28e6d67b2c871a72dc98b4208bf5049e899b1ffc4a320914271df SHA512 6a76743a8091b70816135302fb580491575b22566202a2945933b7631e1bf26bc9b017e3ba73011ffabb5fd2ee13c4a44b8891a6925679ad74806b21778159f2
+EBUILD rapidfuzz_capi-1.0.5.ebuild 564 BLAKE2B dd70d1cec407b7a5163fc04bb4b02371e2dd4de7865b7bb3e080d3a991eb63ead3a843275695469761d4bdf5353a8a4dea859979c91691a36d46b94593f7e779 SHA512 bd5bd9279e7e0aca54aaec040700fabf2b2b1d3b7bbefab8cc1174ca55b5a7e09e7ad28170f941e6a07f9d52aa47290baa010aaffcf29b5c3e278cb80cad9cad
 MISC metadata.xml 408 BLAKE2B ef5cb671e756eccc17d4bbbd4aa4c3fc0ac5931994750659ee9a6746bfbcbe5e3d283764749531fa2d7e46afc8eb14acc234f15f539ad0d1b7186b56ccff0a84 SHA512 fa723a5d815999bb2f0e12369aeb64726164adda4c89f2ed8b1136985f3843a9cb62a6250f7fea811e45c1ee1a3aae3d7911954955b8f32bda3af9f976bc6650
diff --git a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
index 807bc820ad2e..da8c0f1e873b 100644
--- a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
+++ b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
@@ -20,4 +20,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index a0aaa32a257d..6727535dae31 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,7 +1,3 @@
-DIST redis-py-4.3.4.gh.tar.gz 4613714 BLAKE2B cea5a6455160c67c9ab3b8f9de8ae47aed97e7bea1e408ce1a001afe3e0c4a7a14220887504fa40c749d15be9d89f77e36b6f7a785e0ff22a49037b6ef245e87 SHA512 55dd00c15cedb82cb5edd46b1f18f32c0accb8c85b1b94bbfe04591dc07f6151ced81cbfca8ac6fe88a6743bf5abc50309ea23bef96bf4332a712979c61ea0b7
-DIST redis-py-4.3.5.gh.tar.gz 4620696 BLAKE2B 2eaa40fc0ad624c4b8444054dcfea70ba1a2a54aaa54954f0c0fab31b310d67ca25e7508bc3550a0033139bb36bb63ddea97bb807c91ca92df3630a5385d6ba5 SHA512 42ef903f07b818061aeaea5d7d188e058db1ef73275b731cfff762fb59cb91db708ad81b0b2773cf6e0ef200ecbb3bf9859f51c4fbeb04023547b9eac4e2e042
 DIST redis-py-4.4.0.gh.tar.gz 4637656 BLAKE2B 40b0909c27cefb399353cc2d1d82d7ad3d64e4b3e5ae001ffef9c198d0e65d906f5772a0ac33b599c7fb6ffc5dfad461bb4b9042c5c4fb23dfbfceb0a7facbc0 SHA512 8992f160de7817c48893f3a8588d5c0398dcfb91830a61b4218206adc88185acb102b072507d3064b4a7aade5c957267e5d0e6912510bb106eea834cf9250fab
-EBUILD redis-py-4.3.4.ebuild 1761 BLAKE2B 34745dde86f9477eabadfaa7119608dbf4d8fecd4f4f0ca5ef379b4b5e358d4d73dc4a5625f46a35431ad893f923bf69721a672df263cbcbe19266d151c88a0e SHA512 49db4fe89644c425139a5ebde1ef8c33c0806bda52c602a1c9665fcc96e36cf824798a4dbf4751a239da6a30b71eb7a4e5d4c6e44587a027549b3ff6ac5abcf9
-EBUILD redis-py-4.3.5.ebuild 1719 BLAKE2B acd412fd7b3c46b46e6b6338038031e970e8e43a8532b347ca2c362022749215a5d01373e06001fd226eb54d40b73771d67c51434992c20c26a285816daddc6e SHA512 53d1d2017efc2ea7ebb4b1653663bdddf159adc469fd72c13f411b90bcaf62863d78c0759fa8da04d58d017894838ca49736d913f87b95fa1376590b8423d64a
-EBUILD redis-py-4.4.0.ebuild 1748 BLAKE2B d8947413670056df529e6ebf26f6e3c0bdd0dcaedb8436c1d427f80b2ef895e0173e97dd1dc3010d6ba666a1eb258e4989dda5909daf0064640343318f1e4b2a SHA512 04c0793d1308c39f1d93e8525996a53a193033f7c8f42b7ed4f33955772762e38ce91fa825e51279d8fc1c5180c14e0182f51c91aab68f39106214efef821682
+EBUILD redis-py-4.4.0.ebuild 1741 BLAKE2B ff2e4b6cec372b495f8e9151dd64d1d53ce01e8e67546ee4852c24960987c14f5aac49c938cd8addfc4b920008dce12ba8976f7c72b3883af41bc7e8f5dbb472 SHA512 40fc7d02058618f1c4e45a0879be7f2f74795fec909af1c6707d51ca1d53a76b949b5d4799d331473e30de56f37f99c67f33831a5aa2045797f3ba4ae0373a5f
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.3.4.ebuild b/dev-python/redis-py/redis-py-4.3.4.ebuild
deleted file mode 100644
index 2b6dd12b4c8e..000000000000
--- a/dev-python/redis-py/redis-py-4.3.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		<dev-db/redis-7
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-	"${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/redis-py/redis-py-4.3.5.ebuild b/dev-python/redis-py/redis-py-4.3.5.ebuild
deleted file mode 100644
index 5be327fc0a51..000000000000
--- a/dev-python/redis-py/redis-py-4.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		<dev-db/redis-7
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-	"${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/redis-py/redis-py-4.4.0.ebuild b/dev-python/redis-py/redis-py-4.4.0.ebuild
index 39794f5a9cfe..cbed428d05e6 100644
--- a/dev-python/redis-py/redis-py-4.4.0.ebuild
+++ b/dev-python/redis-py/redis-py-4.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index 3f1322ba7b52..4eab0a7cf397 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -3,5 +3,5 @@ DIST resolvelib-0.8.1.gh.tar.gz 766632 BLAKE2B 59bb02a08cf0f9bc6070cd5c5109826a7
 DIST resolvelib-0.9.0.gh.tar.gz 768502 BLAKE2B a5f0ab89f8b44125da59bc93bbfd78e8f35c3af82459732317097a79db81d5366e9fdfdf75ed12d1726441d1d0275304a953c489e987832134be936b92766878 SHA512 cb263a60e958e190c92dc333afd61eba76e3f1b1cf8f825c39292ea37c90f440afaacfc2d574987e26f6bb1d3a155ea8d878dd29cf82e78d912df36f4a10eb7e
 EBUILD resolvelib-0.5.4.ebuild 504 BLAKE2B 509dc31e1d1946f599ebefa4f4099453911675de1127028b8a5da901e5777901b34cf14cb18552ea350ab9a9434efdde7f28be43c4eb0a246c8f26283bd1cad9 SHA512 ac1db9908009d7e50953ae916e1d4dadee14e41e823ef6172f92fb2561d29533872e5c627f03d2700da4dc169dc010bce24d798691acc197fc2a9314f710dc8d
 EBUILD resolvelib-0.8.1.ebuild 609 BLAKE2B 53ac575d7a184227e3dbe1c03a1595dd60516dbab0fdbcae5519a67f22eeff705249eed935ae40f018dd6fac81a01dce85856b2ff6dbb51cc1c7ebd861849cd9 SHA512 b60e7da3b5e24aaf89a04535e4475ec05504fd3629727962bb578b10c655a0d3374dc081a51c428fc1f6d2bed90df19292811d1a05e0fae8efdd57a41d877a4b
-EBUILD resolvelib-0.9.0.ebuild 670 BLAKE2B 2f7201ba507b4dcd3335129280dad80fb94dfc3ad407b06e110cdd8e9dac6e99b7fc42cd56be33dbd018c10d922be55e53a83e1583cd9b6243164985510e3c03 SHA512 d02bfb2986189bb9d4c1ae2a2f6da82becbb53fee32dd384840cf05fd34af0d4f7677e3b514a668d7f11018188e2c44d866a2405dd81b73174f9778859b4c4f8
+EBUILD resolvelib-0.9.0.ebuild 667 BLAKE2B 6c4cdf22d42b7ce103ead1fe7ac6fd53a1b25745cc4cc8c94c6870c3b27b551ad6c0ec36b78cd154fb39c605e056dc11bdf8c571b2348ccd8fae471e9a475835 SHA512 be9d1d154c284e3e63ee644ff5e35c9abd535aa77a7ab9475e5b7e3b724bae1ba51cafd210718a407b42069af006e16db12fcdddf1c7f5fda832bdbd1655d5db
 MISC metadata.xml 864 BLAKE2B e62049b9f1eca68e3148fb112e0b1b51713ec88deea5ddc7eac28b84003e427f6e17d018ebb27f68b59a5007e7ace47cb89e25af12df432a1ebf13feaba9dff1 SHA512 7af7a80800ba0c3da0789f545a6b3e51c35cdba8785e2aa8761c1689d5ec7a3b9f428f28b182d86ed6625042d2d85d52ebb1095134bd2c7013302abd4ecd19b9
diff --git a/dev-python/resolvelib/resolvelib-0.9.0.ebuild b/dev-python/resolvelib/resolvelib-0.9.0.ebuild
index ccfd21367fce..4ca5ad020aed 100644
--- a/dev-python/resolvelib/resolvelib-0.9.0.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.9.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 27ee6ff4a861..33cb599a53c3 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -2,5 +2,5 @@ DIST responses-0.21.0.gh.tar.gz 49551 BLAKE2B 3796fd29353f80a04b26a7348153902d95
 DIST responses-0.22.0-tomli.patch 4793 BLAKE2B d5991f55f4378d35224a19d4e85ee9786612f6b5931e52e326c46ca2b791e6e2f8985f69ebff14779948b45a6433d6b4223f8fabe615b0ad479364d941128179 SHA512 0d0bd3d10e4f38fdb236204f161ae499f876d8daadc8306b6ad02efec9277fdfdbc1c862704f49aec69cabbd52f3616acf74d3baab573f1f5418436928af3c6c
 DIST responses-0.22.0.gh.tar.gz 54094 BLAKE2B eacb1ba4fcae10d3a4e29fe1516da3f1d3ff07eacbaf65b0dd3f86ecfb36aa51527c0d89547a1480064654c49fd1233d2c3491d9afdf4eff34a4058e4f89ec0d SHA512 361e59e02df36fac0fb0ba2a070b730e485ec94fe90490c271e4ac86fae7954a551bf2486714d95c91e9d0b011f06a9d10b0d6408fd4d03234e1224cca1e9d0e
 EBUILD responses-0.21.0.ebuild 806 BLAKE2B f05944f803ee4b3f8edef401fe5d67817b4f3a9946c7ae7d51539a68a79f83589b429d21fbbabbfa90fbc975e09c0c4e717b290b4c632dea353cf987daa86a11 SHA512 c18b3742a16d17962286e4d7a092319b0fb4e49fd5923cc23b3b9fb5503924d373bdad131b73b22c186f7d6a7651acdee4b27ac30550b17bfec30c9e04f8201f
-EBUILD responses-0.22.0-r1.ebuild 1032 BLAKE2B 69291a4f55aff38afa189f93761d37ec73d92520a7b6746ab8c7f793ebf248ee346daceb5aa1c06588392170a403f3b05d921abe0cc80faaf75d4e46a0ee63e8 SHA512 3f4071f4d925f9832e82c4fa1bce609026a368182b016f8db154c023c50d66199f9eec298263cc6f6a0aa0f806e8d45d32c67bfc678db5f157d8222e9ecc2eca
+EBUILD responses-0.22.0-r1.ebuild 1026 BLAKE2B 55f22ee0c7f1d0d23effe75d5bb3653b90d6f708d813555c58ebc04bf14e381d486af1d173f1faad896b9f055791627cadcd4468c8760ef4af3f243864aa567d SHA512 24bad29f064e2bf6ca7e64a981e8b5505628e66e60fc7215eb1f40b3a05304c9ae442322f504b0016544a025a8c0fb3e1970779be27612a431f9067cc1343102
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.22.0-r1.ebuild b/dev-python/responses/responses-0.22.0-r1.ebuild
index ad40344eb7eb..a3309fa26190 100644
--- a/dev-python/responses/responses-0.22.0-r1.ebuild
+++ b/dev-python/responses/responses-0.22.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	<dev-python/requests-3[${PYTHON_USEDEP}]
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index e8bd4e142a2a..a3d039ab03cd 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,3 @@
-DIST rpyc-5.2.3.tar.gz 1267934 BLAKE2B 3c03d587293375f875de31d6a89ba07b47bd4f4ff9fd5c7b23ed0c83e420e9d2bab08844c3538299797203ac90e7e81b955db02de70bf1cee5ea59d8475a6848 SHA512 4be189a719be100886e08d9c2c0769d12b7d1c5e167c197ebee1a3db542e228f2124fea976e5af3680136b298ce4632c79b2f302128dff31ebf45dcf52a9743f
 DIST rpyc-5.2.3_p1.tar.gz 1269198 BLAKE2B 288568fcd34787850968d4e3fd9ca7c2d29e506f1331b746104760e678dfef43fd30b08f68b3bdda6df84d488f88dc76cfdd23d5a5ad0a4cefeab468ac6a1b0b SHA512 4b29899a51364779185d2b56f5d5ee4c650c40b8322e5594500222fdcec85414cdbabd41437467e2ff73124a79e8c9cde23dfe89138abb935732ccaba69de2bb
-EBUILD rpyc-5.2.3-r3.ebuild 2007 BLAKE2B 098b93db8c01dec350b65af4dba8eecdc3130b993550bf3ce672534fa79112737df958499313570b4b32509f56e52e6d426535405b28727d9fd0cdf0eced8928 SHA512 aa6ac17c3aa2350a5313227911c45c6637aee59060693c976b0b9abd147799620ed1d4bd819c2f415926b10b8d3ef7f667c2812ccf5be7499f582093d6b5c5da
-EBUILD rpyc-5.2.3_p1.ebuild 1936 BLAKE2B c79f627bc722b32027051cf245ed9263c5d53271e95f2f5c751b16bd8992cd617f35722e77ca06df5b72cee0c91c730f2e2d21623422729c42859ce53ee010a4 SHA512 6bffe86a512bb8bda622e1f7ef04cabc1d44f865a9fb8bc00f4259e85e985236f8f733c98870b93e348286a62a0a3b31c8b337870c0e48a3907c727b87cf89b7
+EBUILD rpyc-5.2.3_p1.ebuild 1934 BLAKE2B 69be91d694d690d80b32af485f08e3b211887c796cf25d474df1b71205c5475abe9e1f7013279d41420b38f30f72f2034cf80bc249f96ff3db4666908ac09788 SHA512 a4d30a9ac80dd18867ace8a21f9192b7d00d43d53b89ee69552a801a889da55939829666830a296e8c723e4f0ddab82ff0f318cf8cf5d20877ff1a978e8deec0
 MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
diff --git a/dev-python/rpyc/rpyc-5.2.3-r3.ebuild b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
deleted file mode 100644
index 22aea49bdb94..000000000000
--- a/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-# Teleporting currently does not work with python-3.11
-# see https://github.com/tomerfiliba-org/rpyc/issues/513
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-
-CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-	dev-python/plumbum[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	# This test fails with NO_CIPHERS_AVAILABLE
-	rm tests/test_ssl.py || die "rm test_ssl.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages ${EPYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}
diff --git a/dev-python/rpyc/rpyc-5.2.3_p1.ebuild b/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
index 31fe074b28ed..464187c40a25 100644
--- a/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
+++ b/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
 IUSE="test numpy gdb"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index acee2ee966a9..d547d3221aaa 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,7 +1,7 @@
 DIST scikit-build-0.16.2.tar.gz 269822 BLAKE2B 4fe7d8f3c3a993f1832d94896068b6bede1eededb4d85e3332137f516819d167102a1eb2fde6dfe4ad187d0483a4e962311a4ca56f3aa5a4eff0c96a187ca052 SHA512 ae8dfd74c638e5cda127b24070c4e491ec51a69b35eae476f5f74a54ba97419d69e984ae7dc132782c77472852358d9d984650db4e6984decad74aadceecfa05
 DIST scikit-build-0.16.3.tar.gz 270429 BLAKE2B 32930041e64750dc4ee7d496bf6541bcc3f75c5fbddadb95d3424eec2309381ac6cb67252936fa753b0996db44749d19662575f4f20f174f85c44256d91ec7b7 SHA512 8cec7b01b7a2b892c05a910806b0a3664f5a966165f1a87e9943067afc9b2a2e93657a7a68e47df6578d5d03f1ff0a0bd987e97cf4b0f442d79949f52247968c
 DIST scikit-build-0.16.4.tar.gz 271037 BLAKE2B 6cca8a3c4f4b37228b77ac098650a5eca4ad0f525ca7dcba178f4cffabb7e60e9a7bbba244e64c1a598ab5916f2f47788198eb2a19803d8d0cf7b9792f4e06e2 SHA512 90315ceac4c372e4d7248b4b56b6092362c2c43fbdc180d1a234e057209c508a05d2c6e0a3d0c2587c3adb8957e4c66d5c171a2a2bc3dbf9874a0de58d97d976
-EBUILD scikit-build-0.16.2.ebuild 2116 BLAKE2B 14e8f3b0932b47124c9a5c75ebb8d443ca3781eefa22fa7f40c99d39e2ef59ab1c4946bc258423052ba604f07b62e4577832f722a5cac684b8f09c2303402525 SHA512 52afdde7f1db21b82723602b761796392443be15594b92d5b2331a8d0b459966e00d3e465fe22655b918b004bc9e3f4cb58b30dc989bc75e43a2d218a542b78f
+EBUILD scikit-build-0.16.2.ebuild 2115 BLAKE2B d44568826ab5172a18f6f5eb288e85d2e3ebbfc5310d5d111b05557e4dd4e9d263e30535c81b0181358cefe8cae819f469391c8ac09f1bc19f78f60968801eb7 SHA512 1e0cb85334f27f27e089598d8435c8001339472d57ffb9ec897e9e196608ee58062f94b7dcd806b4ebd98bd68760d73bd821bf5d1e78b86cf4df107a6bcf325d
 EBUILD scikit-build-0.16.3.ebuild 2086 BLAKE2B 8234c15bd6dc53874e5a047385c8d6855bf0b8d2d26de4daf64e7dd34b855e3a125dd10e186aaef40053ab6fb8dca8159a71bf40c4f581997eb95d4ba12a5d73 SHA512 782f5b2476ce979b4936e1ec6a820d292f874c84a6a8c1f4870a0805cc49604a3fd65a8efa74b41db590ee915295e63bc3f264ed8ad80edb866a6aa2cd41aff4
 EBUILD scikit-build-0.16.4.ebuild 2026 BLAKE2B 8a3490ba7be7b821c31ea2c506cb368ce342ce93d623216e172a90ff66e30183661b68ec79423d31d820bf7b69d9a06a5b6ee9b72af781348937190e585a1f78 SHA512 70030e48019bb553dc25af2ef16ae0dc5338b65d4786a9feeb4ab80995fd4868464fde09d4e02a43ec69697a83df0b51cc9032e1a605d5392150406d457f4c3e
 MISC metadata.xml 473 BLAKE2B 9d02a79439618fa413f74e4a617b8af042879be7a44c8f1c33e254e985d4f24057321fb2ec0b73074be1f6b67af3984190e48669e19985d6297411c0c5b61a79 SHA512 afc398c6287ce67eb85402832684fd006385e70d28a738ca8c5f1e2d008526621121cd9107a7fbc217a1a5857b54fa1dce3de69c47db58fc76990764b814a36d
diff --git a/dev-python/scikit-build/scikit-build-0.16.2.ebuild b/dev-python/scikit-build/scikit-build-0.16.2.ebuild
index 4df539abb3e5..cf458dfe0e5f 100644
--- a/dev-python/scikit-build/scikit-build-0.16.2.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index fb734fdff897..29271d6d4276 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,9 +1,5 @@
-DIST sentry-sdk-1.10.1.gh.tar.gz 292186 BLAKE2B 03181c0118294d4221b176b1e4fd38b4b2147a3a1b6eae709153f92717da77e889d17e715ad1795c8d9bdf24ed2ca5718a88b4f3fa25d240ec8e5804d1041a56 SHA512 135dff6db284439812d74b54f301ba0ce25444f71ad0b7d3ff8869399dba97affa40673fd306960bc6665118e0aabd1a3420976effc9a501d51d9f2174d615f4
 DIST sentry-sdk-1.11.1.gh.tar.gz 296633 BLAKE2B 8325b75d58bb4c587c5d27698b775a76aaf840fc69a910567243fcac2d6fbb7fe00fbfe008c70fc5b67d999167cc3474e5a18817832dfe2c768ffc750c7af128 SHA512 9fd3e1aa9a7287ae21d1a7274f12b9d309d95615e5611ee098c8e2d0577f7c3928a6d5c7256b18d4f0de0ac48d44eb9e38f94709e8982a0c09a5b1cfb5dba114
-DIST sentry-sdk-1.12.0.gh.tar.gz 305342 BLAKE2B 1ed91383dfe674f16a28f5d9c98da44c06bddcd3a609ad9e7dedb7b2d1e174e777bac0f14e4b2e7051db5675080e2ba7754df87f8ee76818e7db19945e645f78 SHA512 84f4e95ed6c42fda85cd3c4b22b1f18ffd6018daa21091fbea2b79e3e86b45ce4c79e5770eeb62f093119492d73964528f820fe12ff4e9867f255a7c7b89da92
 DIST sentry-sdk-1.12.1.gh.tar.gz 306457 BLAKE2B e0c4e92fcf8f0213f27ccf6f03cfbdc66999469357cfdf82e4b923f34d79c44e0824a50caf437dded4404e77cd1cbdede240b1e98bd8408d467b754b3586d598 SHA512 c4fb0d13c1e40e0220ef56c29c2c5235aba0c7be598a545e08af783da0732266455d6b9aa73f2aaa068bf63105369517a12e8abbc7a31410ef3c4bea1a0b3018
-EBUILD sentry-sdk-1.10.1.ebuild 3156 BLAKE2B 74af1bad91afb6e20d80836be9b896fdd590ecd532a1e1cf4b9e78b3f0827040a733dc6ebb1bb821b4d7bb93ed378a762fd3a75f15f55caa6287f8ba436eea08 SHA512 b2add344e85451923ad0d9ada2e5059cf3634c9f14393d8345164f471937c5d009fac964f9dfce5e26a592fd14d4e69a4a036e2d4367e5bca76c7b0faf4036b1
-EBUILD sentry-sdk-1.11.1.ebuild 3406 BLAKE2B 8a72ea60a5252e2786def87bbb5438bc1e121fdd6d80c9780d937eb9bad41cccdf6e3ed72494e72a80b54244ad4eb12af4a1fae608e0486508e0a3ec86e6c0f1 SHA512 2db8be49c8996b1080429ff7de25a0eb7607757cfb658203995131ed28f636131eca723e323706fe579ce10d055e3bddac3c41895f7238e6477cb1c9345ba0bc
-EBUILD sentry-sdk-1.12.0.ebuild 3406 BLAKE2B 8a72ea60a5252e2786def87bbb5438bc1e121fdd6d80c9780d937eb9bad41cccdf6e3ed72494e72a80b54244ad4eb12af4a1fae608e0486508e0a3ec86e6c0f1 SHA512 2db8be49c8996b1080429ff7de25a0eb7607757cfb658203995131ed28f636131eca723e323706fe579ce10d055e3bddac3c41895f7238e6477cb1c9345ba0bc
+EBUILD sentry-sdk-1.11.1.ebuild 3402 BLAKE2B 31fba694c7e06d3f567a5a78e4758784d2369aa477cf198ff383a28679f50648404f47df8614ba8e7aed752380b40a7360caa8db058615855cc36515d3996942 SHA512 25bfc33e63adb74e4ecb00b5de71503cc2be90b97959f45cd9868bee5254601a20d8d11cc906e9cff2d954742e755848320d5c291188b74a62406902a3375c32
 EBUILD sentry-sdk-1.12.1.ebuild 3406 BLAKE2B 8a72ea60a5252e2786def87bbb5438bc1e121fdd6d80c9780d937eb9bad41cccdf6e3ed72494e72a80b54244ad4eb12af4a1fae608e0486508e0a3ec86e6c0f1 SHA512 2db8be49c8996b1080429ff7de25a0eb7607757cfb658203995131ed28f636131eca723e323706fe579ce10d055e3bddac3c41895f7238e6477cb1c9345ba0bc
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.10.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.10.1.ebuild
deleted file mode 100644
index a402449a7450..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.10.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.11.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.11.1.ebuild
index 915dca6cddc6..5545a32081d1 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.11.1.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.11.1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.12.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.12.0.ebuild
deleted file mode 100644
index 915dca6cddc6..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.12.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-)
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 06dacb74a7fa..1f9df720f045 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,4 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-65.5.1.tar.gz 2616576 BLAKE2B 84ecb833305e06861d4e0ab5377235f6a5e3a109db9d5296f19f7d67840ba220847a18e6e2529265aadec265cabc8ed3d43f9ebf755f8eb8eacb092291b9248d SHA512 e75eb7fdb0bc5ffdc76ed864cf753c2672d097a60f8747ac5cd40a49276d33df31fb619877234b4c22693b627d9978ecdd48a5c6c48aa0bbb856d48dec70fb0a
 DIST setuptools-65.6.3.tar.gz 2617699 BLAKE2B 0b64efcb5280f18e9d5660a10bca34d9864255279e4747cad99e3adf99ee33c0d174f0b61ef897894e7083ecfbaea16d59a195e3572c8083a4a8d811fe0c2702 SHA512 d0acfdc838454ffedabc4cc14c745071e07cc05e0a598c8bf83824788a8630d5516009e81213ae2a709f54298e754bd391cad205e7111363b64c853bd124aef3
-EBUILD setuptools-65.5.1.ebuild 4271 BLAKE2B 0b415a41751e24c823c1c7277c3e226860b57494f284537486fca1decdab36b4629a7b3587eef898217d90e34667fb81cbe1fd1cd8ea008c973655804e3594df SHA512 acf66b5b5f418cbd96eea8b2a0558df2ae25abd250959ba4c580d28f0f636260eeafa362247afe182640238e2f5750be3c913a754e1eebfa0d7d1ccf3d2806f3
-EBUILD setuptools-65.6.3.ebuild 4414 BLAKE2B 8182282df3770301d3b89c67cd31a4300e5c76f34bd422a06d16929c8df90c6f6916f0636592a4d7bc75fee4ae68af62bad9a73c9434ca1d2d004e08592d208a SHA512 e5975bc266f050bcf6b637f95b9ab5e14f4aa8392a1a3a7b48946604052c0ed0f4eb5db2479b081391aab84fbce47affd9b38f603128957818ec2e11a2211eef
+EBUILD setuptools-65.6.3.ebuild 4406 BLAKE2B ac9416b688b97ad5235bcab847236c736a5bd7c939fa88627f3ca9c17df8cd73398faae4430bd6ed9be511df2e5e3cee69a7e723821638d6f6423460704d9a8e SHA512 26c287418acd7e71238e14d117a9dcc01460be928fcf8072868b31f26e5ba5fcbfa941aca570da959eff53e8c530bd21435b78f1ef55407ef4117fc94b6250b4
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.5.1.ebuild b/dev-python/setuptools/setuptools-65.5.1.ebuild
deleted file mode 100644
index d9fd0a1489b8..000000000000
--- a/dev-python/setuptools/setuptools-65.5.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-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/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=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/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# 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
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-65.6.3.ebuild b/dev-python/setuptools/setuptools-65.6.3.ebuild
index 84081a4a8abd..d3dbdaf6c086 100644
--- a/dev-python/setuptools/setuptools-65.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-65.6.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 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/stripe/Manifest b/dev-python/stripe/Manifest
index e9b82557948f..56edfd229265 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,3 @@
-DIST stripe-4.2.0.tar.gz 267578 BLAKE2B 1cd08aa37a3735928e65fb401d8817694cbfceff05722aa96ae4880da6ccb6e3139dcf55804efe26a4e1c1814a6734eed1b5754c06efaf2003d9c28efbdb8731 SHA512 8a2660878838b0a2602afb6716db0dd91c2896b9f27224c2b04c800f32705e876d2915b0c5f4f1bdcf8d3d508ca050660e2e923f999bd0a10f9fdabd3acaa750
 DIST stripe-5.0.0.tar.gz 267241 BLAKE2B 6b4a58a355baf2d16d6de8667d1dff655c3334b58933c6172b25963f90bf072ebb5fae197faafd69285ceaaf06ba952c7012c35222df873d0453ec9fcee45cd5 SHA512 3d782abd3d6983734b6248fcb44cb69609475e14b820062882439c11ba8ba64e19f3db7984902157adaf0a80f9c26d18e7fbe414eb27bfeda95a7fae78a07577
-EBUILD stripe-4.2.0.ebuild 1816 BLAKE2B 2c462bf9592508166663cc3d513b273909bd70b3bf5e893d8e9f6ef7f9e35de652a193aba5c8fdc2a4b1314a1b761328f3f1b8697852bb3b5287092735677b0d SHA512 ac57bec27d9711165ce23c8c08c48199d567c060bd1a0b37be73b74861a0c30779a011418779980d934516c68c1f88a8a1879dac77cd17f2252870f91f8fd1b8
-EBUILD stripe-5.0.0.ebuild 1818 BLAKE2B 62e5d31e23a51d274c3ce0c6adfc6793f79574e94f82ad6959472b84dd476f9843117c91fa28becb41262dd2f5a857c48c78c39d9b09fcc1c0be9757bd60c4fa SHA512 31bedf5400003a964b3294dc070a19ae1a5e622a22f69ccfd4b095498dad40807c34dcc23866e65933600e702cd02538d704ac098eb32f3d978a6a92df3e2d88
+EBUILD stripe-5.0.0.ebuild 1816 BLAKE2B 2c462bf9592508166663cc3d513b273909bd70b3bf5e893d8e9f6ef7f9e35de652a193aba5c8fdc2a4b1314a1b761328f3f1b8697852bb3b5287092735677b0d SHA512 ac57bec27d9711165ce23c8c08c48199d567c060bd1a0b37be73b74861a0c30779a011418779980d934516c68c1f88a8a1879dac77cd17f2252870f91f8fd1b8
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-4.2.0.ebuild b/dev-python/stripe/stripe-4.2.0.ebuild
deleted file mode 100644
index bd7dee2fb86e..000000000000
--- a/dev-python/stripe/stripe-4.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.141.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.0.0.ebuild b/dev-python/stripe/stripe-5.0.0.ebuild
index 85f74b80fdad..bd7dee2fb86e 100644
--- a/dev-python/stripe/stripe-5.0.0.ebuild
+++ b/dev-python/stripe/stripe-5.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index f69256c08a11..98fd53e51917 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,7 +1,3 @@
-DIST subprocess-tee-0.3.5.tar.gz 16887 BLAKE2B 6eb25085eb2b2ee4557efd556d8035ab8f6b781b47783f24f227db04b3f82fffcfa29d69f0e3588c3fa6188446a3d96d4421e6b1ea5b3292f42635e19a404bab SHA512 47de075e7b6c75598dac0ad1899e1cce9dc1131b49c35ccade2b67c8d2a2d0248ce22a20c336519ff00bfd57269613bc663012e48cf0afa087c93ee74e18e4d4
-DIST subprocess-tee-0.4.0.tar.gz 12815 BLAKE2B 0a536daca56dd441848eaaeb3d53384349debdfe7b83458a89ff9e9d44cf63d4cae9eb6436705494cbb15282594a3ad0ce1c8dd51bfb6f79128c6855ab3b2c82 SHA512 944f978c87d612a7846709106b7857761288ef9e6923bf0b69e20cc493b7dbcf51c16867ed7b3038a1d2f180108972c35e8d9fe380542b56c7c68320caf9321b
 DIST subprocess-tee-0.4.1.tar.gz 13599 BLAKE2B 779a8b5381155e8d524b6715ab9cc37f8e55565dd378a2d256648d56f018dc71860b0db2a50572a5e03fab7d2de5cd691be53c49c1aa79e756b4eb8a8d5878a5 SHA512 683813096c4bb78a4263075ba8590a926134ec92db5e2e72ed98ab1db9e231768adc15bb4273ba138f9a1b2a14ae4050d0b6acc76d483d0f3530f376ce8d9eee
-EBUILD subprocess-tee-0.3.5.ebuild 1176 BLAKE2B 7e724f5184690c88aac1794e920641f1bd459160804bff4e068ce5871eaaa1906242649dd0bf41fdf8e642e21981886eb7d569351e4f47b428f9da59db1a3440 SHA512 17d4b5b7d005639a153d815b6bb73c2699849ca4013c8cd15ee99dfa434d43f9ecb9582c5418816207b022dc0c85a3c3894f95c9a946a64f8efe5b67a4e438d1
-EBUILD subprocess-tee-0.4.0.ebuild 987 BLAKE2B 4cad90aed652102a33bb961a2adc30513da118687634db91221d93af8c9eac588957ad2346dd42b3c6d908b8b2541de35e9bba74d0e0a4a94ce93eca5ca1c7da SHA512 9fde4a511e531deb46b20ffb6b1519e37beaee9fd3340dce525b3bef320c8e02ec51799450be6003ffef55fa66457d189d9399b0d0b508a70c5170ea82b62a7e
-EBUILD subprocess-tee-0.4.1.ebuild 938 BLAKE2B a7c85769fbec0f2d795279bf9852cf443d713236ef9e169d966e1a6d6ba47f3c2d702c8a44b10fe116912fc55bc574d2afa50d5f894229b7b04ea4d6c04852de SHA512 a68b8a24a9f1e132bb678eb23100a2bb9468d271d6abeee79fc460c33c8ab0270e013fedc00d4ba1af0a6cd02e2fd50832f3a5654f81afb0aee204fc4f48b29f
+EBUILD subprocess-tee-0.4.1.ebuild 937 BLAKE2B dab743e11b446377d6b1ae3b8121feb2f32f5d0071f76395fbce603c3b1ef7fe046275180b173db1c67df4b52c1b1dd7e238e40f9bf67050b59220f738c49ad0 SHA512 f34c9f379f312d205efe975f30c9235cdfbc43f1eb643f5c14096117ff6bd6e89a59ee89160227667e46dc35f3623c0b057c06117ee81ed92fd965926d9486bd
 MISC metadata.xml 733 BLAKE2B b18b79649744580db9298cb069dbf3b4c23d10983f012206199f6049752a5a232ed7068daad0716add206cfbf811d3c30e61c90d465e9f2a7f5c444f415d5dad SHA512 a3458edf61b355dc98f05602aa0a98c56d553567f85644ce5157f6a36f8947f8fb11971992305074c1d00a00e38481d4b34048ccf2312f51b477f33498cd792f
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
deleted file mode 100644
index 44be8ed7fe5e..000000000000
--- a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="subprocess.run replacement with tee(1)-like output"
-HOMEPAGE="https://github.com/pycontribs/subprocess-tee"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="test-full"
-REQUIRED_USE="test-full? ( test )"
-
-# ansible-molecule is invoked as an executable so no need for PYTHON_USEDEP
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		dev-python/enrich[${PYTHON_USEDEP}]
-		test-full? ( app-admin/ansible-molecule )
-	)"
-
-# With the exception of a handful of extra lines this is literally the same test suite
-# as test_console.py from dev-python/enrich, which is currently known to fail (Bug #865497).
-EPYTEST_DESELECT=(
-	src/subprocess_tee/test/test_rich.py
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! use test-full; then
-		EPYTEST_DESELECT+=( "src/${PN/-/_}/test/test_func.py::test_molecule" )
-	fi
-	distutils-r1_python_test
-}
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.4.0.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.4.0.ebuild
deleted file mode 100644
index 998ec933fddb..000000000000
--- a/dev-python/subprocess-tee/subprocess-tee-0.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="subprocess.run replacement with tee(1)-like output"
-HOMEPAGE="
-	https://github.com/pycontribs/subprocess-tee/
-	https://pypi.org/project/subprocess-tee/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="test-full"
-REQUIRED_USE="test-full? ( test )"
-
-# ansible-molecule is invoked as an executable so no need for PYTHON_USEDEP
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		dev-python/enrich[${PYTHON_USEDEP}]
-		test-full? ( app-admin/ansible-molecule )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! use test-full; then
-		EPYTEST_DESELECT+=(
-			test/test_func.py::test_molecule
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
index 100597cf333b..e2d047b2cc2c 100644
--- a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
+++ b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test-full"
 REQUIRED_USE="test-full? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index e4dda883174e..ab8bc82d1b82 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,3 @@
-DIST tempora-5.0.2.tar.gz 19530 BLAKE2B 9c07fc294ef77d9a12276578ffdde39ef58508075deb98c0a89d6179bc7c9cbb7633d20077801a1d99d5c016c72206f508e5d7cd6af5667704b025ffccabe552 SHA512 d0fe086b92e21622444b941c583e3432420b1826e60aa4b90bab31907a98b4989dd21ca99b5554e965f87e23c9d65d9bce8e434d801985f99f187b7dad2a715a
 DIST tempora-5.1.0.tar.gz 20402 BLAKE2B 8dcb70dd1491228c9f7daeda40a07e07236fa4f4aa8ad76ecb9514b922732468cbf4360726421420ce8478bba2287815a1473c5231afae82bda222a7401478e2 SHA512 33b48884c024f82e3220c2cc28a307bbb3c813a895df82640b5627266355c78cced3e5ab61df9b0619bf9697e18d70390939189ba31dd57c58fbb3e97b5db216
-EBUILD tempora-5.0.2.ebuild 840 BLAKE2B 3453d847b91ca395c060ab8291edaf66823c06a77356e7ba3caa12c7a0d2de2e7bdec7805664bf7784ba29138daa810b201a585c0e385849e1edad1ac7914e20 SHA512 1b3e9e60e79b6eed2361ffaeba4dd44197b97e455ebd6e3de98285bcc0079643474f7bef7ee1a8f587789512d46ce154c2746a07d825337d057a8070836ca0a9
-EBUILD tempora-5.1.0.ebuild 848 BLAKE2B 1f6ae881615d62931ccbf8be3f289ac07364fddbb6720bda37d1f6bd8d2695c86985648ecdf2a2c9837beded9d1a8db1ef2b959438677ee686a6c5cb99c20b6b SHA512 7fcc75fcab38246d9888a319a34df6ecd3bd4b9f45ad759fc726898b8a0018df3eb40855714808ed554d9c052536015a3aec827beff4ab5003b57cdcd2fdec64
+EBUILD tempora-5.1.0.ebuild 840 BLAKE2B 3453d847b91ca395c060ab8291edaf66823c06a77356e7ba3caa12c7a0d2de2e7bdec7805664bf7784ba29138daa810b201a585c0e385849e1edad1ac7914e20 SHA512 1b3e9e60e79b6eed2361ffaeba4dd44197b97e455ebd6e3de98285bcc0079643474f7bef7ee1a8f587789512d46ce154c2746a07d825337d057a8070836ca0a9
 MISC metadata.xml 640 BLAKE2B 322432e820c99b65ad749062afc4536889b21fc7d1dd4fd2dd4d4caec382a90d98db38be3ead24136f8a3049b2d68120be72799361a30a6f788facdbdb4706e7 SHA512 4123ddc1643539c3152c6200860ff19f69164aa22c2f040617e9933d2b75737e8e96b9b617341156a8bbcfee579d40e1f17edf56a2759a06646987dce676c238
diff --git a/dev-python/tempora/tempora-5.0.2.ebuild b/dev-python/tempora/tempora-5.0.2.ebuild
deleted file mode 100644
index d36003e7f9d7..000000000000
--- a/dev-python/tempora/tempora-5.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tempora/tempora-5.1.0.ebuild b/dev-python/tempora/tempora-5.1.0.ebuild
index e32d2ca05b4c..d36003e7f9d7 100644
--- a/dev-python/tempora/tempora-5.1.0.ebuild
+++ b/dev-python/tempora/tempora-5.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 75079dde5619..efb4d7f5f889 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,3 @@
-DIST texttable-1.6.4.tar.gz 11611 BLAKE2B a97a9beefc9547fe7487af5b6411effd7391e303a13161d7e1c9304a1b580cf47bb10c8649dfea5c6f8ba05bc6c3fd7595662e8b74b282696d9ee3a110746212 SHA512 300b02f5b682f1c09a3eb5abfd4ee9c724354505a3f9e8f68207fd7d244402f234437807d68b6b526c3d4ade9e527e66c921bcd47a5e86d680698d559da3fe1a
 DIST texttable-1.6.7.gh.tar.gz 11698 BLAKE2B e34f5d6b49de379493697638305b428a1921b93ad95902334f8315263657f4570f6c3770f99bd0fbbce7be29c73f9638922f2c0b19df137a9fde425170d3b0e3 SHA512 204dcad0d2438dab8880088d1ea6ab1d0a5d81348294547a6967938bf8e1c27a6c5f91c59c2fe22ce8d1266d7efdb165749e0aebc738644215ab9b1d5a28c419
-EBUILD texttable-1.6.4-r1.ebuild 691 BLAKE2B 87a2345c50c2067a8a22973aa0aa7e3ef7311825b629b8f3ec221aea5049862c33fdc6e0b10fce32e5c43e951bb071e3d0e43b13fe7df99eccb1a52498becbff SHA512 6cdd88c38326a5c7890e641752d7a94874e07cdd5447660268ee5e30a1ed90a3fc73d3842d369d4858b6f4632cff9b9e214144e098fa5dc412f28dc40fc5b85e
-EBUILD texttable-1.6.7.ebuild 701 BLAKE2B 1c64aa9370546c92e5c91ed8b417715d0d6629cd258399d0bef7a9e38213315076c1e4299615b4baadbdac7e47be2851d1c580374e136fd6bc7eafeca19f0d27 SHA512 5304bf942d5319f487102e3c374a0786f44ffe1339503bfc0c153df636452cd3b288590add95503bea88bcd92638ec116092740cdd47485cb62ba227699c213f
+EBUILD texttable-1.6.7.ebuild 698 BLAKE2B 8d9875e383d68bfc1ed31e4a991ee3dcfc373db9b0e7f8e7ced49da4b9d5a4517e6c6760f7a64132a3ecc587d479210295775a513a34b9e9340a28b3bfd79616 SHA512 d151f5613c70421f85fa301667acf43437876ee63411fcb8b3ef25b6487380e6f8dbab2e5e807e0f035b23ec59aeb4d18de40b64475328c4121bed607c3b636b
 MISC metadata.xml 416 BLAKE2B 5b62e938b6e8769183d1dfc146896dd74166fd18b04c774de1a0f839803fb7f118298ef10524f8bd64d998beaf3c442381cc5575bbae3d0954ebaa51def0b97f SHA512 679d6e3d889b245f143ae2684e97ff97e79be06f0bdf23df9382798ae9b5ad09995ac9c1d020eff057b50040ef8e90d1c3ef3f9ebb62de91490a3d6bb6a7ee95
diff --git a/dev-python/texttable/texttable-1.6.4-r1.ebuild b/dev-python/texttable/texttable-1.6.4-r1.ebuild
deleted file mode 100644
index 5639bd1f80f4..000000000000
--- a/dev-python/texttable/texttable-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
-SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests.py || die
-}
-
-pkg_postinst() {
-	optfeature "better wrapping of CJK text" dev-python/cjkwrap
-}
diff --git a/dev-python/texttable/texttable-1.6.7.ebuild b/dev-python/texttable/texttable-1.6.7.ebuild
index a67b50ccc120..e50d50133574 100644
--- a/dev-python/texttable/texttable-1.6.7.ebuild
+++ b/dev-python/texttable/texttable-1.6.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 3c001750e286..a5752df802ca 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,3 @@
-DIST urllib3-1.26.12.tar.gz 299806 BLAKE2B 17c1f02382101b5a44fbc456344befe671c9579f6208ea307866ae0e2fabbe017fdd4b751a6053a6d014bf007f114ca4fc81e2149c9814ab5bef057ffcbce2d0 SHA512 c34bc2cb92ff5fb4e27948b6b8bf286d1f3993d8e399a7dc99e8c1cb07b364f16f9c8d6fc3e5e22e6f2d9285454a945174a9a1de3cb0fcf08e673ba316bc5469
 DIST urllib3-1.26.13.tar.gz 300476 BLAKE2B 495b6077d8a18347d731dcc69989688c2fed325a5ff89a7faa6eb1c17255d5748c54036292080e0e86842536f0d518da011a5bd64bd7f1064702d34985621af6 SHA512 022cbd10d91aa95d21293743dc1c36d4ed2dd3f95e60cab53b0aa3c1be489c7eafbc90c4cc7f6b67011ef4752fedb18c33d64a063542fdc525888b39e127b775
-EBUILD urllib3-1.26.12.ebuild 2306 BLAKE2B 2398a3c08c5bd5885a62dfbc935b48e240d770da2ad11d0b42c10f36a107680a1b8c8b489334e59be87745d2b5f31f1c2cb53d8a5e34bc98359351d78d970cd2 SHA512 4f1a1c98fe418200996f92d07f2eec9a21cb1e81793ef159ac26eba661d5ceded27c2c11ba9931c7bd8fdb6495ef40f48325a561b7e9b27b774d15a099b24867
-EBUILD urllib3-1.26.13.ebuild 2314 BLAKE2B c5fd97af9304bff028e10c55bfb886b0abe0f1ee836ab881f206b40fc1568f30594576c7909f4a75f16da63c186b12e66413361ec00c382ce1ac6ec50342df6f SHA512 274340afa8c5b6c115c68a2d7d87679649b87b97ce7f4bf3241d76cb8674a16b9cd6ce4c0653196d1950c8e5a933b19689cb865fe0026fc8f13fece3f49f5d91
+EBUILD urllib3-1.26.13.ebuild 2306 BLAKE2B 2398a3c08c5bd5885a62dfbc935b48e240d770da2ad11d0b42c10f36a107680a1b8c8b489334e59be87745d2b5f31f1c2cb53d8a5e34bc98359351d78d970cd2 SHA512 4f1a1c98fe418200996f92d07f2eec9a21cb1e81793ef159ac26eba661d5ceded27c2c11ba9931c7bd8fdb6495ef40f48325a561b7e9b27b774d15a099b24867
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.12.ebuild b/dev-python/urllib3/urllib3-1.26.12.ebuild
deleted file mode 100644
index 5a13659e40eb..000000000000
--- a/dev-python/urllib3/urllib3-1.26.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 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=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-		" python3_{8..11})
-	)
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unbundle urllib3
-	rm src/urllib3/packages/six.py || die
-	find -name '*.py' -exec sed -i \
-		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
-		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
-		{} + || die
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	if ! has "${EPYTHON}" python3.{8..11}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# unstable (relies on warning count)
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
-		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-1.26.13.ebuild b/dev-python/urllib3/urllib3-1.26.13.ebuild
index f8b0529965dd..5a13659e40eb 100644
--- a/dev-python/urllib3/urllib3-1.26.13.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 030adfcacfb2..c91caaef2f4f 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,5 +1,5 @@
 DIST uvicorn-0.19.0.gh.tar.gz 713679 BLAKE2B ee83cd7d318b0e54bd2dc240b5bfe3874ef41933ba7e2376e8dd3bdce90387b3d253c02c16ef28bbb54435b2e666309769cd057fe703d4be498f3c0ef19532c0 SHA512 d030a0c5e61b5bec985fa1640a74bf5da1dfa1a48d0b3f758096eaff2e3bf1d1b3bee1c3a024f5960cafbf928e9ee94e285a8c24404e1c4b6b6aa29f0d4cb15a
 DIST uvicorn-0.20.0.gh.tar.gz 716073 BLAKE2B 7f1cf4808e985199d39e54e3563119cef1fe3af31361ad05a91278d32bc6f0dd741ad87f6073fbb720e9d9d4119fc8389b4e2feaaede665d8f68c56d56b37a17 SHA512 fa089da78dd7ce3cc02d83405e7db401e6055e947b80bf4abb0e3a4dce6575d97761f3bd6fcc253f3338caad5f797fc4f01bd40d833514d9cc0bcd0f072ad793
 EBUILD uvicorn-0.19.0.ebuild 1672 BLAKE2B 9ca1d9a303ba136326695762cd9e6242a04c2ae9660e9fa397c83f9ecacd6e177f054af68585f4135d620ef018830be5f047ef13671b762fc9445c403d36998c SHA512 1a3fe5dfb54a312bbd5d99ed317d63cc8310c96d2734084c89c2a3c6ec961ab3b6fa0d01869012b3ad9851199bffb4d24db804a4e5c6acdf93a3cfbc547994a5
-EBUILD uvicorn-0.20.0.ebuild 1892 BLAKE2B 9cab553857f27d7ca405186dc22052e5f32c2d1eddd68d924303220958527cd6b7b4913835fc1759f121c7dbb9da951fd3554d6ae1aa6da6c25b69958a99034a SHA512 cca042e0a023c6f89e3bf144f0328c7be0abcf885a1f7b0902b767287436b0d1170a561271a02ce2c6ea5f26488087174603a62c4c7130d89065149c874a3ec1
+EBUILD uvicorn-0.20.0.ebuild 1884 BLAKE2B fd8deae33bf133f23896d08990fb5845bc8311f96c3f08feff58427b15bcc2a5cb3760e897e252ad51a75bea5d57771d630cb44028040c47f0668490fc42d228 SHA512 bad696b1b2dffb5af2d4f47a2ce7c3b142fdd949990582e08cf7d662d122bcd79e4303def41f82086abf345b55756b171288693886fbd34a80978b4821d830ed
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.20.0.ebuild b/dev-python/uvicorn/uvicorn-0.20.0.ebuild
index e69ff45423ec..61a1950896ac 100644
--- a/dev-python/uvicorn/uvicorn-0.20.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.20.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index dbf919583241..b94ae12c8317 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,6 +1,4 @@
 AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd283678acf474af866f26951231a823a930323c1d7fbdb06c01b4b06b98522ba1bfb427973261627cb9967949d8b8a SHA512 81dde3661720814ca89fb3cd20786601ae7a5362a288c7f9ebbafd4095006b863dfa3c544821b917d9abb8a2532b08d415440a21f19e14e3a67c517064f1ab61
-DIST yappi-1.3.6.gh.tar.gz 937785 BLAKE2B eb98d51f450091e66429affcc12f4329629bfc466dd8db9c5e77f5385a6b7bb551fd336825d64d94141ae41129618025a716a1b4e0718b022e67978330900bf0 SHA512 f55555042363581535eb4dfca096b1c698fb32720e5d1740d72ee7290f162ec44f0ed05936d6d85fc63f347e6be19b182550bd6e6593b65616d11d109fce8cbc
 DIST yappi-1.4.0.gh.tar.gz 938290 BLAKE2B 98a9c82d101e64f70f589b51ee461e1967c0fada75ab98e0de8f0446254e7ad73e25b842c85464953b9f81fc54d2007151dfc91e4176068a7cb320176c8828d2 SHA512 c557c67cfce29db1a526a2d385af28cd241eae46a653e9b4f7308a6f52ff1ede49b9211af09889c63eae3eeb38d55813a8026161b1184fccf4db4add8a022541
-EBUILD yappi-1.3.6.ebuild 619 BLAKE2B 230fadb028457b00046296778c49e0d1f9034cb1c2d7e6abaa4fd70d78d9d1ec24acda5079ac2469fd9be20dd6e93479c05d126d018e05a2914037da4de0cf7b SHA512 2b94fa26cc2b26c8d8da782ed132cf697794d53fdb69d62bd84ce3cf76e601394d4d4c642c7f4a5ac131af002dcef9edaf71ff208b2e38f76c2389d69a5c3207
-EBUILD yappi-1.4.0.ebuild 621 BLAKE2B b421d94f391f5b8e3eab60507d37c7d0d4171d35ea830b708d277ea5e97cea04f310e62e43833c82baee83c0b30639ecf17eed76009623f573ae8c70939c961a SHA512 87d184d00b381746b6338bfbf69f78f7cbd0f0e5d4533a93811844be0bb259371a741d1145dc3c3c76f2e7faf8997c186873eedbfc1ab65d5de1aa24e2a70213
+EBUILD yappi-1.4.0.ebuild 619 BLAKE2B 79b68c1c053b7a30c191438ad012b32d39f30284f2b40aebd84edeba453f30724ad62a2c741dc3af9f622c75968578b90f3850ede88f54bbe2d4215e976a5355 SHA512 0d58be6a7f6fa63feb377250992753114be8ba91e4b9d355475370638a3bf328968da39a127f71b7ec7d80cc1e4d09c9ae8587ca17fc0ba8053fa749ba1ae32d
 MISC metadata.xml 489 BLAKE2B 243541f7de9fca044073eb0f35d32b751738c9172dc1ef15599eed56c0c8b2e9758d703e555aadfbdd4d1f96def39f88798be495d80fcbb763e0f1e0f3590822 SHA512 2eeeb6c6b73f5077584150d05e9c1d8bef00d0fb83283c6f5804ec31151f3e59d2de91ecd86508a2fc2a61aaab7e82455c633487f64a4c6dcbe5ca9229fe20ed
diff --git a/dev-python/yappi/yappi-1.3.6.ebuild b/dev-python/yappi/yappi-1.3.6.ebuild
deleted file mode 100644
index a1a6c6a09003..000000000000
--- a/dev-python/yappi/yappi-1.3.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet Another Python Profiler"
-HOMEPAGE="
-	https://pypi.org/project/yappi/
-	https://github.com/sumerc/yappi/
-"
-SRC_URI="
-	https://github.com/sumerc/yappi/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}/yappi-1.2.5-warnings.patch"
-)
-
-python_test() {
-	local -x PYTHONPATH=tests
-	eunittest
-}
diff --git a/dev-python/yappi/yappi-1.4.0.ebuild b/dev-python/yappi/yappi-1.4.0.ebuild
index efeff88c98ff..eaa42c3e85cd 100644
--- a/dev-python/yappi/yappi-1.4.0.ebuild
+++ b/dev-python/yappi/yappi-1.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests unittest