gentoo resync : 25.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
commit: 401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree: c2bef4719f6787550f0916aeaa8f4f403a9296af /dev-python
parent: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)
286 files changed, 1769 insertions, 4770 deletions
diff --git a/dev-python/arpeggio/arpeggio-1.10.2.ebuild b/dev-python/Arpeggio/Arpeggio-1.10.2.ebuild
index d34e8083e282..1d8d5c5f4698 100644
--- a/dev-python/arpeggio/arpeggio-1.10.2.ebuild
+++ b/dev-python/Arpeggio/Arpeggio-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Parser interpreter based on PEG grammars"
 HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio"
-SRC_URI="https://github.com/textX/Arpeggio/archive/${PV}.tar.gz -> ${P^}.tar.gz"
-S=${WORKDIR}/${P^}
+SRC_URI="https://github.com/textX/Arpeggio/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
new file mode 100644
index 000000000000..e25d2baeb0cc
--- /dev/null
+++ b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Parser interpreter based on PEG grammars"
+HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio"
+SRC_URI="
+	https://github.com/textX/Arpeggio/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	test? (
+		dev-python/memory_profiler[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/^setup_requires/,/^[^[:space:]]/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/Arpeggio/Manifest b/dev-python/Arpeggio/Manifest
new file mode 100644
index 000000000000..a84934af7d55
--- /dev/null
+++ b/dev-python/Arpeggio/Manifest
@@ -0,0 +1,5 @@
+DIST Arpeggio-1.10.2.tar.gz 766747 BLAKE2B 91e828731757b6ca1e16900edca3f45378c5bb05469e1d32571f9185dbb887f5cf6ae54afecf77f352f882d9056a0814c65aabf51424b482ae3a8cb90f11740a SHA512 c6a162f9ab854bac7e2bc9e5d5553c2dbcc068fcf61607149727cd4c8a7c87c63cab765b423c8ea76e09fa81ccc42157d724388a81e22864580ccf734998142a
+DIST Arpeggio-2.0.0.tar.gz 767813 BLAKE2B b4eab5b0a049560e8f3d775f34e9d1beffc26d3969a11a2043d203852c77385adbbef876e212b09c6af8630f2b8de6dfb088760bf9ade332af981d4e8d8267ad SHA512 b5a75eea515b7dd0ad7dc261703300bd5b3e5a70f0946845f8828dbf7c76613aef926fed9538fe0f9a71c1666edc9f8cff31afddd551bea1d7b1b9ad7a9cc405
+EBUILD Arpeggio-1.10.2.ebuild 703 BLAKE2B 9dc3455c024c9dbfe561d950a7b1616b3cdfc5eba6e1ea0aa6f51b14e196101f35093c8a021e5cbaa620f1797da40704d72139a4fb79beb478e4063fb99a4b2b SHA512 746ba7aee72b9b12133667c46ad68addb2917f44347d1a908ca6cfede62d1257267fff8c4d9d5749e74f648be5aff9fa6c82466d00cd18593163db4e33c4816d
+EBUILD Arpeggio-2.0.0.ebuild 700 BLAKE2B 58763f5a2c03f824670125b4b1f28877adf98841a6d4decfcde4dad524ed7a01e8110a998895f105375b0140a2d1ed4ac533150da73f7efb16d332a3013c3f96 SHA512 8e40438f006eb186119100a3e359d9b76c628be29ff40de6128376bb0964b272afbe9db58a5f42148e88cb1ad7c4b21431d7df26b165929a931280810b709d54
+MISC metadata.xml 447 BLAKE2B f4b144e8b81282e3d6c737c94ab3a21c1c5e9c9c188c21bd8d7e421a12ead133f26c226edbfa26410abb34f32b238571ca59d18f6870ad6e4eec1e9e54a20fd6 SHA512 f46f964a5cd2c23e00a6553f7a56324eee55231678cefa8538d5c0f4bad073478e99d7087989bd4fe2644bbb649e29e6670dfd409902750aa59534cd0c9868af
diff --git a/dev-python/arpeggio/metadata.xml b/dev-python/Arpeggio/metadata.xml
index 11c23cea1edc..11c23cea1edc 100644
--- a/dev-python/arpeggio/metadata.xml
+++ b/dev-python/Arpeggio/metadata.xml
diff --git a/dev-python/Faker/Faker-13.3.3.ebuild b/dev-python/Faker/Faker-13.3.3.ebuild
new file mode 100644
index 000000000000..c83621e099c9
--- /dev/null
+++ b/dev-python/Faker/Faker-13.3.3.ebuild
@@ -0,0 +1,30 @@
+# 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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 5bec24b8fbe6..508b5531f08f 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -5,6 +5,7 @@ DIST Faker-13.0.0.tar.gz 1450916 BLAKE2B 59bd53175141250f1ed07e89fb4233a99e642bf
 DIST Faker-13.2.0.tar.gz 1455143 BLAKE2B 1d1bbfbe33d8e15c40beae53631f58b575610a6ef9d351a926d226a86a30849e61854b400f0703d37ef02d401b325d7f4e3ad9323a2096b97ad660dbb8935d6e SHA512 e1f8f823e926197a45aba015e9750f898a359fbf1973ae4735f2b2479e58cee2065a941fcf7e66f25f2f89cedf9b5d6f3e902805a14f11a33c8ab22846126970
 DIST Faker-13.3.1.tar.gz 1474346 BLAKE2B f6ccb4c574b4b0ba2437d2455a4d08f37d1f5df93cff75e3ce2a74c0f29fe564e779ad3230ac65bcd6b693b7f8f9e3507e4656157c542593792dfc855369bdba SHA512 e4b468af67f637d40c5039db095a032e46dcda32b3b96ae180149d27b92a909278fc2090ae6fe70f82f589794c486662ba672e16a60eaeebfc9b3901c02f5336
 DIST Faker-13.3.2.tar.gz 1474385 BLAKE2B 54fbf49f0104078fe619264e55eb2460026610582f5e5ecdd6d12ab75a421214e0129ffb83085c44b2fc04eb81bf6bfdf9f0970fb4e3c7ad1079bb3167dc55cc SHA512 ee23c8c05109aaeda2357e269714fbab44af6f9752d53c90710763bd02a417294426de854833c40d4ec5a4ca8d507e6fdb97cd934d60bf3bfd5d5946eebd5a54
+DIST Faker-13.3.3.tar.gz 1483842 BLAKE2B bf74f1e4d38b7ec5bd81610a462d88a86fec92886e42ad42a6827524d259697fd263a4e357f28abeee3ffe73ebc17fc4ea12082837773cc326ad0a89e117b32e SHA512 ac2dddf662fd8053bacd81fa52560bdf90f7055741648ea25d2cab92066be6efa1ddc29646ece416a408038fda695ff6602c5a655de3734c208864812f9d67cf
 EBUILD Faker-12.2.0.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 EBUILD Faker-12.3.0.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 EBUILD Faker-12.3.3.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
@@ -12,4 +13,5 @@ EBUILD Faker-13.0.0.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f
 EBUILD Faker-13.2.0.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 EBUILD Faker-13.3.1.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 EBUILD Faker-13.3.2.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
+EBUILD Faker-13.3.3.ebuild 705 BLAKE2B 72106161ef7d904dfbec2a7d29fd7036c2ffddf1f501ff1062377a66c8463824b5d22608f16333f040a99d5af8bc4572d23e6685f5dcf8de6943aaff020a4d42 SHA512 ac3451a2886eff64f7b612cc96d2753e192ed5959d02ba452cbb9f059b8642a09f5b368faf2a5926361af4cbb136744dd820e19542e69fe5642d7a300ab61c9d
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b51c4e934f9a..8b92233c37f0 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
deleted file mode 100644
index 4418079153c1..000000000000
--- a/dev-python/arpeggio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Arpeggio-1.10.2.tar.gz 766747 BLAKE2B 91e828731757b6ca1e16900edca3f45378c5bb05469e1d32571f9185dbb887f5cf6ae54afecf77f352f882d9056a0814c65aabf51424b482ae3a8cb90f11740a SHA512 c6a162f9ab854bac7e2bc9e5d5553c2dbcc068fcf61607149727cd4c8a7c87c63cab765b423c8ea76e09fa81ccc42157d724388a81e22864580ccf734998142a
-EBUILD arpeggio-1.10.2.ebuild 723 BLAKE2B 021a719005537a251dd2197e20c9be07732a41c27ba53076ebfe5553448d5861c997801f2be569ed19f9c5d87ee33374438ed3c8cbc249731fd2f044e0bc339b SHA512 4c0c013dc21b0d0581db54cfc530b3ad7642d388d4e1a22ddb8506494201f23e1fff3897cd69c1703a373da9395cfe462a5b3a18a43042f6305a4ef3dfbaf1af
-MISC metadata.xml 447 BLAKE2B f4b144e8b81282e3d6c737c94ab3a21c1c5e9c9c188c21bd8d7e421a12ead133f26c226edbfa26410abb34f32b238571ca59d18f6870ad6e4eec1e9e54a20fd6 SHA512 f46f964a5cd2c23e00a6553f7a56324eee55231678cefa8538d5c0f4bad073478e99d7087989bd4fe2644bbb649e29e6670dfd409902750aa59534cd0c9868af
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 006b3fb8bbfa..b79478d9b9e7 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,9 @@
 DIST astroid-2.10.0.tar.gz 417686 BLAKE2B a4aa0451134403abf8e56ccd9dae106d2a92b2bd53c6772c952984ea5603b44ef5c13b9822b4fda0a146ad96a7412a602c2c46313938dea30cfb390fc55ee54d SHA512 34b52cd2e6636009369ec55a5781caaf8e8b0766b7ba4e70ff1f55d275a673266e0293f65145ff38637d6da353679314d0fbf182416146b89e210a68e39d86f0
 DIST astroid-2.11.0.tar.gz 412098 BLAKE2B 022c940913ae71ca0280a2ae47c19a6c82ea69b4f2a1c1ce0e2f00dac7a37b26f7ee2fa798db4f5d230e021ac5096b79d48b12d389d0c754dc17bde301c1712f SHA512 82423c9cf6da4e041621218acc81b9a301e4c1f532a74863c89040654d61457a89481004556a4795f021f0fc52b5f79412a35e9e43a1de33189dcae305cefdff
+DIST astroid-2.11.1.tar.gz 412506 BLAKE2B d3153b9019d5c466d39f7b27d459158cabe47cc9375afe2f1362b20620847fed0b4b09e2994e4372712fbd5bdff3cf88f709c1644abd25bdb6085e93cdcb145f SHA512 e0a1cfc67602e53c8d5b67d1605b38ee5c62886cb0ca757f0835f8af2ad94b21af58427ed4aad9f98171955733c4b333443efb1f7fdcec661d1e68c403a529b1
 DIST astroid-2.9.3.tar.gz 409069 BLAKE2B 152dbe8ab2fee3964dc8cc714a5ba48c71b5994c77d1e20683bcf028483aca22d5be5772e72d056cfd3d1f59562b447366d61fc35a2b67d545f069a8f7975e84 SHA512 7bb3bf2d456c0d22325444e641961c34eaddcddf50c97ee9f5b5c8755232cf1b65a315258403b40bb7dcad15c4f9b6b73ab0eb607525a48a65f52406969eca04
 EBUILD astroid-2.10.0.ebuild 1393 BLAKE2B 82e0a985a022d7f8aec57ad6041c47a40d660f2b0deedaa792a126e46ad38208fe4f0456361c08d608f2ae206a6db6f7c8cfa1972a8c6cbe79a50aea6acdbd43 SHA512 657a2bde8ec50f205236b3024eea16a875a1881a7313fa39f8d06c713d26d19a890759c4dd96fec25b2110e7f694c49b4a76eaf6871a6fec193762aa0dfa16b0
 EBUILD astroid-2.11.0.ebuild 1390 BLAKE2B a505bc47a393b96daae7473338866384d60aa291a3f4bba29a1337958c3cea6ca0e5e538b4b1a1044e51c7ee3666e4faaaeebe4d8b5ec2ca03f727513fffd749 SHA512 31c1a84e11b941a225a1454c13e5daef31dce932a770c4d513668ccb6e64e7327e54e7d8b67e3bd72381da289c160da0b0335b48fab34421e37fc9ebb806d474
+EBUILD astroid-2.11.1.ebuild 1391 BLAKE2B 026560b411056b47cdcd3c04ff8525c3d395ee381da86d317527126bf111cd56e21a154872f1beca9e2167c6f060a2b81972f3f296b01367cb06332d002f2975 SHA512 9332b9a912758389cd698a1f806c7f5412e3cdff3007fbba33823f509e6c9edb517612475951c306abaf10286756df6c7a491ce7bdf5938c3723a665d1355994
 EBUILD astroid-2.9.3.ebuild 1305 BLAKE2B 8ed0e241b8c820dfce1228a811ab24f9e96898f61037c5d66c5db327218b1740a13f87078c60977e2a923c193ea59a9cbcb1197a35fabdcdb09e8b1370251e78 SHA512 f89e842c114311520ef5d55ffa00410986ed1c19b9eb132e1b1b527e74cb6e0605548704b6129013a3d2c11542902ba25ca1df1c0e65692cfb9939cc407e7ada
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.11.1.ebuild b/dev-python/astroid/astroid-2.11.1.ebuild
new file mode 100644
index 000000000000..313a897a7376
--- /dev/null
+++ b/dev-python/astroid/astroid-2.11.1.ebuild
@@ -0,0 +1,54 @@
+# 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="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}.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 __pkginfo__.py.
+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/nose[${PYTHON_USEDEP}]
+		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
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index e333da7d10aa..1e9f3c78e8af 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,3 @@
 DIST asttokens-2.0.5.gh.tar.gz 46876 BLAKE2B 8a8da138888de0a4096b10eccc483c9540710acde0da188ed3fb3845f96b862fe2eec393c69ca62e7b313bfa0e2f0d673d828e9d1ff6dbbf5b641fe8122a548d SHA512 3e710ca9703e67643bb9c0a4db4e5c1656e6d5c904a1262a9ddb962beff06e4e8bd9815bcd2509b48974a97a565d8479a4369583c166a65b6d16c19fd926e93f
-EBUILD asttokens-2.0.5.ebuild 933 BLAKE2B 6d749d7fd0ed9a3d9afc9a7af4149eb248ddbb162c1f3d3099a98eca302b2e19eb294dee82dc2413fe8faf26bc456ef5a7aa7d52521f0b2d762c5fb715808a02 SHA512 dd010744abe3d39527b37777317660726ae63def94dddbacf480262369010b6681b4df856da3cad93261ade8e5fec626d81818e40c7d10b4dc73d962c77b9815
+EBUILD asttokens-2.0.5.ebuild 932 BLAKE2B b8f8c338c326c0f59f29711091ab3cb4563519d444b806976c56701e5fb020b96420a85bdfa8fbb16aabb653335abe5f12b0c6f3a6bf65c648531e9ec872f8ec SHA512 cefd171a90ed647f67a42d47e21764b769f3fbd489728cc5e9d14598e546d73530616f33b5f967ea70bc3c926724fca1a7148719fd9511c5976876375dfec54d
 MISC metadata.xml 350 BLAKE2B c05dcff93454660cb741def5cb0ca82e56f0cba84bddb9604153b6d70625e4dfc9e15743c3448a0cb68d9b5ccf0778f8126390872bd8689df0e0ab2bed7e6582 SHA512 521762b1e8a542c5f3156014884c3d845b6fe882e819c924aa8023f8dff32a94490e64a1d1f700f5127bd867c60c4f0f7c4aed5c39f78e52bd8ebabd113403cf
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index 822a7284e60b..cc72a85be30f 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index 23027faaa6ac..599cc47da6c6 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1,3 +1,4 @@
 DIST audioread-2.1.9.tar.gz 377500 BLAKE2B a90d1d7531c265a8c2b7933ac0bfc00fbdf298546620fef3ccae0204fc1eedcc584bf2fdb79b1bbda81b29d03346abc236cd0234684ba3cc70642f837033ab99 SHA512 ad2260b6931cfeebb815d48221366a2a5d8095965ff18e94c5eb0809d9a1b02e650a62ad5e895b7f1e003771fa3babf56f59ce4538aca78b678566fd28327290
+EBUILD audioread-2.1.9-r1.ebuild 899 BLAKE2B a395d8d3210224b0142855b2e31787a3d59b1d3a93bc2bdd3daf548ba41cb05561a409b7ae701ca91579e1baecad5efee3ec7bd559cfd95d826860dcabd3b5b0 SHA512 0586c0c4749775159ad5c63b70c4082490b8e3404e15e0c78e5cf01b658bbdc35297079875ef8237534265ec360ceda06af605a133d4279698cf65bc05a412d7
 EBUILD audioread-2.1.9.ebuild 895 BLAKE2B 4b234d791345367f904e9b0ce30cd2e20d7f77d6a0546779e71db59f862425f3b26cbee9b15edbf82281409aae8edc86ff8b410b6df7ffdc4bf4509cdc3f72a6 SHA512 276a1b0a2ffe4e4652af19de85a367e036cf1ea9b20e609110fcd73418b2531e72ae61594ad49ad50a72fb3d22e17def8501fa30957205ead8777cde5092de0e
 MISC metadata.xml 639 BLAKE2B 13d77444ab3bb26d8fb4c96cd3155e4789a7426fbc5f107598758f299c8d6524730d9f52ec31c99cc2dfb5830f9eaabe7c0632e70a51b6948e1219a87099b39d SHA512 4236cc1a5995a3f38e0067e56d7d3ff35596ff9ca359b9ed06028585a6ca7b20140112b28bb3969fb9b8a4702b09b61ba11b61e168c65ca4fdd4d74cc79e28c0
diff --git a/dev-python/audioread/audioread-2.1.9-r1.ebuild b/dev-python/audioread/audioread-2.1.9-r1.ebuild
new file mode 100644
index 000000000000..0ed7e9717019
--- /dev/null
+++ b/dev-python/audioread/audioread-2.1.9-r1.ebuild
@@ -0,0 +1,41 @@
+# 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="Wrapper for audio file decoding using FFmpeg or GStreamer"
+HOMEPAGE="https://pypi.org/project/audioread/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg gstreamer mad"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/gstreamer:1.0
+		media-plugins/gst-plugins-meta:1.0
+	)
+	mad? ( dev-python/pymad[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		dev-python/pymad[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "/'pytest-runner'/d" -i setup.py || die
+}
diff --git a/dev-python/autocommand/Manifest b/dev-python/autocommand/Manifest
index 018989272d1a..5bc91fe3d1ea 100644
--- a/dev-python/autocommand/Manifest
+++ b/dev-python/autocommand/Manifest
@@ -1,3 +1,3 @@
 DIST autocommand-2.2.1_p20211118.gh.tar.gz 22093 BLAKE2B 186062c0234fc0cc553c5d2a474a5fef46e0de25de8220228715265630fc95ed5f9b64321131322af71fadcc70ef79690652cd555a908b4e8628603a8ee494b2 SHA512 488228c7536f00ff9fbed99677440bfd7228aa64189bbcfb6aad7a92dc698d8283dfbd619ffeaeef883b0e600a90e2a0f56fa79958f144ce673dff53f8d59f89
-EBUILD autocommand-2.2.1_p20211118.ebuild 682 BLAKE2B acb5c37ef2fdd28182937d57f4a1a0a3843edf4b93517ce6984814fdfc855ffa85b3f233eeaa99ba0c17f4967b849c9389ad60b9824c74d907890424a6e614c9 SHA512 059b22b8a92213d4dee0504d59f8b8362f9459acfb290e66e543539ab6451869413a755182cc6c03fb5b88aae26a4019e19318844fa018231f8cef8cb5ddef0c
+EBUILD autocommand-2.2.1_p20211118.ebuild 694 BLAKE2B e8f8674dc27f97b0f7cf52b648ed59731b7335e32050a1c7e2470e7d6a9636eff112511630559f56637cf5bac76cf66cf2b4c1d7e606c3b8d195718b85386aea SHA512 06038dc4434fd137a600f14c54543c183823f055c8f9ef611d1e84d272728a71c38fc021c0034591ecccce22cb63656511d9bb9a475603b0213767bf3ad085cc
 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
index 53ad13a3a317..7607ae319c61 100644
--- a/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
+++ b/dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
@@ -20,6 +20,6 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 900f9b83c769..bb5c3640f8fe 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.40.0.tar.gz 988864 BLAKE2B 5a414bde5ceeb016267c64742e8c8dabf1460471261a84464ab2bffa4b5553eb042ffe2b4ac91b470316f64a68043e27f652b2cc5aabc8a83cf61faa89d7af51 SHA512 99c578cbe4100c30d2e6357dbb35aaf9e93180b8fce27f1b8400253153fef7d18487b5f67e0824920c6adb8bfdfe763a8fd893b3ac4ef3f781673f4761866e0e
 DIST aws-sam-translator-1.42.0.tar.gz 1017720 BLAKE2B d0166b09b99c64f5f4a4c1ebfe63b6a35ca6db73efb97f76b8748272b646fe2fcf9de06c2f6b29ce69a3edfce9235ba932913055e70f48d88569e4df25a6be0e SHA512 6b1bfd4bde203e31a9d98a385d6c0705ba651c39846358e750faf8a30c4e4e8b2ee57623af27da670ee8f1f5edca795b1b5528b5237ff9f01f911d4b9385ebcd
+DIST aws-sam-translator-1.43.0.tar.gz 1046840 BLAKE2B 19e405a07c9eb42ee77f26986eb09e6902559fc3fad5f1b7f4df0d09cb529add1c53910afa3fa3d867f048e69fb4c6872004733fc611347d4438013b80605e5c SHA512 9e7a5b4769eafcf1a9d8af7582cd4af3a82843d2c7c474495b9099fcb94f8dd0dd45d02f52ed609de7dc341b77f0f913526410935244836c3201b99c3fb6a292
 EBUILD aws-sam-translator-1.40.0.ebuild 1215 BLAKE2B 5081267656b1107b865edcce52360bc4cb7aa498cb43204d0b7b4f517b1e66870f85f3e74e3785038deafd4c910ff767f5163d6a7d7bc4894b774324e6a1e572 SHA512 1f757a62c66f94eabfc7178c2088a5b4055941928fe166a556536f81f9b30e24b0fa061c90a389a569b039ddfa84e89a633f8d4a3de6db60016775608aa5f4b5
 EBUILD aws-sam-translator-1.42.0.ebuild 1344 BLAKE2B 0c9e5d10c317fd808610359c30c458157dfaf7eb4cebb41e9d809b55accca642f6eb464a1dad630f053779a5d87fbf8e7a65e67af9c7b1ceb7675d014e55ebaa SHA512 5f0c00271b0f27a739ccff93f1e39476f29ad190074936ecd4b188587303142508e5e5db005c8d41ffc5ccb70de06f37f277bf9faf28f54ef00d92d598ab23af
+EBUILD aws-sam-translator-1.43.0.ebuild 1496 BLAKE2B 5aaeaa212d8a5efb826961d82ad7c6d86342cda218a3a2e7953e4834d22c04e0647566b2a4f9694630214115ab88c78b4281c9679891ce6cd9a4cf95ec220203 SHA512 c7d4f40e133976303c0b37812e453672bdcf39756d88c022268859a3ab5c688f009d3462befeee54afb60b372f88f9880832463631f0bdbf8e2f0dac1280761f
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.43.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.43.0.ebuild
new file mode 100644
index 000000000000..34c909b06a88
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.43.0.ebuild
@@ -0,0 +1,55 @@
+# 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 library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
+	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
+)
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7f19a2beb4f3..b78132dc6c32 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,10 @@
 DIST boto3-1.21.15.tar.gz 476516 BLAKE2B 306c7ee69dec5ff1fbd76ed32aaebdf0f52cdc49df600562f49cd543e5f331c6dbf88001070022043b9fd01c651af83b1c8c0966292c90791831f2e9d9fc4a84 SHA512 9d431fcbdcd42658cd52094b97c151fd10a68f2c83a457dccdf7991c8358c17b32faa09e3941f6d6e72bad8cda1b93dcfae8d78585dae43790c0ec248f0ab15d
-DIST boto3-1.21.16.tar.gz 476669 BLAKE2B 5ff8130a168841cd885f1f3f4752a5362910f0fd3c0598bab9db6f36c91570b4ef2ef598c46ebc5af870d9a12f12343213d44786923b3e0388bcc929d51fbca9 SHA512 86abc6903761ef740e3144a70acc9c3ef6f06e980a81b5384f8ad382080e8a5865df4e84b04ad54d6160ac2e9b7e1ff088395508ceb80861177f55b3a4eeeaab
-DIST boto3-1.21.18.tar.gz 477263 BLAKE2B 3d27a261bca3b7dbbab2eadd5be686e5b87b297a7a243d27a5424195e027abfb8e378296e760104f5de48a2e1a860bde5b658f7ff4c64520eab3df9f85bf78ae SHA512 4750a5ad6858df03c5c5367035de02f5a0123f46397992a7573542f5348eb0d864e3bbd6e009d7a62ccedef0316d1a2443649a87e922aa9c6dbdc4e1c9238e59
-DIST boto3-1.21.19.tar.gz 477903 BLAKE2B e06fdbcaf94a2c30efec86883b281d83363eeb643b09c894c678ba506f9ab3c85e0d807db61a9f26cf08c4bc7ecc563b6ad4b841be04c3055ae681eb5a8733cb SHA512 fbc29d04da1962c2cff2e4be568bc0eb2199181731e5028b848152d224f2bd1dcc0c53c9098762fa69189df1fc4d5ed99ac45fb631c9b37b3c911184167b1c31
-DIST boto3-1.21.20.tar.gz 478803 BLAKE2B a10b40e73b40933de94b6b33dfb76588cc7f614041f0128add3b1c9d0e30da77338cadef25b8f952e6a0eff9ad8f8248b44d4e70070ea793e2f1d0b1d96d81ae SHA512 37d3269e05727a08d1e288f8eee8fd6824d869cefce67a58323b4ffa89cc458a6de94438db204d49e037215659d0b29da2f03b59d7159bbc6492328099a87147
-DIST boto3-1.21.21.tar.gz 479513 BLAKE2B 98c67938b271dd7e5d99d06ba5fd046eead618243cd3c923b7857c3e1442b89fa08afa138360b4ed5e2c96254f0f7e657b53d5edc1e4baec3435c96048d6b3a4 SHA512 bacde2f5f2632ee9965e0dd4f85861efa32a31bdb8f4a2bc97d05c4ddd88f457b2e723521310020923951f13a122236cc95598c119ac20c4c8d38cddb6a8a29d
 DIST boto3-1.21.22.tar.gz 479768 BLAKE2B 3ae647a4c06cb9f7c4c32216dba439ce8bbf346fccf5a8651c08b398bcb7fdb0a4ac81c8d311625d0f50634b90c2f8a02160a19435db836ad05edf0d998a148d SHA512 583a49907339fdb8bb1deaec7683dad6bd0c2836a05cc317a8fc97a17e7b79fd114677fd6342cf6f96b1140bf1bcf9ca0fb1fd3af1c86600e6cfba5bbbf21ec2
+DIST boto3-1.21.25.tar.gz 482117 BLAKE2B 7f4823fa6045addb4b4ed01e83d1095e9f56dac7c232c5cc744cd956ce0c9840bf70a2901cf4094b0b403ba38129529880b1f1c91d26e9d85db9ca714cfc447b SHA512 2571098f20054d09e691adef67f518321349a55ae3f6eaf3b4ae1d58eefe2e61c67f1bce79366dd017bbaa86e8ffebea12f0d22c712f0b00487fe39e169ce115
 DIST boto3-1.21.8.tar.gz 473069 BLAKE2B f08f76fb9c4e56e6ba5624c885973599505769d7f9eea6e20a06e1a641768b1f7b108fc7293282a55bf4c7d2b62eb34853f46b8c3ada9afb8fc25624daa60c12 SHA512 23ed88dcaefe3224db05959251befaae4f03859bf00daf649db1e838e5fb92e01a6da4bee8083366d804404aac358df19d7e4552d6aaf39f9c4b371ccc7f9088
 EBUILD boto3-1.21.15.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
-EBUILD boto3-1.21.16.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
-EBUILD boto3-1.21.18.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
-EBUILD boto3-1.21.19.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
-EBUILD boto3-1.21.20.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
-EBUILD boto3-1.21.21.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
 EBUILD boto3-1.21.22.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.25.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
 EBUILD boto3-1.21.8.ebuild 1563 BLAKE2B a3064c6a72f92bab2abba12e88334ffb8f6cf706ff6f8c5834958a93dc9045324dc20bd36f0e987d28aa2c90dec58c820b86d3e8d3b551d19061b6c58e2a1e3b SHA512 5a0c3c442d405304bece4cb399f72cc6a1333b94a2e635ea9f8e5334d97d449325949db30a4936b5005ea38a00e922f87757ffb17fae5182125ddf9c2d90bcf9
 EBUILD boto3-9999.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.21.16.ebuild b/dev-python/boto3/boto3-1.21.16.ebuild
deleted file mode 100644
index 08e404dd41b6..000000000000
--- a/dev-python/boto3/boto3-1.21.16.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..10} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.18.ebuild b/dev-python/boto3/boto3-1.21.18.ebuild
deleted file mode 100644
index 08e404dd41b6..000000000000
--- a/dev-python/boto3/boto3-1.21.18.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..10} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.20.ebuild b/dev-python/boto3/boto3-1.21.20.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.20.ebuild
+++ /dev/null
@@ -1,63 +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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.21.ebuild b/dev-python/boto3/boto3-1.21.21.ebuild
deleted file mode 100644
index 6fcba460ab1d..000000000000
--- a/dev-python/boto3/boto3-1.21.21.ebuild
+++ /dev/null
@@ -1,63 +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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.19.ebuild b/dev-python/boto3/boto3-1.21.25.ebuild
index 6fcba460ab1d..6fcba460ab1d 100644
--- a/dev-python/boto3/boto3-1.21.19.ebuild
+++ b/dev-python/boto3/boto3-1.21.25.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index dae5d47186f9..3e5fd733e52a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,19 +1,11 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.24.15.tar.gz 8820413 BLAKE2B 1a842d811b0471ee6881fc6fbae9726912636c9a83ed9e1395ae96705f6ef47cbb5d6b134a011da747951b7570e722af5a60c949e9301d509a79f431a797ca70 SHA512 d614d6f065a77e5d4dda9c8dbe401feae4e83398c5d2508b0807984fc8783b31cd6c507663c90a08daa5ccbf95b450633928599cd340227ab5dc90ea00fa1bbe
-DIST botocore-1.24.16.tar.gz 8820938 BLAKE2B 53e88eac6f0a0eff43b7f934d978e06d86debb5a99f112c576281978499d29627a5f8f0ca988ff05c8f24d08336d7a1bc0206037c8f0a89b2485b66af2b81294 SHA512 fac23333998ff790bc06829d576593f7031964d3399bd0cd71ffe160574ed98b88e64dc0cc84ca3eb04f6da130a8906d02f092e57d4074150e13611fbcacce33
-DIST botocore-1.24.18.tar.gz 8823998 BLAKE2B 0b3e94ad6ee5257642cc24c1c0966b92b0e759cb3d7dc4560e3b5eee2511e53a8c5fdfca559e8f891e5869a0b9d619ea1a3d050cdfbe202d9e57a855be64112f SHA512 8e92bfd9ae6f2067139c9296cd07d5bbc6e53ae3d748318dd16c47bd292d53e18ffafcdb5b25d7e18966d09e46376c45de45fceadf3422f7215c6a1aeded982e
-DIST botocore-1.24.19.tar.gz 8826833 BLAKE2B 371aeb445c798b1d365397cd4e300cf86efa6c478d0e37ef768f14ead751f0e3f97d2d5190ee75681e11affb835517305fc4d8694e8c9aa9084048701b93d937 SHA512 a6020b9fcaf285859bd33239ac1f46ba7ddaab3c680a93ccb0562352bf8677b890da4ee6f6a0b6c33e3cce56931cedf29f3b373509815b5597be0578b392a74a
-DIST botocore-1.24.20.tar.gz 8826541 BLAKE2B 8661c7057d64905972062761a567e88507769108e8e97ebea7d71b89a46fe7e807bd270a23d811c182651d334e50cdbd10d25302e021e19aeb509fff449629f0 SHA512 60c9160fa2e01f3e17bb964bcbd8194e011a787ad610d24fc31c3791b2a4b7645f94a688b8766b839a140dfa76fb9f1ae470604a262aaaf2838d42c730481653
-DIST botocore-1.24.21.tar.gz 8837199 BLAKE2B 34b321900ff52b5d8fbde87160745243fedff5ad74930c428814c86ad713a367fd036aeb3ee74267420d2c39860327b39d604ddad208fc09008be30b8aac7b62 SHA512 6b5a5011501c81b3fc616c94c1dc1c673dd2a6d3c1f40638aa36a27131876e9bf64f736c9536606b9817079b33013fd62474b685bea4088d949bd6a225c7f247
 DIST botocore-1.24.22.tar.gz 8839717 BLAKE2B 7b3843900da913561ab2a99f7371139cd8fd89a2eb52a90b33f8fb4c0449ff23a00f56347a2916b271346acf2c0721af0a9695bff3663888aa87c790705ce4c3 SHA512 070222b5eca46fa5463620af63816bc8813c717a56b4c41294556130390959ac14570a1256542f145a5b36727ced9657b386fcd5f538d64912c8a9f049673bd6
+DIST botocore-1.24.25.tar.gz 8852839 BLAKE2B feb0f5de1d34b9f5a1b20f76480f432059c74293c70d310234beb8515741883d639dc54d7843d47e03aa107846d1a83af29fb98e6cc519aea289841a17464f56 SHA512 d2bb402bff2af857d433b379d81b727120543de6a5cf3d13f0c5dd60cef219fd5ea6362156c5284bb06860ec2ca0f1823fce4dccda03e4213eb737e45470ca0d
 DIST botocore-1.24.8.tar.gz 8798121 BLAKE2B 4ca37ed7be0af62901bf154f75739cc7e07505a809e551884c72d5b5eed334fff1111fc6db016df522564a1f3d9b6f258e8eca96161a734711340bf880b553b5 SHA512 6ac2139694ab199313a0fb9a2f783b12de7f3915d10cba739f4758356a3b84a917c3c394954b6d82d7a62de907c6fe57a3559e2b9a625bb0479e7bacd31d21cc
 EBUILD botocore-1.24.15.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
-EBUILD botocore-1.24.16.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
-EBUILD botocore-1.24.18.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
-EBUILD botocore-1.24.19.ebuild 1647 BLAKE2B ad86668d87666a5fc95c9399a7e8b3c976675a41e8bf08992ee4229989d15ad228f2c8a3ae700eb77a508a37985b9dfe6623759957d4b1408f837a7e821682db SHA512 4e8e0d4e4b737e8a1a7e6ce51aad555b4e5be064c8518072e1713e3677bf502d8d7d92694d6592825d6a88b6c6ef823ba8acb611c81cbd04e25359f128ba7a92
-EBUILD botocore-1.24.20.ebuild 1647 BLAKE2B ad86668d87666a5fc95c9399a7e8b3c976675a41e8bf08992ee4229989d15ad228f2c8a3ae700eb77a508a37985b9dfe6623759957d4b1408f837a7e821682db SHA512 4e8e0d4e4b737e8a1a7e6ce51aad555b4e5be064c8518072e1713e3677bf502d8d7d92694d6592825d6a88b6c6ef823ba8acb611c81cbd04e25359f128ba7a92
-EBUILD botocore-1.24.21.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
 EBUILD botocore-1.24.22.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.25.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
 EBUILD botocore-1.24.8.ebuild 1639 BLAKE2B 661d6810ac62f653444c59c978e3d904868415e13bddbc20e93ac8f033f3a179736a74f4cf4b55ca0251d5c9392c96d241f5c3c6385d5bf569caa54eee5c5457 SHA512 b46be0c5c734d0283e33b51d88ce992a15c06510e61b67cd8500ae780d822062e761cbe647c0def8b36cfc57f195480f59bc92ba051c399c72f996c1d0baf327
 EBUILD botocore-9999.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.24.16.ebuild b/dev-python/botocore/botocore-1.24.16.ebuild
deleted file mode 100644
index 35239170e3a4..000000000000
--- a/dev-python/botocore/botocore-1.24.16.ebuild
+++ /dev/null
@@ -1,67 +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 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.18.ebuild b/dev-python/botocore/botocore-1.24.18.ebuild
deleted file mode 100644
index 35239170e3a4..000000000000
--- a/dev-python/botocore/botocore-1.24.18.ebuild
+++ /dev/null
@@ -1,67 +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 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.19.ebuild b/dev-python/botocore/botocore-1.24.19.ebuild
deleted file mode 100644
index 6fd852f23857..000000000000
--- a/dev-python/botocore/botocore-1.24.19.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=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.20.ebuild b/dev-python/botocore/botocore-1.24.20.ebuild
deleted file mode 100644
index 6fd852f23857..000000000000
--- a/dev-python/botocore/botocore-1.24.20.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=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.21.ebuild b/dev-python/botocore/botocore-1.24.25.ebuild
index 3bf7c7cfb689..3bf7c7cfb689 100644
--- a/dev-python/botocore/botocore-1.24.21.ebuild
+++ b/dev-python/botocore/botocore-1.24.25.ebuild
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 317bb49ca780..3010377115c1 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,5 +1,3 @@
-DIST braintree-4.12.0.tar.gz 77385 BLAKE2B bd9e241fe39997265286ea96fd2987f2df71138785543de3dba8257e0437a4a4188d3b53c6c783a3a782ee125264916c09226473ea4142200a0ac91e84a4a70b SHA512 d77e9c6ccd636df501d62f1af51f307fd56d7479c4d6517b9440b00d127aa1e21bd30589dd66e1b8f324cf582894fe25ab3803b880b18c4e41b349142150986b
-DIST braintree-4.14.0.tar.gz 79558 BLAKE2B c20e0f1f547d2d74b1c021d3798f214b969c33eec48bb6c85e5b88377dc7e3c7b0941c4749f710c14b6444122db485ed6e98d6a2d35821f69ca34345c4e9f03b SHA512 e407f1e6afb56d03d47686bb416791668ba371f7f49dc0fa5eac6e52bc0733ef24e32ddd261e0280e24403ea82abb10c602994c75b65803e6e5522a4ae88a8ad
-EBUILD braintree-4.12.0.ebuild 545 BLAKE2B e51e37a9f672502f91afbc5f4fe18c690432e058f22386ffc3bb119c040ec78ce8065285faf93155321f005452fc192a706eb60a19da97f2a5925926ac9daedd SHA512 240d2984186a0d7656314e763502016a8282937209ea6ebe0bce763ad948da0fce28f7efdc2a2fa332e1771698cb69d62ec4a06440adb82d0c2db8f7781d7e11
-EBUILD braintree-4.14.0.ebuild 578 BLAKE2B c7caea812bfb101425025773b7f854f11f367b3b04221877bbb0c4fb243764b0792cb985007c6de793b27e4a2452c1160e300cb0aee8325b4f3192fed3a4598e SHA512 55de6a19881489245f05c622b909fc15e0ddf7dae025bf9b0d8db025869372a75c4446fe6be706c574c712b44fa2bb4332b272fd9456375268bf02bbed0f51f2
+DIST braintree-4.14.0-gh.tar.gz 206937 BLAKE2B 449a70c7f83e2ee3cb5c9e74624605387e0c12359e81aa18041c4dd2146c1bbb899cc97c9bcf6348ea1d0494d73d8a2366e41c05479e637d777a636cc1f0cec7 SHA512 d7d77d06c1a210200732e9e8fe4a55eb25f43ca7df9ab00fdbbbf077196c1605ed825976f691440e10b23bf4727b1e8200c5bd6b2cd9a66305110440cde0edce
+EBUILD braintree-4.14.0-r1.ebuild 721 BLAKE2B e586c4a6e55ae204cd6559cda583852d4d56056f114fc33caeac2adffedac5416d8af670285ffa5ea9f505c64fdd0f39e1a78bc7ec553c35fad8cfc19eb47ee8 SHA512 79e79106427cde200cd30d5ffae38ac250a75c5fb80c3b1532132787a23b44513f24c2ef777c65ce652646f2e649ea678c76aa96bbdad90da5d535c6d53fbbe6
 MISC metadata.xml 383 BLAKE2B 70a8e7ca92990a7e46944543465ae8b4d57edcda29370e27b6d3efe6b2a08e8be51b79dc650b7c0250614104df37cf9f36083155da5c3aad0888bfeda8a411a2 SHA512 479ac40a800706fb70556a07f5097cd80886a9ad6778b2d71a457e2fd2be08578da90091bb87609fb66eef014ae2b7b84637fea4de20d1aca0c86e245abea5b4
diff --git a/dev-python/braintree/braintree-4.12.0.ebuild b/dev-python/braintree/braintree-4.12.0.ebuild
deleted file mode 100644
index e2e3777fe3c7..000000000000
--- a/dev-python/braintree/braintree-4.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Braintree Python Library"
-HOMEPAGE="https://developers.braintreepayments.com/python/sdk/server/overview"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"  # Test runs against the development API server
-
-RDEPEND=">=dev-python/requests-0.11.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=(README.md)
diff --git a/dev-python/braintree/braintree-4.14.0.ebuild b/dev-python/braintree/braintree-4.14.0-r1.ebuild
index 7b5f2df3f290..6cdfcf182545 100644
--- a/dev-python/braintree/braintree-4.14.0.ebuild
+++ b/dev-python/braintree/braintree-4.14.0-r1.ebuild
@@ -4,21 +4,28 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Braintree Python Library"
 HOMEPAGE="https://developers.braintreepayments.com/python/sdk/server/overview"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+# PyPI tarballs don't contain tests
+SRC_URI="https://github.com/braintree/braintree_python/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="test"  # Test runs against the development API server
 
 RDEPEND=">=dev-python/requests-0.11.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${PN}_python-${PV}"
 DOCS=(README.md)
+
+distutils_enable_tests nose
+
+python_test() {
+	distutils-r1_python_test tests/unit
+}
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index 98e3befeb1fa..b8692d5c84cd 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -2,6 +2,6 @@ AUX cerberus-1.3.2_no-pytest-runner.patch 259 BLAKE2B 6cf56852d33703a9b2ccf86058
 AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff97884c3d490ce4201a6bcaf6124c4b9b7f3742e4106964797990327aee2b8978ebac94e9f81c76143d473c8aeca244e8a055d SHA512 2aa7b173844e6c275032dc6e2686b5ec1c7e41fa3611c2aa3246335299107278cce6e4ca96734e2cf3ceebc22e34ea278fbb4adaab05c91dfddd134b1c922194
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
-EBUILD cerberus-1.3.2.ebuild 548 BLAKE2B 2d21ca7b0dc077a7e761492731aabcb373012df0e9bc1a79f2958ff2f87b2c5c13cf97b637681cee96213d97bcfc4e38834b40779e35c42e1e1fe53ed3671988 SHA512 16624a3d874cd0e88f9aff1a3284075bb4e62c660d7de54c8ec9fa37b9bef7b0dbba677762bc82310b5ec438708810eadb5ae3f97e9875530c0b0c337e5a6330
-EBUILD cerberus-1.3.4.ebuild 746 BLAKE2B a06d87c2e7986902feda5848dcebc9d0990e7d673be86ee1b8e4f598ea75d283964ebd7136419af5238739a96d6a62759aa9c40ea7e8882c3f683263237d2bc8 SHA512 6abb2f08d0b7b090e15bf7b4eda4c3271c2baff37c258c174798020f35cb8ad545f62670c4269b3e67f3bebf82b905b1bce3db4c7c2eed2043669ed1f485af20
+EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
+EBUILD cerberus-1.3.4.ebuild 753 BLAKE2B 31016b995d74d64f7bf2824a00db1feedb4b97784d39f3e57d1a90458c8da28a0b9f3f5466667091540c812d48684be88f8afab53baf0a8a213a082b1de6ed8d SHA512 c106b7fd42a01057014267b836ae494e46bdc7d30df74e2ccceea828d65de3171e9f60a637355fab89de2b761849757c68634ece94f0dc4d0b4675bce4d2a4c2
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.2.ebuild b/dev-python/cerberus/cerberus-1.3.2.ebuild
index 4e51f4427dae..709c7d86a270 100644
--- a/dev-python/cerberus/cerberus-1.3.2.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pyeve/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/cerberus/cerberus-1.3.4.ebuild b/dev-python/cerberus/cerberus-1.3.4.ebuild
index c117fa874d6b..f9243673a7fe 100644
--- a/dev-python/cerberus/cerberus-1.3.4.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pyeve/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 8105632a49f8..336f218b1de6 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,9 +1,5 @@
-DIST cfn-lint-0.58.0.tar.gz 8645209 BLAKE2B b198c8e6a56095782ab5fbd70f1f5872d951da133ee7056ef468e5d1cd0ba1a7831ebd4263248ec2cec04980211e01cf3525e18f8ad272d6b1aaeee07527028d SHA512 238929a79d25b6a5945fd43f29fa3c432c650923634495c2ace7e3f6ace0c7701bcc278ea151a9172691bd04164f8a7b409dd8387e82e5917a9f65e1a556a4d2
-DIST cfn-lint-0.58.1.tar.gz 8711246 BLAKE2B 28655e076f3bdee358b1a1bb61170b176d0c90ab04ae43f1892798a239d0fd92e5dd939433a263321da02b349b9299e4f4916ccc5091df081a8b6fdf2aa0e050 SHA512 06bb38462c1cb7d4da8159eba6fa1ff05de8849bc4374a7df799d41a1f023eb38c75636956616cdc0e45a800f870bd0694575d9773b6dff91aaf2dfdbfe45169
-DIST cfn-lint-0.58.2.tar.gz 8780583 BLAKE2B 8675ab1658b2ad75fc2be550eaf8bee8e6fd93389168cf2c127fed4e77a68aa849a5f3b2dbd6296d449fce538d69926dd108684c78dcd959483c56b9a44c35b7 SHA512 fe7adbb7b78ca8a978be447e29debb45d8bd26e822dff6872c4b8c6e6f5363b7d734e7105d89326af60bbeba6411f0e60bf798fd638ef8652ce109285e5f864d
 DIST cfn-lint-0.58.3.tar.gz 8779688 BLAKE2B 0964d477f61ec3dc4f80d59e3b05bc92cba27c0c9293a343bf15ee25df967643adf4d8aaa0c11d336a857957bc19dd1cc711b7fe9014c9c43ffd0171b197c4f5 SHA512 9f88f533a6533cf23ce9be83f61cc7418df7775e331ea932f469b391e136a370e5adef9a41a5378dc99d4aec352ababebc1eb59b15d19c0c0c6f19e12410ae06
-EBUILD cfn-lint-0.58.0.ebuild 1671 BLAKE2B 2c7580e91bc1d2c6e99a1c2008ccd4573baaef554e59fb71ba6bd3e6b20d388891c2c4c8d2758c81f1cdd9a219ab20e2affafe0be1ad3ccdaaff8adfeb532bf6 SHA512 2ae053d4aca81341e294ca02410388fa1ce7a17332c7165de6a199128b29f0d8ceb854540ea212b8077bf11e0197caac66012abee1486f55a2f3e26b319251c1
-EBUILD cfn-lint-0.58.1.ebuild 1673 BLAKE2B cd77ae26be0a83f45965bb4c121056302b931cc00e44cdaa8d73b8d8caf0826fa49056811fe0cb9226d63226e66a26d79a34593b46a4aab5b1b9a3b279acb768 SHA512 a8ce6867e2d305dec2703e69e3a5ec4051574419ee242c3e3986c71eb424d2eb9d7406238052678ae3fccf728b33c7a487ed7d93d059b60409aa03b69ebf5dc2
-EBUILD cfn-lint-0.58.2.ebuild 1673 BLAKE2B cd77ae26be0a83f45965bb4c121056302b931cc00e44cdaa8d73b8d8caf0826fa49056811fe0cb9226d63226e66a26d79a34593b46a4aab5b1b9a3b279acb768 SHA512 a8ce6867e2d305dec2703e69e3a5ec4051574419ee242c3e3986c71eb424d2eb9d7406238052678ae3fccf728b33c7a487ed7d93d059b60409aa03b69ebf5dc2
-EBUILD cfn-lint-0.58.3.ebuild 1673 BLAKE2B cd77ae26be0a83f45965bb4c121056302b931cc00e44cdaa8d73b8d8caf0826fa49056811fe0cb9226d63226e66a26d79a34593b46a4aab5b1b9a3b279acb768 SHA512 a8ce6867e2d305dec2703e69e3a5ec4051574419ee242c3e3986c71eb424d2eb9d7406238052678ae3fccf728b33c7a487ed7d93d059b60409aa03b69ebf5dc2
+DIST cfn-lint-0.58.4.tar.gz 8838063 BLAKE2B 77caf931c79b90d44c09c7ad63ff928c5217fa3cb9474ce8d3a3151a4a804365293e4304484ae1a2c55acfb2718dddce9f0b26165d35a570c3a7baab3cf76290 SHA512 53c24e265eaa8064bc23740376668c4a640571e0e273fc475f70de468be51683f3eacbbce82dddb9e05a23049299b49e660f28d5ef93150a60260fa0f4b77a19
+EBUILD cfn-lint-0.58.3.ebuild 1671 BLAKE2B 2c7580e91bc1d2c6e99a1c2008ccd4573baaef554e59fb71ba6bd3e6b20d388891c2c4c8d2758c81f1cdd9a219ab20e2affafe0be1ad3ccdaaff8adfeb532bf6 SHA512 2ae053d4aca81341e294ca02410388fa1ce7a17332c7165de6a199128b29f0d8ceb854540ea212b8077bf11e0197caac66012abee1486f55a2f3e26b319251c1
+EBUILD cfn-lint-0.58.4.ebuild 1673 BLAKE2B cd77ae26be0a83f45965bb4c121056302b931cc00e44cdaa8d73b8d8caf0826fa49056811fe0cb9226d63226e66a26d79a34593b46a4aab5b1b9a3b279acb768 SHA512 a8ce6867e2d305dec2703e69e3a5ec4051574419ee242c3e3986c71eb424d2eb9d7406238052678ae3fccf728b33c7a487ed7d93d059b60409aa03b69ebf5dc2
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.0.ebuild
deleted file mode 100644
index de09469670c8..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.58.0.ebuild
+++ /dev/null
@@ -1,51 +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="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.2.ebuild
deleted file mode 100644
index b8ea9d7827e1..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.58.2.ebuild
+++ /dev/null
@@ -1,51 +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="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
index b8ea9d7827e1..de09469670c8 100644
--- a/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.58.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.58.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild
index b8ea9d7827e1..b8ea9d7827e1 100644
--- a/dev-python/cfn-lint/cfn-lint-0.58.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.58.4.ebuild
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c1eb946aad32..c99a84544d3d 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,12 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
+DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
-EBUILD clang-python-14.0.0_rc4.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
+EBUILD clang-python-14.0.0.ebuild 927 BLAKE2B 2c35566372b28bb772b497e0b11728e6fa1dab90f31ea9a9d3b954c54d028cef8240c336570a9b3c5249d4c995160f1e618fce4c217557d4bdbd13aae3789f8b SHA512 09bce3ba304c6b7759823625b1e54f49d509bb2fbe523925cf3d2dfedd7f54dd87dd5ce1c4d6c7ce5b334c5be16c6723aff258c1d5813a817bd9fd4c6fe5f25a
 EBUILD clang-python-15.0.0.9999.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-14.0.0_rc4.ebuild b/dev-python/clang-python/clang-python-14.0.0.ebuild
index fb6456619641..3384ae306920 100644
--- a/dev-python/clang-python/clang-python-14.0.0_rc4.ebuild
+++ b/dev-python/clang-python/clang-python-14.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 57f800d95653..4e1422fe6b17 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,3 @@
-DIST croniter-1.2.0.tar.gz 39813 BLAKE2B eed3db9d96571de188f5bda3c3000ce4607e72fd97d2f70b34355495349744129c29ace03320d987f43d1692720dbfbb965e824091825b2e11222306a10d081c SHA512 0d7d59d617be16f7f1b6401a3c1260c3b644855c046fa6c2948cf2f2caaf7ee0183c659e0165c8d36068467893bb68bdd4024a246a85c76448ab0a62233c9ca1
 DIST croniter-1.3.4.tar.gz 39351 BLAKE2B 38701e865b67a382e8c6f511ebf801c83e27aec31cc0f0636b9f8a7b13405a27531b3314523ac819d5193c3907f8aecfc6132901856a1565e6c986ea73dceed0 SHA512 aa55f8849abfa0c8ff24514051362e21fab821d2ffcde182d9e0f267b3b5e1706278710eae80df3ced82a1444323af44eff25cfc34ab92bd15fbb31d7d791037
-EBUILD croniter-1.2.0.ebuild 617 BLAKE2B db6f2fbbf39283fa6a2627b34c7627a2add30a4067aff112398902a59f316135d06c2516f02027e8319cf5df7cd390f260cc39baa48a18c53b061e76c9b4e8b4 SHA512 b92fc3493d31a69ef73e63b8f54c2581b2046662041e8e7493c9c27729a80457292612f0cc9b1b6ecdda0603ad5116b6d0a869da1dc9ff48adc881585a8c7746
-EBUILD croniter-1.3.4.ebuild 652 BLAKE2B 897a905f8755240d9ed2eb8f3adf278857dceed76ff54ed3999dc5cc7583d7e27340b890bd4b4a0a756a49c3bc30fd336b445ef8dec13319c94c72e0cfec0bb1 SHA512 0f6018970d1055a921a43f481685d59a89907560df0289fe5255a960c3068d991a6e89a2ebec358bf1c4803e0e4e476f315a4fdb3cbe9f3ccaf0258b0f8480f4
+EBUILD croniter-1.3.4.ebuild 650 BLAKE2B 89cb525f6f3aa36302839450af0e53a556fb709904955ede69a2b640592f69d802ad43486d4c370c2b2be659fddb326a47e7ef1e7edf4380b4b4f43cf4c10a5f SHA512 c3260199ff52801817a92e16052dcf2330e26c9e1027cb61a141637716da99f01cc7645e245e1bd8222f5ebb2e9e549592b9a5031bcc0cbe655fe843b3cb9429
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.2.0.ebuild b/dev-python/croniter/croniter-1.2.0.ebuild
deleted file mode 100644
index d05c8ee8a921..000000000000
--- a/dev-python/croniter/croniter-1.2.0.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-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.4.ebuild b/dev-python/croniter/croniter-1.3.4.ebuild
index 56914f77185a..0f8e9044d11b 100644
--- a/dev-python/croniter/croniter-1.3.4.ebuild
+++ b/dev-python/croniter/croniter-1.3.4.ebuild
@@ -14,7 +14,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/cython/Manifest b/dev-python/cython/Manifest
index 30af7ecdda2c..1a38f810967e 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,12 +1,6 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e082326bccbad328724a4ff5645f0b2aa28f21419044b17bed8495618bb980b23a99310c2b6ef275331e1b9aa6d734017eb33646c92a07a73 SHA512 3f5c6b4108b87cf3014416386095c07ac91762152bbd87e8bd589177d40b933c11e19610bea06720c5c70f76b5b9b70d27e5c3cfa20eed30deaaf7d122910bd3
 AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce
-DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
-DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e
-DIST cython-0.29.27.gh.tar.gz 2101169 BLAKE2B ebc56ced8fdf61b3be9f9abe44f71ce6b243e002ac4992dbf3a0f58331c00a0d18498190b50cba921351a38c27cf410bbc3e6b146ca3e73b829f0292fa87eebf SHA512 ca9ef31a662b6971c437a3e8c931d8e000fc6a55b3afbb317588944f365d903676b2a394ecfdb2da0190bdad84d1daf699662b95a68f4008e78e31bab4085b66
 DIST cython-0.29.28.gh.tar.gz 2101301 BLAKE2B 980c04545e935deb4b4b1653f167dcbc94b8e2b24bc8897b5cc996dfca977645f7475c32aa973251ffcbbb31e725e27693af61ceaf66f2332c9525b02653dc76 SHA512 52490d0b5355e13cbe586830f763173d7556cf3d79d79192ca75138b1190e7a4c1f3feeb0568349802ef3b97300c3805f54eef5ffd73a5180d68f023ac2a44cd
-EBUILD cython-0.29.25.ebuild 1824 BLAKE2B 2c84e4bf9cfc26bed3d8f88ceab4f760565688ce44a8d2082e3058a6dadc4f71ad89c6e85d192739b6d176e382d08d0ad1f532bd1d8f0285de5bd8bbce970ec2 SHA512 c80bd93c6c289b3c6a150dca28f4b891f9489bdb70643a0e26443e77e3b1510cc97a899655a173409147283c49db31f9315873a6be1658a11696c7d2f6eb9966
-EBUILD cython-0.29.26.ebuild 1824 BLAKE2B 2c84e4bf9cfc26bed3d8f88ceab4f760565688ce44a8d2082e3058a6dadc4f71ad89c6e85d192739b6d176e382d08d0ad1f532bd1d8f0285de5bd8bbce970ec2 SHA512 c80bd93c6c289b3c6a150dca28f4b891f9489bdb70643a0e26443e77e3b1510cc97a899655a173409147283c49db31f9315873a6be1658a11696c7d2f6eb9966
-EBUILD cython-0.29.27.ebuild 1864 BLAKE2B 5025072d08a5986432d2f5b834088595a35dd2e28fa884d5ff138904570a96845bcd36778e224a9f1482ad7b915486f980ecddf7184ec76ee3c1fb61a6573f79 SHA512 ffed50677374d375c9459e2b4181bc0c2ddbc6399fcab56e333d0f4b83f352e0daeb27c383e7325fdefe04a707f3837d58edbe3c90989409a65d142e9e1a4e3a
-EBUILD cython-0.29.28.ebuild 1857 BLAKE2B 376547fe4181358ae5fc430b114b20b30d9d78e831aa3453f65b15b4a638e95928276bb837ecad1c3633668cc1ef74aa91f4429de2815fdc9223ddb15ea4057d SHA512 990fc4235914475a30e7cf93d984eca791f4af1a847dcc40f5ea5d05fdcb26291e7e23052ad5ad774f2768e340992097d080d0e7875b66d95ffcfae24d14a2f6
+EBUILD cython-0.29.28.ebuild 1856 BLAKE2B c297df5267b99a727a77299a28f388fd9f0efe35de6dfe90ffa4522eea1350551085826bc1ade8caef3f068446e526f56dc0831f41425134e54d4cc47eeb4403 SHA512 12cf22eeaf8ea66697893158103afb60df49426045975f541d66aa1532d83c06ca2501917816a1c6d7680f52b7cfe01ef493aa336e7c089f3b00576cbb051f03
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.25.ebuild b/dev-python/cython/cython-0.29.25.ebuild
deleted file mode 100644
index 13ce9563c542..000000000000
--- a/dev-python/cython/cython-0.29.25.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.26.ebuild b/dev-python/cython/cython-0.29.26.ebuild
deleted file mode 100644
index 13ce9563c542..000000000000
--- a/dev-python/cython/cython-0.29.26.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.27.ebuild b/dev-python/cython/cython-0.29.27.ebuild
deleted file mode 100644
index 727f6f9e3499..000000000000
--- a/dev-python/cython/cython-0.29.27.ebuild
+++ /dev/null
@@ -1,76 +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_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.28.ebuild b/dev-python/cython/cython-0.29.28.ebuild
index 145dfa214fab..1867715c710a 100644
--- a/dev-python/cython/cython-0.29.28.ebuild
+++ b/dev-python/cython/cython-0.29.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index ead96e774ed7..d021741234d3 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,15 +1,7 @@
 AUX dask-2021.10.0-warning.patch 1606 BLAKE2B 69d75601493a8702ad61e1e9411c1219a83a2251349e4112346215fa7d8f78e10ed1f4bd1f6f5ed1db14627e1b7ba24c8ebf180b9210589c27bdecdf3d94d207 SHA512 f0479c156cfc40c6501bbc4c1832abb2d36a322edce2b5827c05e7d6cea075e12c57c5f0460eeebe250ca049ad6df74eba7509a4517d654775c915391a6b6af4
-DIST dask-2021.11.0.tar.gz 3971871 BLAKE2B be2c28782e3e870b62e70041bd7572783ff9eef61c27d2fa092f00b74ae23877163e3c00f59f67c5c39b6fefd723cb2c25cdc58b5f5c76c08ef1d686f256cb25 SHA512 cebdef68b2c40348c84627505f4e1f17f998aed603d590be5acc7b78233362330352be395396be00f72215b738e9393ef08eeae8ed0fb933466c1c2d6158e5ea
-DIST dask-2021.12.0.gh.tar.gz 3987797 BLAKE2B f6c1954ff41048861fcedbc56bd658989dece828613344e876e097d03f93338c194d66e62dd9fa1605b5dfd0362374a1dd2e00a383eec4476db16ac04de29266 SHA512 e9ce4613bf1ccfda7ce85bd90ff8f24d59335f02a941c12335214a2636f46ae1e1e8c2b1777ca9b9dd83f190071a2893b02bee129a68e9b7468c30f2a45df68e
-DIST dask-2022.01.0.gh.tar.gz 4903414 BLAKE2B 495531085d126d51c03b1f6dda490cd2d859276821a6d1ab6c2b90fcf6a4cec925b9fcafdf3b3da46344391e77a9bd09cf023f25b0f84bbe6ca8fa36b0bed73f SHA512 3fc25f6ccfca8354e3c6e2425f4d2c8b85807944b02cd1e872931f5b34d82c9afc6f5ffb17b5f835c531ebac4b6759ddaa81897a6f3d2aeee2c09935f221f62d
-DIST dask-2022.01.1.gh.tar.gz 4916694 BLAKE2B b793b8931818e619ef701f5145a27b8c90e237a51b79f370e994a5e7cdace115808c8f657836785059b1cb495b64f85cb5331759de76c79e55f2cd45f1c3494e SHA512 82789735279c71cff5a0123aa95d3311bd5d08f0332edc22468287e573e4b293a13da514a1844879073490b23ead2ff86f4492175c0a4211f727e8537bac5662
 DIST dask-2022.02.0.gh.tar.gz 5028629 BLAKE2B efe6e6143d030024abae6d33c98289a37e3a6003da15ea6c4132a5610bf74763f9d921a1f04bf4a28a6ca60405e89fad3ca0491f67da6661c45853d172551c06 SHA512 397dabd3caabac0657808ff031299a1461c7acf4a123db4d1876d8e72a0ae971266dcb256e29498b1988b1b4bea506db3aec962b876f280ec532b96da35d356c
 DIST dask-2022.02.1.gh.tar.gz 5034850 BLAKE2B ec5ff745c3dbe19bbbdc533be6bc86537b532943cc798932f57051001648fb97cc39890060d064f7db5f3fbe6aa72d784393a3ccdcce67beedf3540a2a925d0b SHA512 6f66b5a904ea7ab0137465f622d1606a218b4ddc8b91939759098c66c7b749c674c750bf0caa6b53c7cf9d192312c0991d8e6144cebf9745eb9dfd4583b8b66c
 DIST dask-2022.03.0.gh.tar.gz 8192610 BLAKE2B 1099dac34487dc51b9010746920e64e4e7e4a07bb1f3b82ebe069afdd2f64feccc7c97291a1a4d1fc089cbc6f0b6f40a81fedc96be11f85920558ad305b63641 SHA512 e32b82d76d6b3d1494c32bcec171e3fc09e38b6cc94729b3f82bf0618445e58e4bd5361efb359e5894af2703bdb4f3f100916d4d7fc905faecc9a5262559754a
-EBUILD dask-2021.11.0.ebuild 1316 BLAKE2B 1da54c68cb9326c52fc931e636e973241b51e38c3f4772af018ceb04557010185c5a02de6b2f879b5cf41a34048182b8b034dba2fcb12350a03d9fb122d3949c SHA512 7a37317e26196ebe7f9bc223f814fd3dfccfb3630a5189f8ec38221bb3aee663323ae95c67cdcdff2789c3ec80f07847b9e7388634762bac486415e3e341f298
-EBUILD dask-2021.12.0.ebuild 1349 BLAKE2B 9c2b37de9afb4ea7ec599f662df9b326a6c79b113ad8ac0b9aec298cc8292d121670bbe74e4441302b7ac9e8e34fc65dc758a30d26b2478c07540a2147cd60ca SHA512 6f5539ae4896436e3a5c8df6a65f9d16aa602532d0e4b099e16616f8e96f87f6f3763c3b4ab427266e70cd2cd6ace6b956d62c7e2a98ea3bc11fec37892a19dd
-EBUILD dask-2022.01.0.ebuild 1440 BLAKE2B 3257ef84ebe6349f0cbc8fce008c3218acfa34585a5bc46eb57a935cd07fd1620fe3c0e3f3a712210c8ca91eeb97ab690b55ffcfa9044a68e7bfe404b6f4d118 SHA512 9d5f5acc5544bd7f8829de1fab8178294bbc098b80172910ca488f8a77e5ed050b105fcb805a32cb6c3f241923f7d000903c6b6d515c5db386dc1ff3d82c58ac
-EBUILD dask-2022.01.1.ebuild 1517 BLAKE2B 0a835aade88fa19e4e5bd9ab7c99d514e830376ca1b99b38f15d3a971d6837129092cb27b716ffe453d1d6a80aa7dd25eb92c6771d8308f4f5a1fb6db7cf29ef SHA512 4140165c6ce99c99919fb8d9c254e74f0f32572f9152a20be4ed981da04a422836b5a360b6e02e56c1764298a854094b10c0f828743ce28386be870880419f47
 EBUILD dask-2022.02.0.ebuild 1516 BLAKE2B e668253fbcc714894f28ea59a96bd846a8ac11a69a56e8369fef0f63738bbd8c438d44068ab8f9378a570cd803c52c76a11a341fe3ac00af353dbe578cd07509 SHA512 afff6b8b98973df3979711586f7ef947272dcbff91fd10760e47eb26282bd527f01915af007f520df6ed149318b2903951835fb4b3ac4d43ece81997fc6f2855
 EBUILD dask-2022.02.1.ebuild 1517 BLAKE2B 0a835aade88fa19e4e5bd9ab7c99d514e830376ca1b99b38f15d3a971d6837129092cb27b716ffe453d1d6a80aa7dd25eb92c6771d8308f4f5a1fb6db7cf29ef SHA512 4140165c6ce99c99919fb8d9c254e74f0f32572f9152a20be4ed981da04a422836b5a360b6e02e56c1764298a854094b10c0f828743ce28386be870880419f47
 EBUILD dask-2022.03.0.ebuild 1460 BLAKE2B 63c47e7789d686647aadd4022b6ab98f216257fb0a019c97767042597051b095eb9dbcd098a3e1154aecef378493f2974c29497f06509e0e6797c8d2fd5ff6be SHA512 35b187333c5d4e3ce8835132673817a3fabb06afb870a936bb6123401f8e558c429565d3297c6ba4f3663424e75a74909818ca8d4d99006d56066676bcdcf3d9
diff --git a/dev-python/dask/dask-2021.11.0.ebuild b/dev-python/dask/dask-2021.11.0.ebuild
deleted file mode 100644
index 2115f9c0da54..000000000000
--- a/dev-python/dask/dask-2021.11.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 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[${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
-
-PATCHES=(
-	"${FILESDIR}"/dask-2021.10.0-warning.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# files missing from pypi tarball
-		dask/tests/test_docs.py::test_development_guidelines_matches_ci
-	)
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.12.0.ebuild b/dev-python/dask/dask-2021.12.0.ebuild
deleted file mode 100644
index 2961424b5c75..000000000000
--- a/dev-python/dask/dask-2021.12.0.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~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[${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
-
-PATCHES=(
-	"${FILESDIR}"/dask-2021.10.0-warning.patch
-)
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.01.0.ebuild b/dev-python/dask/dask-2022.01.0.ebuild
deleted file mode 100644
index 3db623043183..000000000000
--- a/dev-python/dask/dask-2022.01.0.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="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-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
-
-PATCHES=(
-	"${FILESDIR}"/dask-2021.10.0-warning.patch
-)
-
-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
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.01.1.ebuild b/dev-python/dask/dask-2022.01.1.ebuild
deleted file mode 100644
index 77fb824ab55c..000000000000
--- a/dev-python/dask/dask-2022.01.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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-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
-
-PATCHES=(
-	"${FILESDIR}"/dask-2021.10.0-warning.patch
-)
-
-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
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 0ec4e5304616..41bb912c7dec 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,6 +1,8 @@
 DIST discogs-client-2.3.12.tar.gz 32604 BLAKE2B 6c7960263d0158fc796edd76f6ccc549d582cbd96666cbf3ae10a3215eee6464c857e1b46c8e76ad2a48308ae9353c347a421189b3c754bd23a0f2ec455d9cfa SHA512 c14ea953e92f2d77909a7af8f840ee5a1df2416e16f6de0b7f0e988f6ef56a07fc04c75b247508dc0d1b5f7033faf6cce80196b610d1169a23350d3e816e2925
 DIST python3-discogs-client-2.3.13.tar.gz 34228 BLAKE2B 621e181bc07c48ca387638fd49bf1b92fc06e1f3b57428a13bdf93c634ceadb8c128dc9c48bebed4d2ef774d301ab70d43935efa903365a1df5ccb6991b689b3 SHA512 7fd3f98c1374173c54d3f4731fcb093548b85ca7c0d5d3396e40733e64306eb29e14b5de0d30269ad92cb0a0b8bbbfeb8b739454e251638472b8c7ffaff4d27e
+DIST python3-discogs-client-2.3.14.tar.gz 34461 BLAKE2B 7212e220e1ea68bf71e8ddf54ee5d820e7cb7203e1d34b34abf818227e1f842b6ea680101e7a761ae448d0dbc298e8c33ae9969c7c3d1c93ca912d92274d52c0 SHA512 356faf54025691a3af74d947589132d5c159176146669572d14490ece05a0e4546bf0a05bfee4669518c157957cc52eb7842008e7da5555347365236ae19b63d
 EBUILD discogs-client-2.3.12-r1.ebuild 831 BLAKE2B a2b7f9fa3faeafbfb0fe3c49f3835de84c2a62d3284a898231a041aa817f4bd500fae58addddc1030ce966613efaa64523777da9950e4af7f6667c552ccde607 SHA512 9b084c7869772ec6f24767fc1a4bf75f1f0f4ca8b5b0a90a167b52dfc529c29f00bfc8404c04a0e5e3af582d24fcf780f4249ddf0bdcb1909a35290934959c60
 EBUILD discogs-client-2.3.13.ebuild 804 BLAKE2B f5811b7fdf77bfb8413b91b961e7f2353209483482da500ceab2f58cc98d5a10d5d07d290ac78629cded94ebcbea4c4a9b3d8a90b81c108d210f8a6a2537d1af SHA512 d5951e8fcee30ea6d9d670e814d4fb866821a9fbcba9a3c5ba9e9964a9baf4f19ace5f5a21847df207abcf6c322852d24592bec0d05e7242446a560a38830989
+EBUILD discogs-client-2.3.14.ebuild 809 BLAKE2B 040db8a96b63c77736779a72a168a695f85602041914981fd9d354b9e195f701fc5da79733285724934b299bd75ca7b7d97ad0e14fd7f3375bec0dba0d2668a5 SHA512 3d44b6c6b4ee434648afe642745008c302c668412bc11b16684e76b5360a1a26fe2961037df3cb81fd82becf8d2ab4493df6b6f39d6a82eb48caf885781df839
 EBUILD discogs-client-9999.ebuild 804 BLAKE2B f5811b7fdf77bfb8413b91b961e7f2353209483482da500ceab2f58cc98d5a10d5d07d290ac78629cded94ebcbea4c4a9b3d8a90b81c108d210f8a6a2537d1af SHA512 d5951e8fcee30ea6d9d670e814d4fb866821a9fbcba9a3c5ba9e9964a9baf4f19ace5f5a21847df207abcf6c322852d24592bec0d05e7242446a560a38830989
 MISC metadata.xml 674 BLAKE2B 5c0dd431ad4633cbc7ddaa97e54e9f5b3eb67ed28e07ac313f218fd055e0042365c270e83153627decd196aca49db12304da87f2c74f20bc454fd8e5b4b8fb46 SHA512 ad582419be3887c5fa3c0d630ad32575f378453dd4f7a8c33df91db31b495caa88707214f7e456d69027532540a474c41ad8336b40e90229f1f31cd3193d7f82
diff --git a/dev-python/discogs-client/discogs-client-2.3.14.ebuild b/dev-python/discogs-client/discogs-client-2.3.14.ebuild
new file mode 100644
index 000000000000..741fec157b5d
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.3.14.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/p/python3-${PN}/python3-${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/python3-${P}"
+fi
+
+DESCRIPTION="Continuation of the official Python API client for Discogs"
+HOMEPAGE="
+	https://github.com/joalla/discogs_client/
+	https://pypi.org/project/python3-discogs-client/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 412dc0e0ce8e..efe1982c15f1 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,5 +1,3 @@
-DIST doit-0.34.1.tar.gz 1447636 BLAKE2B 5b798ee2f291aa869bf03c492d0f6f9025e78ef5df95fadeafffdb953c159778dab30f75b0f9be24386748d362f6f380e34735891ed45f3511e819986b5788ca SHA512 ab5f9a56ee96d8b49f23f7d411eb4ee012639618b9604d65f61a2ce1ea1d1b42884277c08fe5ecd4b5097725d20b004457149e51f50a506d3daa9cade7ab858b
 DIST doit-0.34.2.tar.gz 1449767 BLAKE2B c7d81144da99147dbc6bf7d670b6f411879a8080e405866866bc97ae4701d9a47a3d4882db9672e2e36bc8af577ba9632da1fb4ed2c9f87717f719ac1cd53d34 SHA512 24afc8078fef42a446733554c6ab63298ee5bb734381fc2bfc9d623dc98394916a1f89a18bb28e7ef862da8c0449b5cf16d605295e8948a0ea6968a231a1c8e2
-EBUILD doit-0.34.1.ebuild 1250 BLAKE2B eb19e59b361b15fc2ca372d4b7c4bfe995bf8fcd4ebed296e3584a22120731310406498fc6e85a5fceada3fc0f890bb5dcf3848ac92df983d918b5ba9f807a33 SHA512 6f40c993f5cd18946a58973e5010a814d2297b351670e8b0805a9ff447fd353c0e2aa16f4a15274daeb594f6627f50e0785e0e351598138f1ff69cd108f09449
-EBUILD doit-0.34.2.ebuild 1335 BLAKE2B 32ddbc826834f21cd931adedd19ac87fd9f720cd17e228e5df5ab649c747c2d8103a980929f19930e4cc2344b6f6890a9211a4315ac6508eaba26a5dd596a9f1 SHA512 4e4b46a7667d37aef9eadafe21486d4720995fadc672e49c5e555e001b2ff1a45f3bc9c5dca7ae83be14e0f686c962166230a65b008fb629fef7aee6c6b9e868
+EBUILD doit-0.34.2.ebuild 1333 BLAKE2B 55c6cee8af39bd50d770b0c1d6593453cad0b1bce5e4c73b9a7f39909b986d0fc60c35022d72a1de4d661a4fd31f7d6a798539db397bb73dcc76fc24cc33835b SHA512 8b999ddd2c5d9a6744c3d97d1679e7e4a44658d7408deda726e0d94389afb4cc9b10a1aa6f918d8ab5126facdfe32dba0e7ba58238b139ac6d98f53da89fea58
 MISC metadata.xml 568 BLAKE2B add52a6e7986bb88b9dc87d2f03c4ec3716ae7d5e2402556b7a3137b8267ca2cad0ae3324d628f3127afde36513414029c0f567a9683dd9b11b1a287ff5e3a7d SHA512 e772c9ccd8133fd73dcf04733facf60ef7c2f1559b83e5024faeea4d5fd7799c42a28be6c9b8676ea9b6d68969ca5be633320e8cb7dd8d1f0dca35e819eaebc7
diff --git a/dev-python/doit/doit-0.34.1.ebuild b/dev-python/doit/doit-0.34.1.ebuild
deleted file mode 100644
index b9328ca90002..000000000000
--- a/dev-python/doit/doit-0.34.1.ebuild
+++ /dev/null
@@ -1,46 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="https://pydoit.org/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	)"
-PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-src_prepare() {
-	default
-	# Replace custom theme with builtin for documentation
-	sed -i -e "s:'press':'sphinx_rtd_theme':" doc/conf.py || die
-	# Disable test failing due to impact on PATH run in a sandbox
-	sed -i -e "s:test_target:_&:" tests/test_cmd_strace.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp bash_completion_doit ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins zsh_completion_doit _${PN}
-}
diff --git a/dev-python/doit/doit-0.34.2.ebuild b/dev-python/doit/doit-0.34.2.ebuild
index b499b853c2da..3148083ded7e 100644
--- a/dev-python/doit/doit-0.34.2.ebuild
+++ b/dev-python/doit/doit-0.34.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 8f419a876956..c4e084877adc 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,7 @@
 DIST dulwich-0.20.32.tar.gz 418100 BLAKE2B 21d41a7b1e491848a11ab3e3b1b63bfbe1798b38ef331136b07609f004e780672477e91a637dd3b1ccd3b26e359461e1a16d759ac2cb98d1091fbdb1968c00a9 SHA512 9af4cb4462ab9a69bea9074aace81eeb8d33087f2c53e64145991913ad132e076b62f7958551729c758cd6eeae029a278723872771ef36b046331c85ebf2fcf4
 DIST dulwich-0.20.33.tar.gz 419863 BLAKE2B 57b7a05f7a23745ba63e2faba9cd3772637a61cf9f2077eaf7ec799f5e3d25de7245aabbebf22cb58f5cb45318b653335251fc46b136b108770aaa6c2b09e099 SHA512 f2d0f8875dc4cd4ac4629f2884a5e68938d14218ef96a19ce322559a16eb64cdee92ed0bc07790e9d527a20fdcd29f6fe1f95479d0055cdab88f509bc318368c
+DIST dulwich-0.20.35.tar.gz 420972 BLAKE2B 97c877554199aa8f3abf2f95a43c350cbef784f6f71af6280c537a93297c89981190fe1f66914532641a99cc3dca82a33b43d09f864f2ddf370c0097fa28a5e0 SHA512 23c272153547e0ef25a0e7d2deb64987e5d503545775e7d6f438ae09366c0037686eba1027d38a9dbf042bd1553eeb25ccdc818bdd785a2edf2cd3688f0b1271
 EBUILD dulwich-0.20.32.ebuild 1618 BLAKE2B 7f39288d500bdfe1e2b7820d1482b3d336f9612dcc861e2d20a33ef7a0ed68a8790d6de3e7c6e19f6c4439fe2ee97d682d3b73c8e95d85f49b819df1cd80f8e6 SHA512 102f5b2a6d10f3c4e3b65b38678998138c17e491adbc5695353978229d0b5d776fe2d7409519861d176eb053e0d5c6f89ec86bb0e83904bb5151a17af2415497
 EBUILD dulwich-0.20.33.ebuild 1622 BLAKE2B 5e4f668dd9ac9e4cc4ed0d2e2a96f55724e3838cfba36aa4729af95d6e8c9e40603accfab50df5b105b269756fdb15c46dee53a0d99d352c26b43a3deae5ca9f SHA512 f487b2e6e0ad1245b7cb85fa93d3274284ed9ce179c59eec89b60d72180b2c8129e0e11e80db342c08ff1e772116d2d64966d80bd64f97024a536ce995b63a35
-MISC metadata.xml 558 BLAKE2B 72c574d6eb1a3d94686fe9aeeb53fa8d96532f4477ee94bfcd6c0dd3e0d6fc9e313dba9642b68a57ba0b38830fbe1f8d953c3ae79bcafcb6bbf6eba0e35f61a1 SHA512 de70aed32ec0b362668a6fd33d8be5251d57048bd6396e09608f040fe71fe8e3262f1c96fbc8058ea776e09a59ac465652f4f7d778fb4e3933c7fea4bf64d7f4
+EBUILD dulwich-0.20.35.ebuild 1623 BLAKE2B d5896e0f00d7bb4e723abd1c6f2cd5aa5d997e62a406dd36990998fcd24d343a4597d672bac1e8112e86d95313b2dabb25be9dfdf2440f0ff0953594819a998e SHA512 8810c5488adf22a1bcf421f13890e1477884f1c23de3c900472cddf1d78b8763e6e75b0abf0321d0c5b13431b4261e9f9c87a54dacecdf29f6c92a55a1c8606f
+MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.35.ebuild b/dev-python/dulwich/dulwich-0.20.35.ebuild
new file mode 100644
index 000000000000..456dab9bb052
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.35.ebuild
@@ -0,0 +1,58 @@
+# 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="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/jelmer/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/metadata.xml b/dev-python/dulwich/metadata.xml
index f558564f98b0..aaeecf0d1119 100644
--- a/dev-python/dulwich/metadata.xml
+++ b/dev-python/dulwich/metadata.xml
@@ -11,7 +11,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">dulwich</remote-id>
-    <remote-id type="github">dulwich/dulwich</remote-id>
-    <bugs-to>https://github.com/dulwich/dulwich/issues</bugs-to>
+    <remote-id type="github">jelmer/dulwich</remote-id>
+    <bugs-to>https://github.com/jelmer/dulwich/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 680c75f1f2db..b9f5086113ef 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,5 @@
 DIST executing-0.8.2.gh.tar.gz 494836 BLAKE2B d6ade5658c8df656e80bb596f6c19493475d74ea10ddfc60b25eadb4a2f68d8afd2f437a6f82807932bba0469617fdac7a4dd90569623d1c8d7f96220e02ec9a SHA512 9a7fe4d3bae77d49725f35bae9d239bfb2a6e89d893d871d76f26fe4beffe0a07c6cbf50ea7b35b9ced66148d015c48106bc5774b26f201f9b40577f3380f5b3
 DIST executing-0.8.3.gh.tar.gz 495111 BLAKE2B ccb1a7df974f94b48960fc84a8365f6e57a7f34590972192e692f03340662e2bde97498c2ebf5617e45d8dfb6e866fd7de290644adb58e5338b2e0fdccc215f1 SHA512 4e01c1f48734c9568412b84160150e7e50ebdf5ba3dd466cf9d37b7f875ca2993915db75e2f6dd8e75e60b7b952fb0146928a41dde100ad38384b9be2ed60522
 EBUILD executing-0.8.2.ebuild 911 BLAKE2B e1d01c76c0f7d8a1564fe5dbdbe55fc3a110b78807eb601706105570366b4dbac93564123e7df85f9388968242f88e4c8085c714033b852ad410f1392f568ad1 SHA512 21cf05d8d88093abe0b016ab91528980fbb9f8578d81452d7ec716a21dcb37d58050f117118943f5f776531333b31a2f81d4918795d8b5d0719051e04bff8969
-EBUILD executing-0.8.3.ebuild 991 BLAKE2B 0379511c87ee07324556d5e4b697c4dc528c268decf12dfe37937603072afff4a4a2ac5bdd759e63e9d4d3057ef81034dc07926ac954e205e4f4b7e18912fb61 SHA512 464a60e0664fd6acb15ded35abff1050284a7282a2837c87dc931ab8989bbdf679ff0437e2e27aeb1daf661678ce4e1f732f6d94ab64b0deba629e1ac43335bf
+EBUILD executing-0.8.3.ebuild 990 BLAKE2B d302a35115d31517898800500fbc673ad92b3ced2bc936fea75d4a5972c5c2cf3867a029a17cac8b6d63bd0ebac517517993911575a9e0075f0c312681597cb8 SHA512 9e02160259ee2aeea95e7c57a1435b0bb5546a0b96b0fb15bae14610de25b530496aea0db3b895a91ee85eb14a2b3441a84d01156b54df51e3c56ebc6fbee5ae
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-0.8.3.ebuild b/dev-python/executing/executing-0.8.3.ebuild
index 9ac690c815ad..ad1dedd314c4 100644
--- a/dev-python/executing/executing-0.8.3.ebuild
+++ b/dev-python/executing/executing-0.8.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index ee85153d5e52..1305a30fea91 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -2,7 +2,7 @@ AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e088885
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
 DIST flask-security-4.1.2.gh.tar.gz 408120 BLAKE2B a4ec9b0a58368b9c84ee2d5b8b7404adf4a985067fca79e574726efc7cd78f9b713360c7d9d53a29ef6dd2ec7d23b64e50893fd75259a00c2b549a4b2a821936 SHA512 8fd3a0561ccc8dd815483fc8d2863a13fa83dea4cf308972778f99c29f0f7496f95cfac483f1a4cf2f77cd2a728eb09a5f8e8b4147d2749aa0b75f98b752ba36
 DIST flask-security-4.1.3.gh.tar.gz 408609 BLAKE2B ef4b270d62de75fdcf51d1247960df85deca1699fdbfb73592a5711f9bb56f71a2f2de12a8d8c0eccdaccfef11a578cf9bd9abbf52bdacfe4bfc10f9adda0acc SHA512 92a0e7fce95eb4eb04baa9a11ee88ab3b8e88952aa6300bf8245cecfcc90657c83bbe93e1c3b19d62642a346b30f5912dd424e59a81023637f3183a61e8cf91c
-EBUILD flask-security-3.4.5.ebuild 2270 BLAKE2B b5e24c6713976774778e8c268b9967614676acdf1d906520889c9245ccd9d2a2960c02130c0135e4a891d3ae5859f20cc076be1fc6df5920df9925d39e5e9a59 SHA512 a07e3396fd9a886dd55b246da398939048e150e28bad6fb0399d2c877ecef399a4a470e603ff084fccd1707cde5c965f1420aa4107064603ad7d8c30f29a5c3e
-EBUILD flask-security-4.1.2.ebuild 2096 BLAKE2B e544815ba2fe6ba7230a4832afd3fababa2aedce2bf0c861746b5e9f06a14d918b22cab151cf1ab099298a230e67896f6010585829cabe6278398247b3296794 SHA512 f981121429cd17dc601e7ee9de29fb1454348ee7a096dd554424f4340e2ac3fbfbeb1e785ec52df7fb467ad467a5c6ca92e0b09cac82e0c3df1e1660c0f219d8
-EBUILD flask-security-4.1.3.ebuild 2177 BLAKE2B ba4963b0f851f02927fd930125f29bd416d50cc274b016d51997ef4dc3e8ad3a1ca0cd0b8c847f47c59c0400cd68f5d1c77e62b67d1697f7768569637c98f00b SHA512 5a89d8388ea331e0341f301e78faaecd7d24afb9cb464a0e84c3d657d794ee6b519da5f0185782e70b0e2ac1e2b59fde702f1dd7948c2da24bd31d312a7c646c
+EBUILD flask-security-3.4.5.ebuild 2043 BLAKE2B 46b5e6f41ab2c371fb7db7a84d63f2bfd6a3f1052b076865ab40f64211b1715c54f0d084b0483a9fa6bc0c38919b9133eb8b5a5a7ee0959c2e7a4d896fadeb18 SHA512 6468ff9f277c24fcd9fd4dc76d8c70850e1c50b20e233b6509ee86060f39b08fe4cbc139f027770870f93fba42845eb71756f5564dc5c9e17003df88732e59ac
+EBUILD flask-security-4.1.2.ebuild 1908 BLAKE2B c9ce504b2e42accb7156bc2eb8105606ae9025a5e81af6ca43beb4beee1a94a20954ea46719af07a011b85d093e685e1814d524ceca56968feb72fa57a7a29b4 SHA512 05939bdc2ca94ddfd085ce4e68910d8ab391b80f4975d76d2efe1b6c9826f4bc16aa0e27c5ae0b6b947057d05e150fd40e776365a5641ff2de1d8ff030dc84b0
+EBUILD flask-security-4.1.3.ebuild 1989 BLAKE2B 3ac844bccff260ec113148b7bf4acde8f829d55bc821f11c1d101a1ff684d39270f4278380a6c3e04ae6e52cab8bd49a8448a3e1e67b932865ce9ea0d6398358 SHA512 2c61a264dde08d5e686317c3649d7aa9ab31d64c5fe63f94de2fc0ee1caef8debbbf0a612aad91e81dcd6bf269dc02a4ae3d89b31dc49fb25bbd201f96335d97
 MISC metadata.xml 417 BLAKE2B d2c9497a88d513e360256445b7d144ab969c40cb11726477e2d9a3b850a7bcda909ba0a5d844a6079ddd597056b4628a6eb309bca8756e15864d151a54f1d1c0 SHA512 3aecbb252d4b6e3675ee221eb485fd80dbe52eabda6c4a6831dfb95110feab3284a6b6f4ea0d42aa6d6d7ced8ff0895ab40529ccabcdb5144481243b2bdf1653
diff --git a/dev-python/flask-security/flask-security-3.4.5.ebuild b/dev-python/flask-security/flask-security-3.4.5.ebuild
index e7ad05fcbb1d..29569ae89496 100644
--- a/dev-python/flask-security/flask-security-3.4.5.ebuild
+++ b/dev-python/flask-security/flask-security-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,11 +46,6 @@ BDEPEND="
 		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
 		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
 		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		' python3_{6,7})
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/flask-security/flask-security-4.1.2.ebuild b/dev-python/flask-security/flask-security-4.1.2.ebuild
index 7c01e12dd761..6cdea7379f0f 100644
--- a/dev-python/flask-security/flask-security-4.1.2.ebuild
+++ b/dev-python/flask-security/flask-security-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,11 +47,7 @@ BDEPEND="
 		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
 		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
 		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		' python3_8 python3_9)
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/flask-security/flask-security-4.1.3.ebuild b/dev-python/flask-security/flask-security-4.1.3.ebuild
index 9e3dec883189..d179a41755a8 100644
--- a/dev-python/flask-security/flask-security-4.1.3.ebuild
+++ b/dev-python/flask-security/flask-security-4.1.3.ebuild
@@ -50,11 +50,7 @@ BDEPEND="
 		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
 		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
 		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		' python3_8 python3_9)
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 679ab94d24fd..8eba2998f64a 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,9 @@
 DIST fonttools-4.29.1.tar.gz 2954962 BLAKE2B e78a55e240975e12e9cfd56368eab0d18e104211d8416db833a20208c78f6e5dbce2d24d7338017882f0bd1c3c181c0af0c069025a750cba4e9f41c1b4b2489c SHA512 36f4272be18d19748069289bfb3d3339cf0b16967a12976971f9e2dd56a1e915d3176e0dd9cad08cee69b20f3d6ac1a966365d936bb091b39e23b6c693e28dc9
 DIST fonttools-4.30.0.tar.gz 2961097 BLAKE2B 23b592daa16fd215688f149d99258209b819caa843d26c889fb4016aae6d6614a9f87dd13fa1d2aa254fadb5169cf7d57ba02b7b15af79611995148d698ca2ec SHA512 2b4e676f956c3456bf3ca435a7d80e1a0a9f36872ba3a820072d1e13ed5751a8546f424369731afd4ccddc298ec0658bb4384d2e18670b108dd1b3a99fc205f4
 DIST fonttools-4.31.1.tar.gz 2964489 BLAKE2B d1bb7059383785dd527f7276ef876042f81d3e2cc5acc1b69e111b540cf8d35273a0070e6f0602ca438f35e3b83d0a04736cd5c97b1b7669822d1a6b1ad1b487 SHA512 cdf70f376e690ab1edc5e761ba45d1ddd7760c3aefdb5e9b88cc97118edd4ff694789c8b79ece791b4b6a597dcac1abb0eec5f0634f1db0792e5e62a2137282d
+DIST fonttools-4.31.2.tar.gz 2965796 BLAKE2B d776073e7a9358e67b8753dd4557e2b1b4c44d9662c8c728abe42d970bca1db1789a655df8865fef39eed3a32271749d2cb772e306f34efc87e737b7384c0b5d SHA512 50cc8bca9136675a413ac947b583f694d512872127cee129a78505d0259fe1cf6922f806558761af982758f72c7d95e1245b8de55b6ebd6ddd3bd7506d41abcf
 EBUILD fonttools-4.29.1.ebuild 1501 BLAKE2B 054c329882c8ce0912a102774cb67945e6f4c65ebbd93c52623c6128324e6d8a5a5173de17917a3319b608120af8a459f77fb1c09e481be0db032421ee13604f SHA512 f06fdbbee41f5e5728550b37f34461594c4b8991bb6c75d79982376056916fe4b4726e2db7400a5ecd3812eee1e7f59563850edffe54a16331be2e8da423efd5
 EBUILD fonttools-4.30.0.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
 EBUILD fonttools-4.31.1.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
+EBUILD fonttools-4.31.2.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.31.2.ebuild b/dev-python/fonttools/fonttools-4.31.2.ebuild
new file mode 100644
index 000000000000..f0532d0a8742
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.31.2.ebuild
@@ -0,0 +1,58 @@
+# 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} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 024698e1530e..1b82239fe90c 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1,3 @@
 DIST Genshi-0.7.6.tar.gz 268913 BLAKE2B c54930023c4cd45e24f44baa62f3cc3fe887c5bfd5feb9f7c694cea9bd500cd8c0cea0ed7a60035fb58de9b933199f54ada2a14edff9f5a1b1f63203d10ac7c8 SHA512 a05e82b2b1b9321153a202e5926a26795ebc7c56ee13b8c6da197007a00711efcc7f8ebfb759446c4c2cb99e7e92a6f689576f9ef1f766aa42e0dab86fd5e335
-EBUILD genshi-0.7.6.ebuild 870 BLAKE2B 82c0a85ba9584f684f159e46a8b43c7c6a3baa4673c09c37bc5028223adf9f9ddaf242fcf1de69796d017c5d3dcdbbe05df12cece469aaceb3e35aa06bdf0229 SHA512 0c7abbf2181dd4d27f4ea1c8343089bc10fb859cba1ef9758f5493742c48dbff5460803b7f2010f05a278a4e593d8ad8384bafc915a78839b03c376b3d913609
+EBUILD genshi-0.7.6.ebuild 877 BLAKE2B 45ea1c9cba01dcee34fd3a5ffcde29bea2dcafc4b59ce2f583a6921870060b57ee1059b033e96c3bb59e2bf719f620813a7cd96c01d857c32b05588fec3cbbc4 SHA512 1cda1d5b91ac45c8c6a76864db04f29b428fc761e150cf9feda91af96df8244f7e85da416751075ddcf62170a6251be1396353ccc097c6b93c31cc89886f97cd
 MISC metadata.xml 365 BLAKE2B c5f3b55444eb424fc0ec15f0f19eef39a31c2c5e900fab7a06fe7bade29893ddb59baf4fa7f60621017a400dc7004dc093d124e1d3366df2663c0b714e31c8cc SHA512 1914d0acf5d6c517ff0198c827f606acc4124e834c306312d49d42bb729bb82b80ae6c98f3ac0797178eba3beb2c437a10665a23a843d0d3efbd148250a189dd
diff --git a/dev-python/genshi/genshi-0.7.6.ebuild b/dev-python/genshi/genshi-0.7.6.ebuild
index 9bf6bdb8842d..0672470e7184 100644
--- a/dev-python/genshi/genshi-0.7.6.ebuild
+++ b/dev-python/genshi/genshi-0.7.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index e600a81292db..8a643f31750f 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,5 +1,3 @@
 DIST gevent-21.12.0.tar.gz 6201851 BLAKE2B 8c02f42d6024e912e51754df876d4f4895acdf466f2400e9fdca69ad5c7c77df7ee05f3e4c2c1e1d5731c282b62d5c940d9ca6396c27d6fe6e8a0ec13013591c SHA512 805ddb475281b6c4c46cdf5a714915b6612512745121e7b153f3d33f3460135efa4994e0ff1601402d4f7b80d285cbfdc0d5d93799fbeb8ddbf2a52888cd91ad
-DIST gevent-21.8.0.tar.gz 6162938 BLAKE2B f24770cdbf229d4a4ebe7e6c102c43ab0c89a52389ada40c8abaf032eada323333ca9ac965c65d335d96d69c97cdc239e193dd5a38076c81a2f3c80daa13b339 SHA512 dae95f986530e79b07a0006f6fb4cbd3911ac0bf2e58c4896ee5fa6d2e2a9ed5785c346958ee23cd57c2dcafb0a34c585b1f6375a29fd653e061a382482fc9fb
-EBUILD gevent-21.12.0.ebuild 2586 BLAKE2B 08180ba9375fb9c09d45508fd421096ed5ef7fb733bae1b2c6ec7dcd3d3724129c35c836b892cb44737237be84c7b4a1b42abbbf29ca6090e88f1d629212f9fa SHA512 00f27a855e2c77a695bdb923a9d03834c7135eda0ae96e3e8320cf2647432cdb7dab867e85e84157883412f34c4cf67c8b3f48a9ac7ebe0242ab9addf33f3f52
-EBUILD gevent-21.8.0.ebuild 2172 BLAKE2B 057508152549d9b9bbfb7e38ef46a276204199bd404ec639c54518e6c54ed8c67e4aafc4fae084f6d0dce52874b857f7d639edaf30a3c8a4ab6ad81f123848db SHA512 1ea4b453ce2564405c189a53e31e1f99476ba1fac71e49e5726bf31dc0899fcf4f13acc4625f510bbc3b0ddb231cf05bbed24e79ccb179c3895c1bed7472fa3c
+EBUILD gevent-21.12.0.ebuild 2585 BLAKE2B 2de2f6474a750c8374c7ffecd8066071de0b7e798cd0725bfaf8ddb6a5298300ebd542e4eb52045dc335525a5e0b7cc73efda30eba8106853633b67c85d04330 SHA512 a37f3fbe5e351355de482c2aa8985f1f249dcad32bec12733759926e0844fd51f6d8077d62c40b9e78ab5705f593ef5a2cce697047e46ec710a969cbc9a64d07
 MISC metadata.xml 375 BLAKE2B 684f4f58e0d1f61195c30baa6b962f877ce7243305feb39a60a0a3dbd34e1095194be9b148644914bc1fbb74ac3bd5a692fd90343ccb9b2ec7bffd518ddd2492 SHA512 84242102ecfed7551ec1e95d3dee7ef56e154db34e3eb3e8255974ea48e879220b0b38acffa61a760521a1278c5074a20c22426e18bd0530935fbd671a2ea60d
diff --git a/dev-python/gevent/gevent-21.12.0.ebuild b/dev-python/gevent/gevent-21.12.0.ebuild
index 5d5497471185..1164989baa20 100644
--- a/dev-python/gevent/gevent-21.12.0.ebuild
+++ b/dev-python/gevent/gevent-21.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gevent/gevent-21.8.0.ebuild b/dev-python/gevent/gevent-21.8.0.ebuild
deleted file mode 100644
index 0705b21c73f2..000000000000
--- a/dev-python/gevent/gevent-21.8.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/libev-4.31:=
-	dev-libs/libuv:=
-	>=net-dns/c-ares-1.12:=
-"
-RDEPEND="${DEPEND}
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc
-
-# Tests take long and fail terribly a few times.
-# It also seems that they require network access.
-#RESTRICT="test"
-
-python_prepare_all() {
-	export LIBEV_EMBED="false"
-	export CARES_EMBED="false"
-	export EMBED="false"
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	cd src/gevent/tests || die
-	# TODO: figure out how to make them work and not hang
-#	GEVENT_RESOLVER=ares \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=dnspython \
-#		"${EPYTHON}" -m gevent.tests \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-#	GEVENT_RESOLVER=thread \
-#		"${EPYTHON}" -m gevent.tests \
-#		--verbose \
-#		-uall,-network \
-#		--config known_failures.py \
-#		--ignore tests_that_dont_use_resolver.txt || die
-	GEVENT_FILE=thread \
-		"${EPYTHON}" -m gevent.tests \
-		--verbose \
-		-uall,-network \
-		--config known_failures.py \
-		test__*subprocess*.py || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 7d8148497fd4..36fae1556899 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,9 +1,5 @@
-DIST google-api-core-2.3.1.tar.gz 156495 BLAKE2B fdc7f7d8457b96947181eee9992c5e51bbd18f9740a0415a32d4d0f45ade9c0c784e01f0aa78fe0dbbf3717ee860e78d6b4d1c5f154361afbf919abe033e5380 SHA512 ab1c333727e666f920d81186e6213d440052021d952efcb47eac487d10ab33a2e1116278925e54bfb3468de70c18837a0e241ba3426af09728ea59a725789a29
 DIST google-api-core-2.5.0.tar.gz 160336 BLAKE2B 5a3050dcb2e58c068c67cd6263b297ea84e4a47784c750e7ed87077bf46314730698eda2eaa8305a99a55b539b8886dfbbeeb9dc9838748fa941db6785212f36 SHA512 92b570195db21dded50b220e350e518c13101ab3e247bcbb3d3f5701e722c6dc81312443889360fdef1485edf1d5ef486bfeecf56092844cea81b61c7c527728
-DIST google-api-core-2.7.0.tar.gz 163847 BLAKE2B ba9b787736744fcbe73fde030b8efc88c01f818d3b8b83886116202354a3626b8ea15cac46f23a12191364098f74e2b9128774afd659dd4c4ce55af1c7ad2319 SHA512 9c00791a7412dab25b68785b3265a5654671a7865381d6d2cc8cdcb7e509d71968a0a654ecaaa6bb830b38f0cc838707baeedb545fcf5eea362bfa4bd8a9c53b
 DIST google-api-core-2.7.1.tar.gz 163942 BLAKE2B 0b28e8dd8607ed6a64a3715c14e321f74d18abc09bc2eee5c6d080936160ea9d6839f1acf9589667c86a688e4e02038cc204f25d0b7cab3e3ed3af2463f31abb SHA512 2264eec00309f272ecca278e8f310bca4be64cfcec94c05fa96a7a8ae350fce0ae9931fbb27aae71e89393289cdbef782631a6766e85d5aee449e903e70f0817
-EBUILD google-api-core-2.3.1.ebuild 1505 BLAKE2B 54190c7b2b0a94ca00b70ffa7536190e7c50da696ea7e1f49e343b801ed54814c6094b637659ee61d8c3eac623a378801d25cb8311339545ffb26cc6399b38d1 SHA512 54b01fcab9ac9a0f291ce85a8a44b11dc79fe54a4556f10e2b07a4bf978492b57f0c60afdc96481081a60df50fb70a8c3c1ba2b88eb185292ed7b0a3fc094276
-EBUILD google-api-core-2.5.0.ebuild 2211 BLAKE2B f87fa536107b72b39605bb7d840ed14e55c187e27778b5445d0add419ccf04da06789a338d185b923b7a36dc100fa5224080f6c65bb393cb8b37c18e4603b407 SHA512 af27ab83fa71f70b1ad6184b6ada4097227377f745b19c584b633088884e83d9a044c2f899ac59045592029e1090a4f94d41e5b1ec16bbf1cca3afa1969dab5f
-EBUILD google-api-core-2.7.0.ebuild 2211 BLAKE2B f87fa536107b72b39605bb7d840ed14e55c187e27778b5445d0add419ccf04da06789a338d185b923b7a36dc100fa5224080f6c65bb393cb8b37c18e4603b407 SHA512 af27ab83fa71f70b1ad6184b6ada4097227377f745b19c584b633088884e83d9a044c2f899ac59045592029e1090a4f94d41e5b1ec16bbf1cca3afa1969dab5f
+EBUILD google-api-core-2.5.0.ebuild 2209 BLAKE2B 9fb7529ee4f407df73536ccbad3277772522335648bae417d7d173485044234b49644709909e28b9b4dfbbef1238ee20dfd730b91890d238e1b13a2a4160c6e7 SHA512 8e483351b024155b158d79c80f6a6d5990e8ed7063fe3a1b063d86012e1889ccdc7992920ade540a1e6247b484bd05a38f05e7a4f3c14e53c3dbba4d6cac66e0
 EBUILD google-api-core-2.7.1.ebuild 2211 BLAKE2B f87fa536107b72b39605bb7d840ed14e55c187e27778b5445d0add419ccf04da06789a338d185b923b7a36dc100fa5224080f6c65bb393cb8b37c18e4603b407 SHA512 af27ab83fa71f70b1ad6184b6ada4097227377f745b19c584b633088884e83d9a044c2f899ac59045592029e1090a4f94d41e5b1ec16bbf1cca3afa1969dab5f
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.3.1.ebuild b/dev-python/google-api-core/google-api-core-2.3.1.ebuild
deleted file mode 100644
index 0c6e40af4dcf..000000000000
--- a/dev-python/google-api-core/google-api-core-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		!!dev-python/grpcio
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO: package proto-plus
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore
-	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore_with_nesting
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-2.5.0.ebuild b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
index 4c4a55dc0996..f2c7aa1eb8f4 100644
--- a/dev-python/google-api-core/google-api-core-2.5.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-2.7.0.ebuild b/dev-python/google-api-core/google-api-core-2.7.0.ebuild
deleted file mode 100644
index 4c4a55dc0996..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2020-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="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/proto-plus[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-	# TODO
-	tests/unit/test_operation.py::test_exception_with_error_code
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	epytest -p no:aiohttp -p no:trio
-}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 519699b59cee..bbf4ebed72da 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,8 +2,10 @@ DIST google-api-python-client-2.37.0.tar.gz 28868090 BLAKE2B 971fa3a873c902a34c1
 DIST google-api-python-client-2.38.0.tar.gz 29194978 BLAKE2B 741cf925256f0bd648e68c339233cfc13a9eaa12e123e202eab64b8389bc493755838c3da8ca4e7f4ffeecacec783c41f37df1847edf0fb54387d58163c112fc SHA512 b93f1f946ebab226b9fdd9012c3ae70563197a895d9069f09c7eb8926cd8fe5567535d3677a6824f66720b9ed1f0a732f02be9440dc800a13cb7e335728a3ce8
 DIST google-api-python-client-2.40.0.tar.gz 29463380 BLAKE2B f70067d3afe614e34cf84480d7a653620b516689560033cf3ad72a963e53c76632d1254ed1ac5f492e9e4639a6d717889f0f84c283363892efa99ce1007bbb82 SHA512 ae345d46bcb13509dd631039079c3ef96899899c206bc19b47a873d8ebc9372e70f55bcada1c8ba9775d826dbe8b1fde96a8f496f5574bb15b3c73c7d848f189
 DIST google-api-python-client-2.41.0.tar.gz 29608471 BLAKE2B 5a6f9eb414f02b9528d0ee8f8777da6596bd298f6aea8191966d1ebaa67219f8ea2e44a77bc667bfedab39c4ab0352a13ba04fd805f0df9a6936247cd4cf3481 SHA512 b9ee6a4374438d019d0efd09d02426c1c773fd2ca561e2bf91e426535fec2865a47a32cc5cf780e5e7da193ca3d8b5677339fee2a4983e7f4af9612d901c883d
+DIST google-api-python-client-2.42.0.tar.gz 29772877 BLAKE2B f478a719c3a6ef2f78d1fa16c231d47f2d72b55e67746612579f644b92dbd93ebd7f320f0684d85c1c1e253ed2f5163d7f6ce2904343bbe7a4f6746889663970 SHA512 e55cd75dec478a3410829a7eb7ee5478b52b44450d4ade69e3a7ee11b30e5ab5690c93ff6444f4b723db6cd1f26ac70553b3f1b9c77dc0b428db271b773faa9f
 EBUILD google-api-python-client-2.37.0.ebuild 1368 BLAKE2B bbee6bb0dec4e07887e0bd99c736c2702ca3a3fd10ed304b19dc63eeaed76b31af5289fbc862421aebc0ed0c1efd5454306d233b7b572d2600c123d9db017dbe SHA512 8c5c9dcc8d85824ac1667e6079b1da7f628ad7125d5caff22d3ba161dac2bf951d717199280379e962251abf3ffd102211d1c46e1530024e00d36448739b37cc
 EBUILD google-api-python-client-2.38.0-r1.ebuild 1372 BLAKE2B eba2c5a44d78732985e2d016052285a01dd3b0c5ff1128e4c8a72eba2b58ddcf77f749668bcf3e7fccc756ec56281a28951290630c44a2c1003801f067c21f4a SHA512 a7f2bd3bbc9b8ac65944e7f6b5cc52ef0775b945b04754ca7f36a7069babd5855413a1e2421b180f19579a3535a3dfe6a1561406387c8891f6d339b82c76b129
 EBUILD google-api-python-client-2.40.0.ebuild 1380 BLAKE2B 5f6f5d2cc37bb4692c28dfd840683d4993f6c63def00904491dbe76e541ae90b01b11db178a55154baec88a9449b85d177ac961ed7b457f30d14507ac4181e75 SHA512 14caa36d73eb43ae96919dfa3a0a36c3ab8e73dd966b4383b21472488ee0394977d9a0b01ba0c31d30bd1f3dea52067341311b5986053913a2d7f7c7c0b6b201
 EBUILD google-api-python-client-2.41.0.ebuild 1380 BLAKE2B 5f6f5d2cc37bb4692c28dfd840683d4993f6c63def00904491dbe76e541ae90b01b11db178a55154baec88a9449b85d177ac961ed7b457f30d14507ac4181e75 SHA512 14caa36d73eb43ae96919dfa3a0a36c3ab8e73dd966b4383b21472488ee0394977d9a0b01ba0c31d30bd1f3dea52067341311b5986053913a2d7f7c7c0b6b201
+EBUILD google-api-python-client-2.42.0.ebuild 1380 BLAKE2B 5f6f5d2cc37bb4692c28dfd840683d4993f6c63def00904491dbe76e541ae90b01b11db178a55154baec88a9449b85d177ac961ed7b457f30d14507ac4181e75 SHA512 14caa36d73eb43ae96919dfa3a0a36c3ab8e73dd966b4383b21472488ee0394977d9a0b01ba0c31d30bd1f3dea52067341311b5986053913a2d7f7c7c0b6b201
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.42.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.42.0.ebuild
new file mode 100644
index 000000000000..8c829ff884d3
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.42.0.ebuild
@@ -0,0 +1,47 @@
+# 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="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 0e4cb2097869..128fb6787973 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -6,6 +6,6 @@ DIST google-auth-2.6.2.tar.gz 189490 BLAKE2B 5506b4d316a40274cd8ce0cea8c6a76b882
 EBUILD google-auth-2.3.3-r1.ebuild 1542 BLAKE2B f84f33bd8824386e08f3f7011c76dd22cedfca975fe1f20e255ca0b170bc598dbe5efcb431fea6391360062f37fa12bcc21fa6aeb064f519a1d4e04b978a3e7a SHA512 d35e59ab467cf463b9d3f5c5cfc00123b87c361221e13759c183ad700aa66d0e2671a9b4c4152fd386664f84d582e2efa529689aeee267bbaaaad0385f56b80e
 EBUILD google-auth-2.4.0.ebuild 1542 BLAKE2B 656dc64a82d3f8dbc6504efa42823da00b92ab63525f220e38f7a36e9b8f56c30b8926f0eed6617fa8fece1937912b1dd8f511151cf0d568a63079c299d3af3f SHA512 ef8c5628d22ed81bf476143d2e67c6c242096081bf0d11138dba07d4ed6a4d74a24760851b04f6a4a24bcf38a202182862206fdb3c7b98cdc0c1c58cf4db7c62
 EBUILD google-auth-2.5.0.ebuild 1542 BLAKE2B 656dc64a82d3f8dbc6504efa42823da00b92ab63525f220e38f7a36e9b8f56c30b8926f0eed6617fa8fece1937912b1dd8f511151cf0d568a63079c299d3af3f SHA512 ef8c5628d22ed81bf476143d2e67c6c242096081bf0d11138dba07d4ed6a4d74a24760851b04f6a4a24bcf38a202182862206fdb3c7b98cdc0c1c58cf4db7c62
-EBUILD google-auth-2.6.0.ebuild 1543 BLAKE2B ed05c5762103688032cd40a97667cfe8d06194538e0b1a77c73a74626f498be116354836ea18d3a1690fead27b44b576b2cbf403f759a6074accb7b8c8e9030b SHA512 06e4f6ee42bd1ea9ac0cc49caf3034f95aa412fa536b9aeb199801fc2d7baba17930e5fda5c56be17c5c6e2a2320f2d30777675105b66c9811a42fa193841433
+EBUILD google-auth-2.6.0.ebuild 1542 BLAKE2B 9c677863cab1ca48608f8fd6697ceeb643830eee1d65d74309f946b92792c16292d3da8f1fd01faab5db70e39794463e4db24d520c544ec8c7e5940898cd940b SHA512 a610b2a64efacae642135ce270e4f03fbba761c60884bb7b6a0afef8a15164f211314db35b67aa320c3f9be425196dfcea38142c36b523138d877d235937371c
 EBUILD google-auth-2.6.2.ebuild 1544 BLAKE2B 1ba4234df05b4f0201059e4cb98bc80b72c56bf136b5f1f690c3b7ac1da17305e84a3ef93fd614c7d94e19db2030ada1d03938a3e4b35b3f4faf85ca7554f76e SHA512 24f69cc28fe0fa1273b893b0b28a2b44a4abc1093ca3573ceafcd76f4287bd7b4e911067b083a9c779698579bbf38cbca034e469e1ee4bf09572adaba6ba4005
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.6.0.ebuild b/dev-python/google-auth/google-auth-2.6.0.ebuild
index ecec4e6ada65..dbb933032a46 100644
--- a/dev-python/google-auth/google-auth-2.6.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
index 15795aa4fda1..a5778f8ff2f2 100644
--- a/dev-python/installer/Manifest
+++ b/dev-python/installer/Manifest
@@ -1,7 +1,4 @@
-DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8
-DIST installer-0.4.0_p20220124.gh.tar.gz 468296 BLAKE2B 44763fd05b9e3cc665871817f3a6a417ddc12274ae42989e96ad432af98d42c23ab9f1c1cc37e17d4b9ce06ead7ef0c8227b2b10fe5744c899a9e3ea347e4e33 SHA512 b25fa910e8a7d9a2757af4694bf12a64c8731213a5682ab02bbe472229c99dd9190b1e7663a7632d61cbf0585006b2d4de62115c40f9b132be2c70672e23726d
 DIST installer-0.5.0-py3-none-any.whl.zip 452177 BLAKE2B 41bb5929c1bc42afa1e09f366356aa441eb92d258da40421d7f46ceb466ee4604ed96fef0969dcd2fe28e8f4b06c741ac3108000f69ea42b6bb194890102ad71 SHA512 470c4fec8888114af6769db8b8cefa09a376bfcdf0d78320f884a7453a4991765cdf0b9122c74d8e147d193e75ab3e12cc24c3b93c0668956c17f52443833c4e
 DIST installer-0.5.0.gh.tar.gz 468351 BLAKE2B 6c258bdaae3351e87a88675fb813bb70611d9188ba16a09ba03de4caa3d79fe32544e229f880338304d00343c2b3121b1948bbef2e27c7255d231a3d5665aa5f SHA512 8731bbf8a51b1094dc87f84575eec07a650988bdeddf205d04cf80a5088eac0d8b2927022864f4011a9562fcaae9f511747e5672f94ec3cce1dccdfa833c4fce
-EBUILD installer-0.4.0_p20220124.ebuild 1481 BLAKE2B 3b56f9c26dcb4497176a5054df4d5feb39f36e625128c456ce93e7a4a15a67883ef56e2d92baaa3540089ef4b9feaa79b80ba1c5fde7ce442c7dc45ba4101492 SHA512 b99f01cbd7202e0b16ccc7344eb15b9b856d6c1460a55579b85e6f061363fe2f45bdaf23869be13f7765edbded6b1e7b788514478eb96145c7e82594b596a7f7
-EBUILD installer-0.5.0.ebuild 1172 BLAKE2B 8186a0182c7dd79f3c0fabbccd29fbc8ce3367d662a59001800160896066d274fd144220a008efb44c33aa55b138c8f5aba612820c2b74c21fdd4c374429803b SHA512 43b2c4c757865132c3d92c53f7b626485dfa2665f0ce6a77d981a60efb68028331be233637024fc01bc09136fabc5c6e4fc03e2f20b0217707423fab5e439d20
+EBUILD installer-0.5.0.ebuild 1164 BLAKE2B 2056582c7f5133bd4dbf155dd9bb436f5d5a9fe83e930e2491e2384378836036073e9247b365e0461d09eb2294e0402fc7ae26ab1a4b25bf1c22f4fdcc157ea1 SHA512 2922dc55236b6012e2198797006a22a8b26e808ed429595a0fe8bb761cb0aeefd098a72bef0faa33e3e81acdf8722af838e3536ba1772abed87c176294f64baf
 MISC metadata.xml 396 BLAKE2B fafd8a4b677ddf2aac2df9ed3142829bd39eefd12fbdfdd1608a5ed2a299c86b18993440aa9941d609af9b4d34e9166a0464c2b9a06bde9ea08a4b91537b18bc SHA512 d9a031da54c07c60a8edca8df2c9fd1d2d7767e71038b70a0ff46da99005cda63af56cd54247e7eac716cf66cfc3a768edaa62a68c87983c7b5354ee6d8303f9
diff --git a/dev-python/installer/installer-0.4.0_p20220124.ebuild b/dev-python/installer/installer-0.4.0_p20220124.ebuild
deleted file mode 100644
index 6dba1598032c..000000000000
--- a/dev-python/installer/installer-0.4.0_p20220124.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 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_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-EGIT_COMMIT="05855a926b2e6d9a1be6d567300883b7a6ff3ce7"
-DESCRIPTION="A library for installing Python wheels"
-HOMEPAGE="
-	https://pypi.org/project/installer/
-	https://github.com/pradyunsg/installer/
-	https://installer.readthedocs.io/en/latest/
-"
-# TODO: switch back to pradyunsg/ upstream when the CLI PR is merged
-# https://github.com/pradyunsg/installer/pull/94
-SRC_URI="
-	https://github.com/takluyver/installer/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P%_p*}-py2.py3-none-any.whl
-		-> ${P%_p*}-py2.py3-none-any.whl.zip
-"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
-
-# NB: newer git doesn't use mock anymore
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_test() {
-	local -x PYTHONPATH=src
-	epytest
-}
-
-python_install() {
-	python_domodule src/installer "${WORKDIR}"/*.dist-info
-}
diff --git a/dev-python/installer/installer-0.5.0.ebuild b/dev-python/installer/installer-0.5.0.ebuild
index 1460b1996ea3..eaf0e45936ad 100644
--- a/dev-python/installer/installer-0.5.0.ebuild
+++ b/dev-python/installer/installer-0.5.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index d89a6674b6ba..b7c9f16c6a6a 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -6,5 +6,5 @@ DIST ipython-8.1.1.tar.gz 5313998 BLAKE2B 0972b2f4a8072c5775f5cc4637aeb8e684b342
 EBUILD ipython-7.31.1.ebuild 4651 BLAKE2B ebe9ec2ae2f606efb76fed9ca1e3e04c78a13c8d86ec3223d02c980289e215bec65f01714d7758b707784c98f59fb7c934ff6f207cfe8943c9c0712217457637 SHA512 27e831552e274196810f5e88fbd7242dfdd8a233f60e8767c040d70557f0389f973105905eae473d8136d10b4f566ef3245afeb286065156d0b87ed3d451267d
 EBUILD ipython-8.0.1.ebuild 4503 BLAKE2B 1e152762209f46d4a20f8eaeda4cfe351ea0719131f667d03e5efde42eb18cf09128b6274b61afde42a4e2e88a35b6c0ae533dfa5053124d757d79aa8af4631d SHA512 1d42837b4e311c3e56e8be0ed0e076d1bf118cdbd4c5ef8038951629de21d5e7c4d1749fd3f7378c5080f3e9bd78d4a43c6cab087a5abbf8e0ee5ce9dda42e2f
 EBUILD ipython-8.1.0.ebuild 4522 BLAKE2B d260913823293f3314687bc8a9a9177c5de9543162e5c02b2331bc823b412335bd01435c349b7df2474a23a6abed79a17d40f98b69e125b6fa80e6dc80d56e91 SHA512 ba55f3888f8fa6b8d7a9052af96d01f1d9edac4d0cf4f969c5fc317e6321ecdb32b2f661b8c3bd6a3bd743e280e7bfad657f5c2d7c6b54befce8d92b0a0ddc3f
-EBUILD ipython-8.1.1.ebuild 4536 BLAKE2B 9de1431081fbad370aa631d08d42e78c1cfc92b1254018a5c0e7cf2677f8cc384ea151d1289b1161c97db27a02fd00c356b6b6122b4b734e231254e6351143bb SHA512 ec1635af61ae13bdbecb85626a0dfeb0b5caab5aff54b31c04d16f9e72fd15b12603188baa6463485fb1c2dfdd8ad345156ad7c909e10f925f2fdaf7119c926c
+EBUILD ipython-8.1.1.ebuild 4535 BLAKE2B 6c5613de80033d7a78fae46482b13f79abd65ab927774b682fe3da6afd02dca5e63dfd3e46962b72f1aabca936808eec43957daa031a3053bbd1ea92b289e30c SHA512 0acc5242b42bf9aef8e20fa2267ce6b1309077ec359f4a0cd2f3b18463dd21872ce3eb54468046d92317ce31d5d91bc654ddd97895503b27e6c14ecfdd430874
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-8.1.1.ebuild b/dev-python/ipython/ipython-8.1.1.ebuild
index 554c275a830e..816702db689a 100644
--- a/dev-python/ipython/ipython-8.1.1.ebuild
+++ b/dev-python/ipython/ipython-8.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 081ca67874ac..00bb643cc80c 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,9 +1,5 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-DIST itsdangerous-2.0.1.tar.gz 59336 BLAKE2B 53661c31c6ac8b3db68287f52367ecf53d871c2abd8bed077b5a2039b29da96cdb1b9c717d1382d831b63aa79c421fece1afd6799f31b85df46ed4627e69f792 SHA512 bc1e51eb861c13b4e3c4c1c655a3b6f28e326d70db23679269d2bea84f0f8f94afd4fccecb745cf40f5a5956a14a336dfa42f0f5149666ae43061feb1366302b
-DIST itsdangerous-2.1.0.tar.gz 56078 BLAKE2B b60e32d3199e3233e7a5686b3028d3f5ee49ae1a51dfbb1ead0f9d9c7e74a90945732ac86a44e4a53a285827189c60a012fc825cac74f28653e77fcefd4efd0e SHA512 f8b12b0cd1aa50d5fec8755125582598c467cd3f9bad5862718daf4a62395aaa0496247f29b7f492328c7f664f8c60926ca0eacb99f34559fe6a1424362faa44
 DIST itsdangerous-2.1.1.tar.gz 56217 BLAKE2B 8b35b32ce0d9a5432079199165f9d7a43dee80775737bfde637820a86c6c2c4cf122914958d4e88466446b75deaf4dfe995c9cda64c254793056e5773136d07d SHA512 54ec17e540fc7c39e5880c044c1ce222260b1141355cc341dc96eefbfd8f12e3018eadd531081a00aa719736b9af437bafe147dd5fee456d8b4478f7107aacdb
 EBUILD itsdangerous-1.1.0-r1.ebuild 645 BLAKE2B 687fe2d1170956390af9295f8dd795d9427df893ce91e279e7cbb073eb4d61ae78cc86faea0adaa5c38d39299332bbfe192544eb2754ffb1d455ee34feb7ac11 SHA512 fa6d71b62c656868ebaf2ad451bde2ce9967ba2983a63871bc58be31903dde7969a551d84c918d6241385fe4328163301a3446582918e071536828f326009dc1
-EBUILD itsdangerous-2.0.1.ebuild 644 BLAKE2B f7b1282fba5a7f9c3ce0b6adda757442cbbba82cb70ea169088eba6cb18229c7471e668a24273bb33a956c4c2bf725d24b6f7c1698af1b206ca06ddc754909a6 SHA512 06e870e82a51b48886883c77e2adde3f6acc9a8e153262d666c75dc8cb46487891bb4a363339af9092d96fefd22901f96ba27c6dbf97ba52e1a759b8a0fdedd9
-EBUILD itsdangerous-2.1.0.ebuild 684 BLAKE2B e786bb7d11fa46494f2239b059fecd702bb029314cb79f1523f212991a47a2b639984f6565d58ed195eb3d9c17c3a8f1844c70c41d662567b1e048c313fc6cce SHA512 2eef41ff028e86474796decf4a7318c29c4263d221274ae3c6ede9f54e820289d92ca0f872349fe03a935a3c64c64ae136048f212a640d4c8ff9645b730e7a30
-EBUILD itsdangerous-2.1.1.ebuild 684 BLAKE2B e786bb7d11fa46494f2239b059fecd702bb029314cb79f1523f212991a47a2b639984f6565d58ed195eb3d9c17c3a8f1844c70c41d662567b1e048c313fc6cce SHA512 2eef41ff028e86474796decf4a7318c29c4263d221274ae3c6ede9f54e820289d92ca0f872349fe03a935a3c64c64ae136048f212a640d4c8ff9645b730e7a30
+EBUILD itsdangerous-2.1.1.ebuild 676 BLAKE2B 97f74e38628d9f4c6c7919d383fc9fab63e3572e8a0b5210fa10248aa4306038c01451245a21611fbbecd9e1e1e41f5699c3ca2c45480cea00f4c686c354b168 SHA512 4669d394702ad8cd90e4545ddf021e39c0a0eaef68ac069f9be1b0785d60b2e3ec80d21183b611366d19817016e3b308347c40d5fb9cfa985c0622f4d42538e3
 MISC metadata.xml 413 BLAKE2B ad79fd7ab99377da744c95b7c63f70259d48b1c4ebee05d86f0c8a9118d2b640234b1e7375382779963218c6e54a1408cb1a5e2597ab82488823228c5e38445c SHA512 0ab4fb52051951fc2ba0cf6d825405b14e71f5793c0a81508e977caf55f1c47718303153cf5ba41e3009fe157ab0be96143ded4df2959196af334545c1601e44
diff --git a/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
deleted file mode 100644
index a30fc6ccd3df..000000000000
--- a/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.0.ebuild
deleted file mode 100644
index e9e16768e94e..000000000000
--- a/dev-python/itsdangerous/itsdangerous-2.1.0.ebuild
+++ /dev/null
@@ -1,22 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
index e9e16768e94e..3599f307595a 100644
--- a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index be21dcda00a8..ab1dbc2900c7 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.context-4.1.1.tar.gz 7615 BLAKE2B 5734da1c55420c45520aea57398e66a3d880a555c76650bcaf3427911a7814be92f4a879219c8ccf3c808fdf00d3a77b76e68a93ef3fdad4ea50550188118317 SHA512 e01d3bd7b4eb712d00aba3fc40a78a5484141fcacf5bc772287a35ac81eca4c9744963679daadf6a170cf2ec26234243e602c89f71833fe84175ac39fb401453
-EBUILD jaraco-context-4.1.1-r2.ebuild 1221 BLAKE2B 396dd3b6f37187906b38facb475c5b7bf74583ab87994c5e2dce9d733f39dcedac0cf5d0d2291f3ce5068dc165feca645449ac4523a6b746c8ebb3a47117bc35 SHA512 0e45048b2bc7a4d9cde5cf3864309f4cf0ac38ea2f58eeecbd1cddcf4ed44a6ac0f3127c6f0d94c6997657991b84d9aed8ec27c4b340b3156a06e51748f97131
+EBUILD jaraco-context-4.1.1-r2.ebuild 1227 BLAKE2B 71cd095b0ff838c6371336ecf01e0b0d48bfaca3b93488c5324d56d54f533fa4816b4b2451113bf3a5d5803052cd3b63b7c7129348d50ab15aab345b7999bcc9 SHA512 decabc7609f8db04d19bef45c05dbb7f86faf2cfa7a2fa874369637372b61a02a2ed1862546334b5fdc8fc998fbbdf223852a4e674251d50223f9a18ab3f51b6
 MISC metadata.xml 342 BLAKE2B 814e419c25d4719a2cd0ee3f8d9d5e82f594fcf1a88fc6547a7b9e0f893451be84b099b35d32536fee97c6ecf401e7b93749968ab4ec5e67d352e4ab9777ee34 SHA512 958abf9745fd7fc9896bad75cb4802b9056e023d854ec3539568ceccbbc4f246327ad794999d083ccac5addc98f56e1bd20e2d705a34c4bab3035ca04e93d63a
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
index a253d34788f1..67029c2cd032 100644
--- a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 7976132e9a82..71d5fa5936d6 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,6 +1,3 @@
 DIST jaraco.packaging-8.2.1.tar.gz 15393 BLAKE2B 8e30dcbb6c5dacf55fc62041e14c18ec852e39761ff5e00202bde89f6224eda8fbc090272d9470129be6014d8777b134908280dde10a0fce712b29167b122bb5 SHA512 3235756833bb4b0aff8dc832adb6e269bda622c5458493a302c6d487547ce224865aa367773f42bd456553c69cf451944d9b50d148761a40a775f59a398ec02c
-DIST jaraco.packaging-9.0.0.tar.gz 7917 BLAKE2B a975f1a4a024df8ec2ed56cd10cd574fa9bf1fd121b1d05fb71a72a944a07883539bb75d82894329cf2e845e996cf930a9010ca26952adff131bc9b3f51cfe60 SHA512 5968418251eeb7fa0f5657e8b8b4ead40f7f2b28fbaa8dc331a3bb0518d32b45646b85521e941e7c483ef8861d9a9cd47c45126cfdf2da708bd8f3b3514b47da
-EBUILD jaraco-packaging-8.2.1-r1.ebuild 1031 BLAKE2B 1e58b7c2abdfd6bd80ef69b76b7cc5aab448c76355eb10da8f1cb74953e36c216ad0e7b638740342ec4ed10726f12a5fdf1af59d3713c4286c952251d9d10953 SHA512 de2b3e42c5139c42530594b4af447626561637b03b6b56a6e161cf82858ff7804f8215bce76fdbf2fdbdcc85f379c37373e7c973663044e1521c4d9af103672a
-EBUILD jaraco-packaging-8.2.1.ebuild 1001 BLAKE2B 585f230a1b7f295298cce157185b90d93abcc51907b0d624de33f56163c59d9cf7b2013a5ac537aec74edcf50ab28e3764dd2a532f9feb0ae05698efe9e4f994 SHA512 cb74974016b74509b282164de153a766fc5fa4592f747e10eac1f3e0b3eaa51b5adc185f949aeded58904eb9e2c39c8c48dfe8cc9c8bd55aca6016ac9775b185
-EBUILD jaraco-packaging-9.0.0.ebuild 707 BLAKE2B 735541cf2236ff1c6442d1f7a5b06bc52df6f2a586f92997d49942b26e32b50f1febe39124b94c7102c5565b243979a982288f84ad61957cf5a2497d86fb84b2 SHA512 4d4c2fa242877cc0298bd5857c3801c5da48f78c5185f7d10a4b98b3210fa79f783254a6ad58a87fcba98cf82d8b1633a4abcda0a9b3d3ae9833e4d48037e2e4
+EBUILD jaraco-packaging-8.2.1-r1.ebuild 1023 BLAKE2B 0bb95427b7575f93fbdf0bc356fa887e0a033d519cea7736f629e6734d3f047d87efa822e21e13d2812d5973d3c88aae5e2989fb6f873b9077968770ba4bcb86 SHA512 72b144c394138777441edc5e16e598923d150ae530052e34353d13d6e264375956329969446ac9888101ec0b919e193be6d10b391df10ede4b43e2da4939fa84
 MISC metadata.xml 676 BLAKE2B b69baa3c0a88cedebf56ff7fd8082a2f289ba13bc46b08c31f3e7682656886515c2541adf15ef861bb4bb677b4835c3cb70f1d5ea006df78886340c79f674f19 SHA512 181b961d488e6c124d0147b8945b724cd3db7f8afef39202d84d9b2a3100505936772ae20616b8a2d18c486591b199ea2a93b2b90a2a511fe4b3bda8dbb6c8dd
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
index dee6fedf44c5..802e6482201d 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
deleted file mode 100644
index e7d5b913e05c..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-src_test() {
-	# create a pkgutil-style __init__.py in order to fix pytest's
-	# determination of package paths
-	# https://bugs.gentoo.org/832713
-	cat > jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-	distutils-r1_src_test
-	rm jaraco/__init__.py || die
-}
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-9.0.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-9.0.0.ebuild
deleted file mode 100644
index c4f2c74a95f4..000000000000
--- a/dev-python/jaraco-packaging/jaraco-packaging-9.0.0.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=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Tools to supplement packaging Python releases"
-HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pep517[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index e9737e57c376..8c3aa02e75a4 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.text-3.7.0.tar.gz 12054 BLAKE2B 54528808695e2f1f04165e3de42d1715bb3e3ee1450ee8d8759814d209ba98c181d1746a916816dd50703e5a4e26ad7986f389619324ffbabaa89be90fd3908c SHA512 559dc5ed0f2c0b46dd0cbbc112ab01bbdb68bc12923cff8f745a5e233696ca9f50cef6dbf60116df5121f4761457574deebea142c2a23ca6c4664d7395b5607e
-EBUILD jaraco-text-3.7.0-r2.ebuild 1578 BLAKE2B 1f3d6ea94ccd0313035686d56001f9ead3d9a37691e74480fde159f578b96ad8ff714b032ef0396fbb0862d9c64fa74c0583b57858ac4a7b4db543a262fddaa6 SHA512 e94faa4d8877a0cc8f26a37ba1d6f8cd6efa9beb6d57905f6941703fd024e33cdb2d1db349b6c8f9ed6ebd40055727cb08c3bfaa8bd764a39f0f88d9a9a763ec
+EBUILD jaraco-text-3.7.0-r2.ebuild 1584 BLAKE2B 7ce1ef8a1959f13e89b2b21b1979eaeba157a44a8f42b8b2410c36c1c52ecbd3a7fea7da0d3e25080eef9ceb621aff84cb890c2304f4572de60103512682eb2f SHA512 ae355f28dd6886c433f55fe7d809402f402264406098b23d38f371243174083f0f3cc920fcef63d5ea61aaf9d16181b60d9cf20e4320c5a9169ec952dbbc4da7
 MISC metadata.xml 656 BLAKE2B 0a887f3b936ada76caabedd24bcfc8d1d53047705761370fdf5c2cbe204b4d7c8449813268e9a45b48409f713e038f5742db12029bb3974b703317e7c3eaa28c SHA512 c8dc08d4347fec9076d6c23899ccb6fadbeee43d64875d8ea727ce20c2c5429a2683d162d602b763ef740c8eeb213762b17b2c964132923a647b769e2372763c
diff --git a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
index feaf5fbece8b..46813048fae9 100644
--- a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index ab17bf748591..b8b760117a8c 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -3,5 +3,5 @@ DIST jq-1.2.2.gh.tar.gz 10436 BLAKE2B 09514ce3a9afa8df4e61b29fc17f0d875db046ddc9
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
 EBUILD jq-1.2.1.ebuild 1178 BLAKE2B e5a7d35888f68eb74b78023372c5077b56ab9628c54af0643f8ba11d8cb45b9dcefdb2256b83981e60fdc4d54d58d99252c965b09fc44091479400b80b22bfac SHA512 2a4403d945073c6adbfc81e4fa4ddfe5da88e25e1cf98c6eb67e3a8b0dce4308cf10e9824fe090211b7f1a21829bbbc9e774126d1ba29b47b78ec7d577e6d679
-EBUILD jq-1.2.2.ebuild 1215 BLAKE2B f08910bdd5815d189ad49cffba070d24fe2e880b17c27d645d22c6460ad1675db26d8224e47e30a742726efe92dc8e5646699e4916d9e1c312e35710d27e3edc SHA512 e0bdcabc1a09efd2871d4e9296b91544e9283bec3796b8b60f5b440f9a5c2923b79c10d5e07cd3a8ccbce16922049ef67947d4a46ca4fd41a5f951c5dd36af1f
+EBUILD jq-1.2.2.ebuild 1213 BLAKE2B 24d10d394951555098d0cb151e079f90799dd034d267c4a9b59f91b567e511938317a1ccaabbc8ea0ea086f88a09f104827965d22dd87379c3556cfc970a18a1 SHA512 d7adccf6013e3bb96ed19c60a3a9dc8672e629758338349fc45d11e067714bf9d3cba0034e7b41d05a5db1f1690156d77aa9e3a6ba4ce890cef36a2b0bb66fd2
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.2.2.ebuild b/dev-python/jq/jq-1.2.2.ebuild
index 131c11194652..6aa58286cc01 100644
--- a/dev-python/jq/jq-1.2.2.ebuild
+++ b/dev-python/jq/jq-1.2.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/jq.py-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index 77fa41e8ff97..64373aaad3d6 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter-lsp-1.5.0.tar.gz 35747 BLAKE2B 110840905b929c5aab420493e1535fbe5329dc5cc7204d48c59fd656b6b98ca5830887fa5eb513299cfd1ed63cda2f133652c85fe8a285ac304212598be2afbf SHA512 868b16236d02aaf055431f88f1680df9f8b8f5bf9de0feee3f378d23a653c5e7555602717bf30b7e48089e287dc595f8674f9431296a24e788c54f085e50bc79
 DIST jupyter-lsp-1.5.1.tar.gz 35907 BLAKE2B bc69791253bfcf40188fe2bae24a2681ce17835f5eb1d2640edf93a69285b33d426bffdf09c66308e6f79e33c4778e539fc2a7ed056fe64758e82acc6374b4cf SHA512 585c7b3b7ea87fd9d3ad27e3e4473f3bce56ad41d3b028173e2fcad4b0d2db5b1c0c89cd8c976c3f8b4d30ae7a63018dc1e19d4527b56eafe21ec0b5e89a538b
-EBUILD jupyter-lsp-1.5.0.ebuild 1099 BLAKE2B aa1c046b5a61bb5006e9e8169e2e42eb9fd66f0f9801dc857c51518ffd26b452cd225e97e69479e2d2a56ece9ebe1060fdacd1284f8a6c2e62263040a47651c6 SHA512 62c4726535b31239ff0e70a3b00061e60e0ecb7139aae181e8b31abc9a569b01ce5c81fa670487416e20b7e9a82bfa3525d8577fa919a7330a36e727eaae50d8
 EBUILD jupyter-lsp-1.5.1.ebuild 1099 BLAKE2B aa1c046b5a61bb5006e9e8169e2e42eb9fd66f0f9801dc857c51518ffd26b452cd225e97e69479e2d2a56ece9ebe1060fdacd1284f8a6c2e62263040a47651c6 SHA512 62c4726535b31239ff0e70a3b00061e60e0ecb7139aae181e8b31abc9a569b01ce5c81fa670487416e20b7e9a82bfa3525d8577fa919a7330a36e727eaae50d8
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-1.5.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-1.5.0.ebuild
deleted file mode 100644
index 96e6e10a9283..000000000000
--- a/dev-python/jupyter-lsp/jupyter-lsp-1.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
-HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: Find out what is going on here
-# asyncio.exceptions.TimeoutError
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.1.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not depend on pytest-cov or flake8
-	sed -i -e '/--cov/d' -e '/--flake8/d' setup.cfg || die
-	# R lsp server not packaged
-	sed -i -e 's:test_r_package_detection:_&:' \
-		jupyter_lsp/tests/test_detect.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	optfeature "Language server for Python" dev-python/python-lsp-server
-}
diff --git a/dev-python/jupyter-server-proxy/Manifest b/dev-python/jupyter-server-proxy/Manifest
index d460968a26e8..d27197baec95 100644
--- a/dev-python/jupyter-server-proxy/Manifest
+++ b/dev-python/jupyter-server-proxy/Manifest
@@ -1,7 +1,3 @@
-DIST jupyter-server-proxy-3.1.0.tar.gz 84326 BLAKE2B 8de532ba67ea3759e5997d93839b47cc962ddd1f58bb4b594e9949cd1d933147d01f3747b992aec192b84861cb64aeb214eae2ce649978a0faef66c54f9a96de SHA512 6914a322f37f383bc5276cc34607bdd53e2c754564e214cf5fd7295ba6e8e8c89f2f25b23e673e66f575f4cb5ffa757b64cbfd008bc69dffa0480b46be603e66
-DIST jupyter-server-proxy-3.2.0.tar.gz 122240 BLAKE2B 9638db24a6a1fafba361f6ba67f31f6e76735428506b10684f7f6b42675250abe2affae63efec1dad2b0ebd52db680f736e2dadcd736263c62e70d4d0d1bc728 SHA512 6c804300644a84edcde334fa254a4a4f6292f3b077e69e70400a14480bd44b0fb9e186952d0f69fc53e7eed1fb694b0d239a9e77d3dd051a9224df5e3de2544b
 DIST jupyter-server-proxy-3.2.1.tar.gz 119991 BLAKE2B c94c2af6c550a2f5ba01facfa7f93bb3d7cf4334ea374c390b1a10478eced7104c31f9eadfac7e5eb9f20cc866cc6cc1d2ecd0eaa76009cebb25557346df3a3b SHA512 abd5730eac1fc7939732f0163d7e5c208057f77a1912efdf432b14564ea7e8cf6e81228fe7233e1e972af7ea8a813ef322782ff200000e3bd3dbd0384c7175b2
-EBUILD jupyter-server-proxy-3.1.0.ebuild 766 BLAKE2B 56879b1161a4b25204dcda1f75163c710d97084946c23268df23efa499682ed4f67f5c712452a5b5271f93453e8084c84ced35150a0beb3edf1814106542fd0e SHA512 892313559f737e110589d749396bdb05001c4f7fdd2517abf0a5742c51fcdd44763edd36249c994ea7b298fb8210b183878736677c32669668c985fdd1b578f9
-EBUILD jupyter-server-proxy-3.2.0.ebuild 766 BLAKE2B 4063ee34f5c91130a544d3a7af7f6f4988c8476c51efb34d17a3c37eb5e3a83bc07149cfcd646cfe50cb4213460072a377014de050743d4b9a67ca0a6edd64f4 SHA512 a214a2495322d07f932ac9180de38ae7ef82416889c415e968f6c4dc9172bec337b7f6cee99964580cd45195db2cfb7ed7756703cf73979c61dc2ea6e73f8c17
 EBUILD jupyter-server-proxy-3.2.1.ebuild 802 BLAKE2B 4e71d7f90d6a489db197743aaa193812e43d26d961c03392a5450ff040f1558d09399e4f81bf234050549ed77a65fc4dab6341cf908cd31ea2172bd16bfc46aa SHA512 0c49066c4d21bb358d216ae7b1b1da5ba37bca28f8b9c28449c7055e186691ad963f00af17a19ce6b602184a8d7f9a8ee9a2960f14bdb171ba22a3fb82016160
 MISC metadata.xml 432 BLAKE2B 971dba91e8277c9ac0d7a9ca3c42d8c550bb072442021c9e0a9d8ff7cdb8f5f61cecf995a249451a9c95ccc5ee53108c2093de1fb6f5021a79238b35caf4b15d SHA512 3989d322d8b9165a6e2463c970176b71eb6c924b9baa489019ee84ba4826f5d522ba715947da72d3dfa7cf19b3124c550acb26f53d5e00f9473aacd8d8b4fdc8
diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.1.0.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.1.0.ebuild
deleted file mode 100644
index 7a95cd422f52..000000000000
--- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter notebook server extension to proxy web services"
-HOMEPAGE="https://github.com/jupyterhub/jupyter-server-proxy"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-# The GitHub tarball includes the tests, but does not have the js stuff we need
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.0[${PYTHON_USEDEP}]
-	>=dev-python/simpervisor-0.4[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.0.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.0.ebuild
deleted file mode 100644
index a4387a0001ab..000000000000
--- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter notebook server extension to proxy web services"
-HOMEPAGE="https://github.com/jupyterhub/jupyter-server-proxy"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-# The GitHub tarball includes the tests, but does not have the js stuff we need
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.0[${PYTHON_USEDEP}]
-	>=dev-python/simpervisor-0.4[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index fb97c5e79a26..18312669ac22 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,8 +1,6 @@
 AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b832bb82fa19c746dae8bfa839fd16056076e9a905218201d2cfe8896c4e826a09424656657d109b12893d21fee0d8e6b6952d55ae3 SHA512 66d57b9efae86bc2531d35634f35a5d74de6d467329aaea7a487b010b582440cdb8a91e318a3c6ce7f26d9fdae6aff7adff3a59c57d053695076b9f1c092fbf1
-DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
 DIST jupyter_client-7.1.0.tar.gz 323501 BLAKE2B fa431f70b327a98be3958b2c39a2aa07ab0ec3752f069bc5e6d0645ac0660074974c871b159002dcbf3054c97860dc6b0e289c34826d929f0493479cd9f37ed2 SHA512 eb9456088c19d3780d943fb9457ded5e006afb7e7ebd726d8a253f91107d8e1839cac16e25466c902ff33ed2777e97e18b08e24092ddbb062aa9cf6336dc8921
 DIST jupyter_client-7.1.2.tar.gz 326163 BLAKE2B 0cc11210cc3a472585d21acb836e316540d768c8c9ccc4a024720b278f3e2425e645080d8dcd501c118b3759bd354bf4f384821e87f1be0b7525addad6c267e0 SHA512 7baadc7d508c25ea588d0d7a6da8eb5a28fe4dbce32c9dfa1f9b2b82c7c3d7ae8c034cc03414b3eafec620931bd760c0844421197c01a3d25597af18f6e60060
-EBUILD jupyter_client-6.1.12.ebuild 1264 BLAKE2B ad56c663d6a5ff1ba40a97b247b5a794c992a984248ca39b774d9bdf411cdb9b038a9c9b8ed574cb70763ff4f6b908305a11cdf42b012cb4608f61fd364bded9 SHA512 4535f54ecf7fb0e8074f6580b9b4060eda337bb2f032b43c884a5f1887aa699e91598a0aecf656888bed36b72b6594e8bad7fe5fde5fa3058ebe65906cb6c1be
 EBUILD jupyter_client-7.1.0.ebuild 1355 BLAKE2B 4d3df20a281cc1ff2eae77c676d55c29b27d6b74b0660af06f4746d4e1e899ed7c9728c2244ffdfaf0d3482fe1d909505665e9a57c54b89baf43a63cdbdfb44c SHA512 c4a9895e4cf60b8c93a3a253967d9797ba2c19a3738c88a35dc9e6ff629817746481b4091b59691dcfa77d29101fad23318112ee05ba95abbfb4e2381d52e41f
 EBUILD jupyter_client-7.1.2.ebuild 1395 BLAKE2B d008c76575dbdae64c7245ef586f27cd4411fbafce9ee336b4c23ed67c96793d1e4d1594bea2b16616549bef297f2483f86510d14615ae8e9ebf77c02d08c371 SHA512 a25b528cd3152105949b67876d16bf1a649b6d4e6a0f7016af41b3f729738abef633986ba701e754e5258a5ad24ae5dc06a559953ed063fc6cdbca063b2b9e13
 MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
deleted file mode 100644
index d2ff4e0416b1..000000000000
--- a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/async_generator[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		<dev-python/jedi-0.17.3[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		jupyter_client/tests/test_kernelmanager.py::TestAsyncKernelManager::test_signal_kernel_subprocesses
-		jupyter_client/tests/test_kernelmanager.py::TestAsyncKernelManager::test_start_new_async_kernel
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 394fd505e8cd..825d1b082d6f 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,13 +1,3 @@
-DIST jupyter_server-1.13.1.tar.gz 423717 BLAKE2B 9524e6648365e9c4158a8af4a4b277b4673ca320fc8e2c101ef2797ad89ebe8f93d25b1e74193ed88b06d151621a2ab9d9622cd06d67d5bea3a9ba96a95eb8e0 SHA512 e42a93930d16adb3952a0f98e3ae399a50881c32ef78205922511ea702dc24ffbeae30058fb1445897c4cf52873af0c03be16276398581a3eff52b58739ed2ba
-DIST jupyter_server-1.13.2.tar.gz 422777 BLAKE2B b263831ea27b5628c01f6c0897b213b8e97d60d234e6843817750eb41cf23cc27160841d3e65ccf210648571b8a0532c921bc9cd01ec56d78b4d1cad70cec91d SHA512 93a78a7b47c570e4bee80ef51fb0e35027caf414bfbd3c1bdf1f65d166d9756fade984070605f617912144b043c099c63812f7ba6b2be64c6524f5b8c6f24d7f
-DIST jupyter_server-1.13.3.tar.gz 423083 BLAKE2B 74bc31f0a853559a5368fc48ce9c9991147c76a13f4598cd0973ce27a4417a0320b157f83ce6f6c2450005f0d5668140175ee4d37d77160bb721ed27e9030372 SHA512 01c7a353b4890b4b9f33e4fec4d8ea141d60145d106cf21f9ba2372ee14e45433a0d83d78efa0ae7160f2fc22f7be0b4822992e9d135b3dfdc9bfb01a538f491
-DIST jupyter_server-1.13.4.tar.gz 423176 BLAKE2B a1a3e2f57eb0c570649ead2b03328258575f04fe32c0ee4afc0758fffa8804cdbae24b2aa9e8785a81f287d6f5c197bf2f0a18803f9a65cef441b46950a3597d SHA512 c15ddf92a8f7cede8d2c45a9c1cee0f70373083f61f970794b88b8c7cd12b56e0ac0e451446392ed93db8944bfff0910046c163a088cd639a9bc9bdcdc4c597c
-DIST jupyter_server-1.13.5.tar.gz 425707 BLAKE2B 503b0b079cafe4e9b046b8386055cf9c2396a5256b81862048f59b43aadbb04090f7443cfcee1ef3d8d625215679dc337787e40a774aab962724e084472bae44 SHA512 17241cccee6714675644ee9391a134ee053fc7e271a9a5f44bae87f2a5b80dd80af67a5d8ec39cc6c1573980fc16be527abe104838d2429855cc63a12214509e
 DIST jupyter_server-1.15.6.tar.gz 440539 BLAKE2B 11a090495fa9cf8fd59bc7c1b1149bb16e1e2e0b78a54e0ba827e5012fcc5910d90498c572c1f96cd4c73b5232f0e91c23f4296bddc7e63b006df034ad8fde3d SHA512 b967165c5509e724cb75dfbad0647e7c69fb4fa981bffd3475d480264c52de3d58e2504b01d7096091579dc065646eda11554c2b1ba9d5b6bc840cbcfb484f53
-EBUILD jupyter_server-1.13.1.ebuild 1875 BLAKE2B e21c3d86493d15f8b7a0a49a802dcc0ea8197e2d173fd6e9a40e49beadafb8942eed006d56356ee58a74d3eb21ee3ff29102e0cd3c66fce41c9709d24168273d SHA512 782b0c5993fca4ccfb072e5438bf9ff950f7a1ee5c5b2d6c26393798c2b9bfdd821c7063bf3a01f01efd979a2c06578968c6b196a79381d0665c5f81e35a256e
-EBUILD jupyter_server-1.13.2.ebuild 1915 BLAKE2B 97ed422b50b34e8c21dd900eac74f0e20ba256a04f0dee836b20e24181bd8683d20545f13a8126e4f57307bbda36583cfecf63fdd3a964a5563a2266800c6a52 SHA512 9b353205be2ff8b0ff2d28177e329c4b6765930c5a165d3913a0306a7dc0bdcb959e46137a499aeff77b952dbd83ed167361b4d8836cb1ee15720911ca4520b0
-EBUILD jupyter_server-1.13.3-r1.ebuild 2028 BLAKE2B 345aa24c09596024ce2397b260efdd4c5da03ce19e2e35d24d65d9ad7313c9024c2c66053f9426383ee390030aff919d9c5b13a02d72cf4319e5bd6e8f4e7d0b SHA512 32b5963cd810f29e14e8a330c5874b42e9bcf6d6f9c329aefa161489677e1b967665a777cf4bcffeaf08acd07131965b304d5e62e64f425c678474c87326a09a
-EBUILD jupyter_server-1.13.4-r1.ebuild 2103 BLAKE2B 1b989c1d4ac2bcee2248b39cdaf41aab5cbcf7bf21265a65418459339b6d6a2054e6869ff5e1f8c235db29292515c43d06b069e72899fd53c08bff164e5faf55 SHA512 3c023847caeaf2608ebbe725f97fe8dcbe48e24ab715a243d6a403398b9a0f79fe0ab9a26c8ffc7cac9da6de87965cc0b7af3acb56fa23f53a23e7c3640156cb
-EBUILD jupyter_server-1.13.5.ebuild 2204 BLAKE2B 7195df5b3323373830b54c816dad5f1bf8b2de86e2685df75eecfb4e7a6c68d426cec805b8ad154426eb68c66850b53daffc2a57ba89d55d59517c53e112967e SHA512 89801305044b0b62431becd64ad00dcfb514f40c14bbee601972b43f1c5b93a0bf1e001bd59f886ffb331c6efb345ea0360df15707b4634bcd33b903a2382c22
 EBUILD jupyter_server-1.15.6.ebuild 1947 BLAKE2B 6a4f1f661456de39ad7d1392cc4603c5455ba3f8735371c60ddc7a326c9c0d29ce724e912ba106cea47a28bdfa8b06f7c184b4674d98fcac92d19c7910209753 SHA512 95610da30729b76b5fa155d7952d7d7230f903fae6d28f0fb57e7121d6fb0a463fdef94277b215b18ea34e885ada5db9c7c93519055dee08b8b96bf552b719d1
 MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.1.ebuild
deleted file mode 100644
index 179d71a2f857..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.13.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.2.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.2.ebuild
deleted file mode 100644
index 9bc3c8cd77f9..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.13.2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.3-r1.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.3-r1.ebuild
deleted file mode 100644
index 78717090f54e..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.13.3-r1.ebuild
+++ /dev/null
@@ -1,65 +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="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst_parser \
-	dev-python/ipython \
-	dev-python/sphinxemoji \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-openapi
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.4-r1.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.4-r1.ebuild
deleted file mode 100644
index e30908e9defe..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.13.4-r1.ebuild
+++ /dev/null
@@ -1,66 +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="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst_parser \
-	dev-python/ipython \
-	dev-python/sphinxemoji \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-openapi
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	jupyter_server/tests/test_terminal.py::test_terminal_create_with_cwd
-	jupyter_server/tests/test_terminal.py::test_culling_config
-	jupyter_server/tests/test_terminal.py::test_culling
-)
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.5.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.5.ebuild
deleted file mode 100644
index ae3afbd58a6f..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.13.5.ebuild
+++ /dev/null
@@ -1,67 +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="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst_parser \
-	dev-python/ipython \
-	dev-python/sphinxemoji \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-openapi
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	jupyter_server/tests/test_terminal.py::test_terminal_create_with_cwd
-	jupyter_server/tests/test_terminal.py::test_culling_config
-	jupyter_server/tests/test_terminal.py::test_culling
-)
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index c7ab80b1833c..884b0b53abe8 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_server_mathjax-0.2.3.tar.gz 2596615 BLAKE2B 23122a273d8fc7c2b0892897dae4e7faec920bd1996a73149bfa3e46e8b71ac4ab3756751a5b3c582b2603b1fdf214a6843c9a5e3d04f6f36a92d0d9625c6e0b SHA512 74a3b2896399f674ee482c7db33c00fa76d53210abf136964f306a2e1d2d81cbf773b63dab80d19ad436f3e7fa83b61ccbf66af5f747523b3bedea586779f0eb
 DIST jupyter_server_mathjax-0.2.5.tar.gz 2634856 BLAKE2B 4fe518d3979271bc5ff64da040704862def25ec3fd184babe3f49a6bb1531db9b56c27d9edf0b5356b446e79fffe43cb32f1652f5276cd5fe4aabafd01dbbf5c SHA512 bc1f20bb0595d3e8a4483a6d0580ecaba1b1b296e63de86724b56782e42ec7ef80a5737fe16f610f38bbd0c4dd7573d498cd86d3bf97814d11d0ce6f77cfa317
-EBUILD jupyter_server_mathjax-0.2.3.ebuild 774 BLAKE2B 1771e1b2d19a93c2db7300977979e68766e927999ee599cdfea3b9a54ea4e4059a0e80ece7377f37848b995368d52ce0cb1509e440c7edf5a5a6b33f3f6e71c7 SHA512 6f5aa76a702aee59604f43df4e7c07e2269d76f7f368ec12a6747f2682e71afa2a4e3f8b88c43297ccbc7698c7326f914b83ee1e54e3bf4091262603954e2474
 EBUILD jupyter_server_mathjax-0.2.5.ebuild 909 BLAKE2B 8d248b2a1a8f2c40b5c54153cf0049fe5ad4d24d0526e37992447562562fbd6ddfd21c410bc1300c32d00d92e0aa54956c33b0e435c099fce9add00e5dafbc02 SHA512 ba28b3920d1be20179e2d70e6ef479fbc471467942c4aa2f58049f91fc091fb021a4faff22556183deea51b75530f9150fe147b2b718ef8c1fd66d17f9a4717d
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.3.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.3.ebuild
deleted file mode 100644
index 2039caa6f85b..000000000000
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="MathJax resources as a Jupyter Server Extension"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-python/jupyter_packaging[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="dev-python/jupyter_server[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Don't try (and fail) to fetch things from the internet with npm
-	# https://bugs.gentoo.org/820317
-	sed -i -e '/install_npm(here)/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
index 3f44b6dd4977..7495dddaf1c7 100644
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -1,9 +1,3 @@
 DIST jupyterlab-lsp-3.10.0.tar.gz 269237 BLAKE2B 379716c2dc61053f10b70969b63a62b3d8c57915c472ee04f55513236f318d787ae92257751f789a2a7fe3b6faef5141e54ef7708c76f7720eabe8edf855a28e SHA512 a62073744a6ab5d57af12e738ef754f139bf34fdcbd54921127a1273f238cbda3f9ac859f7702ab862ba5597dcd75d22c0db9423ef6c7b2ee9c3459efda3b2a5
-DIST jupyterlab-lsp-3.9.1.tar.gz 262645 BLAKE2B cd3377ea3abbb3f877b257140d5ac6b162aa9d4229cb58f67fa60a9b7f5db43de6873af381bac5bbf6103a47a53863ae322ad200550d73e5c19baa5eb2866aa2 SHA512 0289dc666a3ec3d93d276c67e95c19b0427e45a4f1e001180df4af9a72f7e81dddc8bdd175684f857dfc8e02935dbd31b454bfd0ee1431a8e702f662365c747e
-DIST jupyterlab-lsp-3.9.2.tar.gz 263499 BLAKE2B 2ece934e68b27e28161ee3218af2d11bd5b286b4c517ff8feb4f9ec10c261e51a95fb4d52de7717d896a7c4dbca9be168aa75ed8ab7728dd4844640417f31365 SHA512 c41045736cbf511f72668dc03c0fd1265c2b2e2f60a4e987fecd8e23be0a6af1ae7b341f6b0c47fb4f5956f00cbb982f8cd9f31ebca8098ce01cc21a8f0df357
-DIST jupyterlab-lsp-3.9.3.tar.gz 263515 BLAKE2B 0e2c4c13d6959d24357d140c0484494d1e2922864cf7c4ab58dff886560b627f2648f6cd2ac9f7fe64e3d86f0d26dfc76f413b376c6d2663df3f1396bcaf7fcf SHA512 4009ddd1754a74d031f91b29743c9a9ad21bb5260af066390e9987bca211a34d4a6f96ff863b4ab408133cea3df9464ea17bc3ff5cb5306b3ddfcba937843897
 EBUILD jupyterlab-lsp-3.10.0.ebuild 589 BLAKE2B d969f3980ea831320ad417f644830ca33f2a99125d516ee8c4f2fc6ba75abc68d9a72027e153b975a09ee9321e0fb8fa1ff307709f858e1f8c429330238c2269 SHA512 3295d23d5313c6cd390e248b0363fdbc285adf7d13f7983e6b66dfb4ffcf82ff72f5f2ba8df321707ba088e6498ad43bcc014779b31addfe6a7133642cfcc0a6
-EBUILD jupyterlab-lsp-3.9.1.ebuild 558 BLAKE2B 6e9104b1c9cc3f8113cd1026eab02cc6a08c4d5a183a571c0c0a4072170c179f9502d404ca47209e52315b52d902605d431f595ab92e884d28a789979f1670e4 SHA512 87f6f9d409f870c29bda45b21885b0a4fdcc8fa4262c5b16fae185987745cb008f8bf308bce819cfce722d9cc725c945a9f538ffd77804ab221e73bf3ca13832
-EBUILD jupyterlab-lsp-3.9.2.ebuild 557 BLAKE2B 00fa8094b6e3ae96b4182907ff64e886082fd9153306975d9ba7232b2b4e243096477bb4f670545764d9cbe01544a1b08837524a3bc259eab2397d1161366613 SHA512 1bdf21601b22f6eecc1a73f36801a4ceac7b56d24fbe1531cd826f9445c12b18ec3a9a7d9c5e2c87028ece46fc6b0b09fea549dee4092ee0bab20e745f462026
-EBUILD jupyterlab-lsp-3.9.3.ebuild 557 BLAKE2B 00fa8094b6e3ae96b4182907ff64e886082fd9153306975d9ba7232b2b4e243096477bb4f670545764d9cbe01544a1b08837524a3bc259eab2397d1161366613 SHA512 1bdf21601b22f6eecc1a73f36801a4ceac7b56d24fbe1531cd826f9445c12b18ec3a9a7d9c5e2c87028ece46fc6b0b09fea549dee4092ee0bab20e745f462026
 MISC metadata.xml 421 BLAKE2B cbd9c4e3ce5848ed3d0e57832082dd730d2d16a286070639602b8fcd49c49714e7f17b220251b9f16d9c5105248933390b152c060c68522d2c82b1958b09b116 SHA512 97ac68ac4e6920f23120a5818b4404fa0b510b165a44a6455a7bf76edfa298ca137f50bd9c1a87044253f5b873f881362c2667261a4c7fdb182a7d37325520b3
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.1.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.1.ebuild
deleted file mode 100644
index c25e67aafe2b..000000000000
--- a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
-HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/jupyterlab-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-1.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.2.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.2.ebuild
deleted file mode 100644
index 832007567c54..000000000000
--- a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
-HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/jupyterlab-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-1.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.3.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.3.ebuild
deleted file mode 100644
index 832007567c54..000000000000
--- a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
-HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/jupyterlab-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-1.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index c74dcb103d40..582cd5e8aba7 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,9 +1,3 @@
-DIST jupyterlab-3.2.1.tar.gz 17073190 BLAKE2B 8cde66b024fe46270494735de8ab2ae0747a926c9ee1daf2d49514ce813bbc3570e676afde0fdae2328e65820fb8511195d097a17b7e07f800f93c4d98968709 SHA512 b84cdd5c70861300d84d3d6d8f3ba5e01482dd29105949c4b14b3d6512749bc4c8bb091f1d9246de181e2714ddf840a17903eb43750bd13ae9ca96c5119d5661
-DIST jupyterlab-3.2.5.tar.gz 17056795 BLAKE2B 1c4c8de7b20d4b6ea42d0aaa8986fd08d31e8d31289c9c72a691746275146e4a2b8fbfc1f7bcbaf374d063cbda7a39e941677265b211ebe3f2d6c37fad740624 SHA512 396717554a70cf0ed0d2a6b3d2929ff51659453d4570e014277c82a48c5974fdac345e391882a3e0114f9bda13a8436072a032db4c8b8d1b338396248c176fa3
-DIST jupyterlab-3.2.9.tar.gz 17047944 BLAKE2B 2e12bfd9915f237b8a3f162979444edb3fe47618c5f0e49184ad0568f1cf62a1cd6063f2127bbff64b4bd1040ea7b446466ec95ac0f572c1cebede4dc1112ec8 SHA512 997176825dba8a004f8e30a4210a6b98dd63636f7822e075c6095c9c728b9e1148c541880ac17b4d0d5d6e8b22609f2a3cf8b517687c4262837b7a4d349fa99f
 DIST jupyterlab-3.3.2.tar.gz 17141751 BLAKE2B 268a83f201fe9d31b7f90538312f5729b5fd174b2e51eb5c65d3ed8d1bc34655571cc239d34c5f38ae1c76eccae30f82ce2152dbddf2bb7149affbda6d3e0cc9 SHA512 35384ddf82860b98f4ed17ad8eacebb9f4a2fdaef955b016c6971ca228b2c42cbf13cac7975d76fffdfcd703f9b128ddca5099d6d5ef1625fe12fe68e14137ac
-EBUILD jupyterlab-3.2.1.ebuild 1066 BLAKE2B f5b806db17417e9b9ab8ccbf027c48773de84f26c08946e329c460f0cba4a13da151d16f2172cc1b9cf7e696805146ecfe2a9d4fd82d461934158039a9e5438f SHA512 00db002f7e34af013e4822dfdd2853df7a2a29e5c77647e6349ef2edd0f314ed71d6ffea27f4f4e016ebba6a8ab30f0951c3c135b6924bb810a65337ca3f9bbb
-EBUILD jupyterlab-3.2.5-r1.ebuild 1065 BLAKE2B 158071b39dc99ca79c0e615b6023c903334f5561698a0da85579ed76011e5e87af985a9f5381c9166fe90ddbfcc4d3744ce336e8a5e5d3f988fb3fd90ccd9289 SHA512 63e2180183415a081a1157b75ac35b7287f0c09cd0912e1ec0ebce3797e97adea4ef949fff2cd9555ed56cadcc351ac7c36b52897d79f2297e790705c9430463
-EBUILD jupyterlab-3.2.9.ebuild 1113 BLAKE2B b8d4e97965250a0be27cb636f0848b48071edb56be919d4b45b61d9a11dc615df213eb636edf480c38a2e9a142a339a5fb4d22f80fd4462c43626c93c2894d9c SHA512 f3ee6387b4c3b7f5c239913be4e4d3692e52991944ac01766f2f4db614b4e0723eefbc42a29850e5ea8c73ea5ebfd145f915d18f64c568ba223ba83c9c1064c4
 EBUILD jupyterlab-3.3.2.ebuild 1113 BLAKE2B 4201222cfe3de526c2f7463cebe1a70e691b392111b8a973f6ae1b7324fd6273eed0a205f87d2b43f0a494f637c6da405100b2582701881ff657e81f5af8f24b SHA512 10524171ef34b9f689838dce3b399140559874748643ace3dbdce7269402595b6352765818f9f18c48be1979e391baaa1d37312de626283ad10c2b7cb934d217
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.2.1.ebuild b/dev-python/jupyterlab/jupyterlab-3.2.1.ebuild
deleted file mode 100644
index 3ee37f820bf8..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	dev-python/nbclassic[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-distutils_enable_tests pytest
-# TODO: package myst_parser
-#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-3.2.5-r1.ebuild b/dev-python/jupyterlab/jupyterlab-3.2.5-r1.ebuild
deleted file mode 100644
index 2618ff746036..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	dev-python/nbclassic[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-distutils_enable_tests pytest
-# TODO: package myst_parser
-#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-3.2.9.ebuild b/dev-python/jupyterlab/jupyterlab-3.2.9.ebuild
deleted file mode 100644
index dbb3e6af8387..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.2.9.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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab_server-2.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.4[${PYTHON_USEDEP}]
-	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 78dc5f05e335..1e41f3b40ba2 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,9 +1,3 @@
-DIST jupyterlab_server-2.10.2.tar.gz 59380 BLAKE2B 9c4e29409d255192be18d891940cb499fe8949f1734ab2fb85c5656b2498d2ca999a0e10cc0e8aee796493882774ac78b2d1b57020ba6b4013959b49f0d03a38 SHA512 1c8779d587233503ae63e54197b66c0ff21abc158ef04370db09e587a168d380948a9711676bacc88c043a8f66e0c20e0d77b26519f998583775b8dfac7c88f4
-DIST jupyterlab_server-2.10.3.tar.gz 59522 BLAKE2B c8cc4270ef6fbb2c07cb78b4213024c4967c90caad3753d7a505d4f1b0a1fb30ee7610e193a0cb0cf2473ba28f5e149774a70c57d3b2a4aa536efe705fe9a4d7 SHA512 54ffde95b13da103472e54311710953f1f2b3e30262c303cee64f1eb69d22930bf889f4a417e09d765c13a035ca3542865c0ee7b7530c5e4300d6bf59fce3264
 DIST jupyterlab_server-2.11.2.tar.gz 62113 BLAKE2B b5c7e9062e3419d643d22980804c608ce3e274f9f213f184fb44131dc21ed192b46de61b97c55785dc88e7ce9e3145e1d6319316cc743b4de849be81fa43261e SHA512 c3b6a3455841ba7b2b2613987eec41ffe1c6023685ae46755980cbef4fab8b98ab4d47bf02345852941c8f6e15107f79ebf981b68e3ce47d5ead14ccc81cbdfe
-DIST jupyterlab_server-2.8.2.tar.gz 56188 BLAKE2B 8aadb2a01659151e0b2ada1fb235f4a3eee9fa1a1d6b046cbd1096c67971b1dab7d52c517f8b57b2b43c5c59b4fd37ed0a99ec75640fed6ebe3829812539fc7d SHA512 d35b8dad009f21aac6c0790e881ee4b7cc442b0762afcd10ab5fabccf417a6a4cd9ed1f54be5c3ad631823064a7c1a25112fe829b59e28ca8fc706b46c1b5603
-EBUILD jupyterlab_server-2.10.2.ebuild 1157 BLAKE2B d4261e156d131eeb0d144f38a6aff3d4d91dd75069975ab24c1e47c5f539f9eac4e2ebb7817784850637e80109fead907308ae2ea5850e34ed1f8ce439e26e89 SHA512 f2f4ee71e4ba41ed7bf0fc7412abd647e70c30e2e7f486b5183dba797034c486e738da279c477b53909fd69c835b56e1e8c23ee396416ab8a193c7afd7e5395d
-EBUILD jupyterlab_server-2.10.3.ebuild 1220 BLAKE2B 90377742566ff0e9d644832b8d0c907860a807b34c3c4d027400ee29f1db99edcf458ed4ef00b1fef608d6f1f3d5311d4d38f1e0d4919c959e35166625f06bdb SHA512 f48720e39c3cc89b422cb6d1daef200f0b0414f3c673e84552dffef0f288cb8a1c01adb55f19db380c79f63c3bccad8183704e5d1f9ee16e45d0fa9ef989ad59
 EBUILD jupyterlab_server-2.11.2.ebuild 1102 BLAKE2B d7171ce996a25db6905bd90eea5dadf87bc32a8be702ea1196c212c6262ecb0df41cf6d260fed21a2e91434cfd94de7e0df70b5117c2ced08e74665218a8400c SHA512 39784ee2d000c2009f0772bfb30d8ae2ce2e51e982a80afd333a5e83f8578ed7d952a95ca69e4aa6779b25ad01ba5b183d63fcc3202874967131884f939e833d
-EBUILD jupyterlab_server-2.8.2.ebuild 1157 BLAKE2B d4261e156d131eeb0d144f38a6aff3d4d91dd75069975ab24c1e47c5f539f9eac4e2ebb7817784850637e80109fead907308ae2ea5850e34ed1f8ce439e26e89 SHA512 f2f4ee71e4ba41ed7bf0fc7412abd647e70c30e2e7f486b5183dba797034c486e738da279c477b53909fd69c835b56e1e8c23ee396416ab8a193c7afd7e5395d
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.10.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.10.2.ebuild
deleted file mode 100644
index 781969734cf9..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package myst_parser
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv ${PN}/tests/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.10.3.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.10.3.ebuild
deleted file mode 100644
index a052c2fbd539..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.10.3.ebuild
+++ /dev/null
@@ -1,44 +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} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv ${PN}/tests/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.8.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.8.2.ebuild
deleted file mode 100644
index 781969734cf9..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.8.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package myst_parser
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv ${PN}/tests/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index aff886df78a9..bb64f115b633 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1,5 +1,3 @@
-DIST krb5-0.2.0.tar.gz 1086940 BLAKE2B af0028f91fc86bba3a450cfb09d1da31d976670f844f46b6a3c7dbddeaa8a4d4cffcde21fa076b5ae5f740052cd60b3872d10174eae3613181f9a3f4d6c9841f SHA512 f2e8558f5800467e362798092f1f37268558d9890491f1d808b51ac2f5372f0b495ce19d1addc74da663eef1baf838ac514b74b5cbc5cf262925bdca2d7231a9
 DIST krb5-0.3.0.tar.gz 1707212 BLAKE2B 0fa7a60372876f28cdbc2865fbd898c717aaaf22837bfd123008611973a0d6907ea9e5941d5da4ef707161d6aadd883fdef1faab81d307153eb4e115defe32a6 SHA512 5074cecfcd82c8f525d77c2faba5b34d6cdc593b15124741df1adec64cdde59fec2f17a02c04f78484ab4b82f7f37f5c1a4d856a2040c8d11c7e4a1b74307b27
-EBUILD krb5-0.2.0.ebuild 517 BLAKE2B ed4237d3f28a09fe7ff5f663dc7c7fa952e7392ee76a22d60be8149e1d69a0a6652fbe51000b8edbc42ec35fb04bdb0bacf9183aa7ec25fd26d5657c31e5d7bd SHA512 dedcd706d55440b74ef7606b4fc3bd0b5bf07d1d55fe7e56600319cf003d20c36f9d4c6a2f212aacbb1c9a85f1773938440127c1b257e869c6e46db4ad94c1af
-EBUILD krb5-0.3.0.ebuild 561 BLAKE2B a014e551d1943eab8362f7d027c9d0b73fa9118fdd4bdfb98aeed6fd4f90bf7240d6e80913cea02edc73bb8bca0039e5527201a7c1aa3c93d73cacc64097e805 SHA512 bf43e6bd8f52e708fdde5d2a3206dbf6070f1ec9e25a02ca180dc53fa66aabecfb98ca3d191619dd09eefcc3c2708f1cd760247f7647231a684ad90637b3e3ff
+EBUILD krb5-0.3.0.ebuild 558 BLAKE2B 2075ba961f7be1f29b06cefb4f96daa10f250352e1cc587a73294069a6d65225f2af7e8e6d6bec6bec2f5eea15fe3b4b1fd69c259e1cef35bca188a8728a34f5 SHA512 2d85368f8b1c3553b2d04fc5a2a71737f0a8c8f18c41152ea3d29a9e0c8fb0d9f398e916327607fb46911c14c20c6cacfd88c15f8cdecf7db653be650680db93
 MISC metadata.xml 364 BLAKE2B e69a14082c08f32db33234a5738190f54374c13a2f114d65e26a8e224c96f23be90e0cf602830b757fdadfaa058d723ab2cd51e6980f08fb090ca7b014416935 SHA512 f65eb368468d221f55e0701f8ae3790dbf083be2d3f210e9688b27db892b6d3e566a0cea3912d45a4e1e6da7aa092bc82eb6a4b861b459bb8decf914c5192d6a
diff --git a/dev-python/krb5/krb5-0.2.0.ebuild b/dev-python/krb5/krb5-0.2.0.ebuild
deleted file mode 100644
index df6240481018..000000000000
--- a/dev-python/krb5/krb5-0.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Kerberos API bindings for Python"
-HOMEPAGE="https://pypi.org/project/krb5/ https://github.com/jborean93/pykrb5"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	virtual/krb5
-"
-BDEPEND="test? ( dev-python/k5test[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/krb5/krb5-0.3.0.ebuild b/dev-python/krb5/krb5-0.3.0.ebuild
index 2f970f72d609..fe04eed50e95 100644
--- a/dev-python/krb5/krb5-0.3.0.ebuild
+++ b/dev-python/krb5/krb5-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 0d3766038d13..2c0cce16e754 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,4 +1,4 @@
 DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
 EBUILD lark-parser-0.11.3-r1.ebuild 736 BLAKE2B 6e908395d62f11ecc9055ee0cfe4a0207ea028b89d7a7ed3207714c154dc7ee0ec3ed4ac37aa8c8fe2921ef11ffb45841593f8674b5a88847b81f86968645b96 SHA512 2c3aee24717575ecefbc603ebf62b1cd0c70cb5448b0da04cec0f7aca40cf8a345f2422e2763ce388bc153027527f60410e31d236ae699a9748ae3fed61d9e2d
 EBUILD lark-parser-0.11.3.ebuild 690 BLAKE2B ae9e80b536d3b79a88a84927fb25607ff87581f0968032157c8395b7f2a07889227149fc2e671fdc4047288b1365bcd05db4700e6c736b4c10cf92dc50e66f91 SHA512 94d4d526ca56898d3c9c5102c603bf61512d2dd1682cd7152a70bd5d7e1176c040894a081027610056e30f6c644027a31b1f5dfc286ab04fd97ade79ea741f13
-MISC metadata.xml 635 BLAKE2B aa735f4a11cbb8154dad090bf52fae833c6233de80a95bf073e9097c1cebb83a004423da1a2a824b6cc07a32ac0dc016339229d3e0f3691094baf88c76eb3283 SHA512 e2a0faa9024d00d51ac7ea60cc57e75c0b59e45747777b6cd2182195f35eac0a9324b58a76d6ce3e776686f1f8b7a163cbb154551ebe0c55046372659e083a07
+MISC metadata.xml 371 BLAKE2B f87221c10e970e117be1e27a6b04b5c66d4ace3c474922757b637e7a5d36a7abf466047ca45e0dbf9479f462d8e26bfb08c3a79b52bf8d98685e489909b22985 SHA512 e6937de468cee9521fe17c8ccd80a28d78d9ab041fd9e31379fc361ef013483ae4f6d118f7b9885d2faecec912a8ee3afff39f5bceeb2667df80ac0e7485b917
diff --git a/dev-python/lark-parser/metadata.xml b/dev-python/lark-parser/metadata.xml
index b2606bb32bb9..2b3b22eccde1 100644
--- a/dev-python/lark-parser/metadata.xml
+++ b/dev-python/lark-parser/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>thomas.andrejak@gmail.com</email>
-		<name>Thomas Andrejak</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 46f6417851ef..70667019beae 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,4 +1,4 @@
 AUX libnacl-1.7.2-32bit.patch 890 BLAKE2B 40afbe3e71b550da59b9c26c2834ea72b151d847605572bec3b149edf714125698014a8e30c2e8d9c49cca489564ccf5fbdf0f7033caea528ee588716e222a2b SHA512 8ee93b8dcb23228b3f294a947a54f49afd9fc4dc9207fe999ca7349868cfc05741ea8cab004087c3f0544436fb445ea3f513b574076f6350b2390415a3be7426
 DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
-EBUILD libnacl-1.7.2-r1.ebuild 633 BLAKE2B bdff8079d64a76517ae191c021a1e64b7303c5d1e339370722b2eb35c361f00abfab328a0e2b513b9f216288664f8dfca02813f35510470236a3c5c5bd5234a4 SHA512 abf8abf7333cf4c63d2bef983ae9a1e4cac9ae13d3f934bbb8b49a4aa0c111d729ecd0e65e4bbad10f6ea0db6683c78d11b436959f8c852bd0bf896242dcf9f5
+EBUILD libnacl-1.7.2-r1.ebuild 640 BLAKE2B 6ae693e843c14124d826936beb862e66c762fd1868b7eb37e09d9b68c964ee1f44366135f12d9d41fbc57a24a4a845c425711f5d38c4cbb1267c5e678ffe81bc SHA512 f1c8d48884817127620180bbd16c9ed001976343d52e94781d0e2a9f8f07a0952c22feeb65c2643f8b11c6528cc5dea1a82a3ad307980536431ad196fcc7f5ce
 MISC metadata.xml 496 BLAKE2B a01f3bd084333c8a79bae53afa580adbdde4154656a6a88d6a4b0714e0c752a9ec73677151e1f940abd040426f69dd30214909fc5c318fd13bc29087c6d36113 SHA512 56b52d188839a79fcdf0a341d18e7d0625fd05c48f2b376b164483999198ffd3b51328191462dc81ea29644cfa0025c00a7c8091041e16b1347cdab16b2b78ca
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
index 1c205a0ee370..e5cc5e684c1e 100644
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="dev-libs/libsodium"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 7efc5db282f0..d159a5dfb7f3 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,5 +1,7 @@
 DIST line_profiler-3.3.1.gh.tar.gz 56700 BLAKE2B 030c0fc742a6773ebb55a54a3c21d3d5e5d6d5d258a2c3cd2071ff93917411b65e100bfc6549d9c60d9a7c361c53b291d8b81538acaf5b83665c04129d25bc02 SHA512 8a3704a6df2abe71283cb2da23b738932c6f4b42aedcdefda0d318fd4b894d56831a855c4be4430657308530a04d1e96b0e15a60edca06621bdd5370c0bf9911
 DIST line_profiler-3.4.0.gh.tar.gz 49076 BLAKE2B 1fa2d7462913b21b5c3d69be64492fd5002d10c6c454cb3129860e4156cf04fbbd839b140f229b586ff9f0b195baae435bc461c4bab1405c38da49bf348827c3 SHA512 79a6e71ec083aacbc95fab5e044a2a38119bced505e5b9720288e32103773dc64a8bbbf6c2c7913b7b5057420cb31c3943cc1dce2d7d029df82b6b59e451c357
+DIST line_profiler-3.5.0.gh.tar.gz 51142 BLAKE2B 1dade129a8913f6fe42fcd646c1f8850b5a948bad476755dd54bf04815e293508d77b9160157623a6060a864722c81466690722b79a603bba9b7651ba3e7e25d SHA512 4c797bb9990e77a5ef8cb38113fe28c4925a631ca8f034f33fe2aeeeb77bf9b24cfc1fb6217ddec07b767a2dec325f388e402ca38da43790f58c644a4a147a75
 EBUILD line_profiler-3.3.1.ebuild 1072 BLAKE2B 6b412fbfd938cf1a646c17aed4cf97a308e8d5af97791ffed24ecdabb3b93e3fdf5f7da2b866cb2023dda6bfeddada7bbf79c9f7d408f5369f383b4924926f48 SHA512 12d0eb3477bd386b3394ad9acb65c5dd120fa67fc8928072aa5da84758a72dd4e11e2c7e3dd69873d6a45a2748709cadcd875c7b92747997d8ca18e7367b8a62
 EBUILD line_profiler-3.4.0.ebuild 1073 BLAKE2B 171915773afd9869541a1be2f2e32136d30012501fcc264ced89f882d4898e4d65f013277a75c409c42d469fba5e3e957dee496122fd7d6d72025355e729d6bf SHA512 f450adefc1c623201ee85cb3beac0a877cd1b30706dd829cf3b5452e5457a18e3fcf9bf1729d4ca7e3a9e7d516fd7bf4ba17cbe9b2f56448a4ec9a0da34ba0be
+EBUILD line_profiler-3.5.0.ebuild 1004 BLAKE2B 3ae5eb967e59fa65ad0b2d7e7c17f0d6a20f1e768d80eeeb817474e1d3f9095370fa8b48c78d1c05c8c195748d87202094c58eb805dc6bfdc10a4da384610d46 SHA512 bbc8f218be66e5c0d8dc7f206901892aa516d37fdf14b301c3b335d5ac0f3041eaa092642223b1b143544f4bb59aebcbf98a6515faa249023726734ed763585b
 MISC metadata.xml 775 BLAKE2B 6d817146b4f2379141f3def2ab8cb2d69f40e1e7645e714c09ad30a425d14c85c50749ffe2c4d6dec9bf146e294caaf8a1647d2a15d672667932ca7543d0df59 SHA512 745e91051af76df1a7344923dfdfad748fc11bf663c60f3c83a5d434ebfeb218ccc91a314244008bf6a39a4be77b3b3c5457739e1102ba188ddf7c8203b75695
diff --git a/dev-python/line_profiler/line_profiler-3.5.0.ebuild b/dev-python/line_profiler/line_profiler-3.5.0.ebuild
new file mode 100644
index 000000000000..a631bb642adf
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.5.0.ebuild
@@ -0,0 +1,50 @@
+# 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} )
+# force it to match scikit-build
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="
+	https://github.com/pyutils/line_profiler/
+"
+SRC_URI="
+	https://github.com/pyutils/line_profiler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+"
+# technically, the package claims to support non-scikit-build build
+# but it's clearly unmaintained and broken at the moment
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ubelt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1b0521f1b9fc..29341890e477 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,12 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
+DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.0.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.1.ebuild 909 BLAKE2B 75a0e073d22d2a8afc5a3074c27746431d4fbd41d115f91502994564da1428924dc5ecf92a0311879ab2579b0c6ab272a14bea5c143b087bac0966c3ce3704cc SHA512 f1c3c88c1483b3e9813b897b4386ce850f143b418d30291319214b57b4557caae8d1f577398bccba38cc7884b61d02b06bab29faa4550204a488f2b32957ab72
 EBUILD lit-14.0.0.9999.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
-EBUILD lit-14.0.0_rc4.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
+EBUILD lit-14.0.0.ebuild 912 BLAKE2B 8c97416bca64d16cd0ca09b93e3012171f2febccb93e78e6fe65ac4d0a7758f926cb5e7a39a470456e9746055b3da9c29290b226d597430fe21535421c97cf8d SHA512 d18c4e602580097812614746fe0e2f6670bfbae0d5a99b9012c1f44e9e4bcb85b64eac0b43f0b9a16d4b615ef22654c470f379fe32e9789f98d4a1b09276e02f
 EBUILD lit-15.0.0.9999.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-14.0.0_rc4.ebuild b/dev-python/lit/lit-14.0.0.ebuild
index 89c5315a5acb..575c98bacff6 100644
--- a/dev-python/lit/lit-14.0.0_rc4.ebuild
+++ b/dev-python/lit/lit-14.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/littleutils/Manifest b/dev-python/littleutils/Manifest
index 6c66d86ed1ab..315c8bb7c200 100644
--- a/dev-python/littleutils/Manifest
+++ b/dev-python/littleutils/Manifest
@@ -1,3 +1,3 @@
 DIST littleutils-0.2.2.tar.gz 6579 BLAKE2B 80aec2c133e39eb0e18c948b15d475e60842689fd0e758c43511a8b014648d7c9e843182e2a87c0b3f9933f748340f2059653f0885cf416edbc5a60457c70629 SHA512 ce0b3af4ef5db634ce0dbb916deb767260f66418abbdca2b289386ecd4c2e44602cb95d568c70588ef9a40e3d700f33cbc5bcdbf859f5030795f79f11871a6ff
-EBUILD littleutils-0.2.2.ebuild 538 BLAKE2B fe7f65858d96be4010deed9d172ddc6686d400ede079c00a57eb4342cbf640a2db9f17d43e03c38c67a29c854d01eecbbfe3ac1e3b74d4366a6079bff09e244a SHA512 84fb988b69c8b2856385c237000ae09d33c4cd33b71177e25ab5e55c7681badc4e9799a193f11d7fe0bf796ee2384c3379f42960eb5a5e09ec34dae7fb7622eb
+EBUILD littleutils-0.2.2.ebuild 537 BLAKE2B 10845e86fdbac735124e01bc963e8fc5e453201d713212728829e2f5af86b83431613f342d7abcc427101d303f9f2d6adb1c9e934c38a8bba93a25430ee1788a SHA512 0bb233a6366689452f0341e6e2dc0530903f5dc6fd4ccfa2d8f54be064f1a7af26819a8ec8f53e86e6e0462a3509921c196c1a972157b6898862322103c493b9
 MISC metadata.xml 377 BLAKE2B 938ada5473ba95941149e039ca17670238b722cb2ce2301ae55866a8163b82739b25820c9efae9fd1eb3ec8aa6efd51157b8d154438913fa33acc36ca1104483 SHA512 479327bb6b306521010cd65854f2d5cd7627b7887f51d7dbebcfffec5205a0a8d88ccf6c67cc2f9327bf6cf10b5053d218816bd48681bc8888cf0f53889cc703
diff --git a/dev-python/littleutils/littleutils-0.2.2.ebuild b/dev-python/littleutils/littleutils-0.2.2.ebuild
index b74cceb6fe8c..d59c7dc07dfd 100644
--- a/dev-python/littleutils/littleutils-0.2.2.ebuild
+++ b/dev-python/littleutils/littleutils-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 python_test() {
 	"${EPYTHON}" -m doctest -v ${PN}/__init__.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 71b929885e88..0a487be04f16 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,6 +2,6 @@ AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2a
 DIST lxml-4.7.1.tar.gz 958025 BLAKE2B d48a7aec9537235207fa387af7c49fe055ffa8e03bcea3e59807dfe35c72f1b1e01586aded550b53d5b7fac733baa1d47fbeea8fba937844de6dab10e02a3832 SHA512 33c88ff07152437a09268f3348ada97549686b5a59e2135631991ecc79ad02f35c20aae5d8363d2795bf058b05ef70fa6fbb56b081308cd89b073e176f4872d9
 DIST lxml-4.8.0.tar.gz 959376 BLAKE2B a40be5e058153e1dc3f8501b645b0211f4498928ed71b161df54a67501356e9968064401b6d17e17dc8d62223b29e794eaa2bee7ff78ffee203d9f9a22f3e1c2 SHA512 bbcd8ea001cfa2820dcac4e00de6ded81700b2f0bd4a58bcdd4da05a19a107f57cd56280c4838fe19ee7ecd6be105878bf8c2f1c0e5111899c4ad1a2ba03537f
 EBUILD lxml-4.7.1.ebuild 2643 BLAKE2B 0eba2e12108dc7b1debf04912682524684a35fde4458e196cccc06cd42c914a1904d802c25468f91425d1fb566ee8a62b5afb7153e122b7ec59aedaa1e697699 SHA512 72d3f6ff99ec404f2396b60083c3ea883fa00b4c01380488fb8ee7aa21714728b2c9e5b83db58f625ace4bc10d39cd261730e962b95ab7071612d61098757e8d
-EBUILD lxml-4.8.0-r1.ebuild 2771 BLAKE2B 01603dd16fc8106628e0364254895b4dde812510a0e14588daeebac5bb1cc4b499d9ee51e7058aef21c8826dc5b3d539e95e1353d03036e843a90269f842b600 SHA512 beee8b19b3f42b5c69ee5ea4971dda308aace2685dc40d2c23672fccab18f67ff434b4293283ba36a9c4bcc114eec82f829767f69edb585de1621c885ca67f59
+EBUILD lxml-4.8.0-r1.ebuild 2764 BLAKE2B e3b1c677a670643444def2df6450eff05d31fd0ac03e44504cbec4aaa7557a87449785774de62293db6bbb5018c10b6656e474cf8044a2e458db9746b9f89479 SHA512 08b4a92cc2a07871997095effecb8a6eac32b5af1578d241b3a630d3e48322036c8c5dedbae17b80b5d24f52f4dc53f42c730750b9bf290d1e2332d859907cee
 EBUILD lxml-4.8.0.ebuild 2651 BLAKE2B 3943071d73535c50312a3f1d7a54117848bbed0ab50513e2a1ab9db60286f93ee425ad0f7b34aea83c65499df261da8ab0f2d522e23c3aecc37624b1cadcdeb9 SHA512 3e8216f025f490516caedcdfa960a194bc456e0f09d5f7389dca5b3c8c5acf1dda6c687f26fe2290764f8eff19ce2f0899a1d1eec2ac232c409784534fb96e81
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/lxml-4.8.0-r1.ebuild b/dev-python/lxml/lxml-4.8.0-r1.ebuild
index 62574e22e13f..95b8b1160b32 100644
--- a/dev-python/lxml/lxml-4.8.0-r1.ebuild
+++ b/dev-python/lxml/lxml-4.8.0-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 9a2dc4e3f409..61526c346b1d 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -5,5 +5,5 @@ DIST MarkupSafe-2.1.1.tar.gz 18668 BLAKE2B c15bddc89bec9a6558b797b825314d9db3ac0
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
 EBUILD markupsafe-2.0.1.ebuild 645 BLAKE2B 1774cf1a543d05bbdd7c2ba7bf08c151c02a51fc0677ec462dee1cd92880c1e928509387b80368e72a426a8d792a6a6caaa6aebd8f4c4c80f6d6fb32758ee870 SHA512 6313433cd4b4785de1d23aefc6af8e935cae6cece5488eb2175fb4c4c0daab2e9e53ba018d85eed31772b60e34d38a40b6c64339d0bbad70d151f8ac2e2f84c8
 EBUILD markupsafe-2.1.0.ebuild 685 BLAKE2B 88235db4b43f4bffa8fb818b4dfa07b961fdae8d54b9cbfbecee53923308e02b2c7f096e5eb8e7e3cbf14c34fba4c618b0f0acfbf22f62fc07a6c3985d7650dc SHA512 42a3c18cfbfa221c2ab830a18716f7b667880bb42cc0da8e176407d840f055cfb02fed817eeba6863922b05946b7662813e2ab0404a448fa5a69b8d99fab6a16
-EBUILD markupsafe-2.1.1.ebuild 685 BLAKE2B 88235db4b43f4bffa8fb818b4dfa07b961fdae8d54b9cbfbecee53923308e02b2c7f096e5eb8e7e3cbf14c34fba4c618b0f0acfbf22f62fc07a6c3985d7650dc SHA512 42a3c18cfbfa221c2ab830a18716f7b667880bb42cc0da8e176407d840f055cfb02fed817eeba6863922b05946b7662813e2ab0404a448fa5a69b8d99fab6a16
+EBUILD markupsafe-2.1.1.ebuild 678 BLAKE2B 92003536c91a33035eca366fcf18eb6d3f186a6d9f7a6ce00029ae37f86ff6937db41af7ea0f696a38ba6696e40993098f9eedc1a4c3fd860fb26fc89fdf40be SHA512 fd332df0e4f76908d7fe64e9099afdce7f4bc3ed458025d1a18135b06e145e20a78431af65bbece45cc6d3ddc10b53d8065e8c091e775871047db0f35c69cc6a
 MISC metadata.xml 314 BLAKE2B 88acc343a3395dcf3833ea690d3e5f7992abf67c6ab16a53cb039d253cc17302b24da6751d5706ec3c3495cef37494028de4516a7b3f25c78780d23ace4a0f72 SHA512 f240b32e7c30116769eccc16b6746e29bc28931dfff65bb3020782be3abc7791c7464a3a686ca076ccf371ef6280c2285d97e55b522d88d07babd843a51b4fa9
diff --git a/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
index 29487b01ac74..e2a6ee77f14b 100644
--- a/dev-python/markupsafe/markupsafe-2.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
@@ -18,6 +18,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 11dd9d08f5b6..0e004fe95dc3 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,25 +1,6 @@
-DIST moto-2.2.17.tar.gz 2013217 BLAKE2B 6fe6dd23e96fe8ba210fc9bbb400ced7c27aa6626097c523579482d58709fbf2d22e217bdab604017ee17c45b4093c8106e15e5894484face28c07bba85d42ea SHA512 73dfa0f15afd299e2c5b4c7833a73b1a7537248b8b332258868bac01890c1861e9a62b6fb634d795d4e37e5505cc51008f1048154044a8238049de5b21f31251
-DIST moto-2.2.20.tar.gz 2077649 BLAKE2B 595d9536b21ba442fcf0b9b40e61cc9d3105e220661f67d842cd5e9660ed4ff561e0ea742083e167ef11312b762b204e82381550845a06d6b5a694793adc0c67 SHA512 ac853989ec4822a72139ed62f7bc8b01a91ef2a424b4e622fd0cc6828b3dd21d3a433ba8d50cda5e5b4c03859653d71f9431b7ce2416255be3cf129b1a02e200
-DIST moto-2.3.1.tar.gz 2088810 BLAKE2B 9e1b50bec4e0a7a0bb7496fe90e8caf0b80900e35120aae931e99e0e251bd4905c7bfed670a78d230abd987d3400f93fbbaf0bcdece9d6b5e35c4b63916e72c3 SHA512 122311e549b034b0a45a1cbfbc4fd96e0c846272d460c72279a7991b967720e1732662e623acf6a5f1cbaf874f5755bcfa9dfbf8a0ac31da780de44d42e6f1be
-DIST moto-2.3.2.tar.gz 2095242 BLAKE2B 17b98e09c410e48cac60ca494d6d0a6264657e8df994c0395be15b072dbc998a59b25d017b2897cd2e05429959baa427358b4f11cc3b7a517f4f4ddb88d2f2c5 SHA512 f58b9cf3f0a88964776fc92e4982408f0826a2d0149cc84cc21752030d8c9d3de3ea1a07cb529ea4d77b0d2a5ac5222a6ec24f6b88e9d7d70cc82257b883bd10
-DIST moto-3.0.0.tar.gz 2012729 BLAKE2B a1f53301c08d4ca0df55e1b4233a63a2bfe011b47ac6be992714e3f57f7e4cc50aca72917ff4132001c10870bbe08c0ca32e2b48e5d676f670345478ca846aed SHA512 e5238fb5e720f91999d4f0473d9833a3e1de3632401ee647858afc4e33a46981e866a51b353d1c21b92926da7267a5ba74ef667364ae99b09efd4f12d334e03e
-DIST moto-3.0.1.tar.gz 2028942 BLAKE2B 28ca3d59fff02b0afc0efc85db0fedbf1284131d48efb839aecf80c075da0e61d5751eb80588344948129f6b59ea9794adeacdca95e06be2e51367a4deb41c19 SHA512 800eb64f77e4c7ae62b056bb8d82de70c4a1044820314269b5dc3133d6b62a3a87d54bbf672a0845709404bd6f3e8d85c5cabc05da4ee2aa96b29cafd18aa6bc
-DIST moto-3.0.2.tar.gz 2043877 BLAKE2B 5b7b8c50499723f9a658af3a261b8cfd1b9e2a2b2f3e4925f8a0a78d07402e75a715bc87d84f0af8cca69db950937edb193af3ed5798dadf21c9e25aa0e47e27 SHA512 41f350241bfe917d6511e19b53317d15e53bd09267aac21553fc52455fa15d2a9543086d82030e701a394b47039c853d0f89f2dde2002cb6e3993ebcb0ce587a
-DIST moto-3.0.3.tar.gz 2071948 BLAKE2B 4b697e96c6e3db7b0582bda727b40cbaa9487b6205e559ec6a5d12b98e33221b9a4b5016701e116cdc886c785cc0ab5d5a5cb684ba30ec27b7987b3ce636bdc8 SHA512 1b14d8a5101103d31136fddfb12c4d6251aa75487347b049ea96baae662528f2f557fe31a9af1cce544fa97d02710ab66f5ee517540bcf137965bd2fe3ec24fa
-DIST moto-3.0.4.tar.gz 2204895 BLAKE2B 2b058b1b71fa2d74ca8b804f2bbc39a0f9505c8588ea602d73957ab3467b0ce7861078f479890a0668aa507be374af90fe8c2b48b9d64cdbcf26d4a9375f585a SHA512 71defd799c1ca14cfe2c119a309974a499aaf3c068bc88dfac535dde608c583a073a55d3a3d217f12ba086cc7366bf6bdf6c286493d81e74c65d673f600e4f49
+AUX moto-3.1.1-32bit-time_t.patch 2672 BLAKE2B f83b1eaf96cf79396714e1f335dc4a18b288fba36acc9b71b69e0fbde793dbb4b3c6751e4a5cfc08d6a9918268e9c9cd86e7ae12977d437b5fc3a5deea2f2c02 SHA512 16e40775c2c1ce8b13e015da8ee5ce0b57b04a4d557aebea9b592a18f23f291e1190f8565408d18a643fee0da34efc94b3252ab706b94149538a93ce646d0141
 DIST moto-3.0.5.tar.gz 2219507 BLAKE2B 019e0f66d8a183f9d758c372252488e79692e140db19820b568279148d88181b944f547d3a213072a29fb61115b73b40b656d3a0657078c54ca1c6de001c65ab SHA512 0529711897a25ff969bf945abfda9e86ab0a310b6b273240b35c981960e04ed14f879a4a86e2251f9824d1d5bc9241afe4a0b964981c8a02a176bca459025359
-DIST moto-3.1.0.tar.gz 2231450 BLAKE2B 05a4b547b12d5a57b3d622918dc9d8d8f404a112ca1379b63c227386b6cdde3dcce0dfba6d831ff9c8c9e920f0bf7cada1218be537527a9aed19078985a31e82 SHA512 40d3bb242ac34575193a2087ec3ea29a3811cc71edd77de7bbc52872c6fc3e2acd816ebc99c4e0d2e5821916c2321c23ce98a8f71668bc8d82a733fb88e6270f
 DIST moto-3.1.1.tar.gz 2236948 BLAKE2B 8ab52a59dc09f4819c1169d26fd198b13159635c2571fd27e38eaedc0a83fa5e7af0a7adba90db1c48658a849ff0b17e8d9c9750a47c6981960ac786f3d9a4e0 SHA512 2354886a9b3b46bb33b832495a94f1dcd10cf5cb00454b6e8b6b6838618842ca06f8577c1826bca02a10e2f723cf474a7c492cd9fb587bdb660deb118c17aa4d
-EBUILD moto-2.2.17.ebuild 3450 BLAKE2B b6528d80e6091807726516cfb10fc63b1baae5622f9fbb75027f3bd86fa698f01cb3abe3f7c553183e6c877fc378c52c6ac25fdfa29164a674637564aa683d5f SHA512 81e97ea64d7d82f8d0af69cfc557fe1736216760a425a679509b5d27f4a12e82686ef7692f94574ccb5a8950a6ba1599afb8b572141dbd2a86f02671bf326af8
-EBUILD moto-2.2.20.ebuild 3432 BLAKE2B 725ac4d31314e1ce4c4ca8ae3b8e5eedc46e50723ba97dd258386a93852366edd3488a5e5b627f7938d313f558b713a1832691a89c1c8a71ba0bc67d4b92b6a5 SHA512 b1b61412407c38fe3b4bee0797815ed71c16270b6c9b1eaf985ceb8b4a0d132b76cb9e9caeeaa1c5da959ae0f5b9c8a9b1f72ef4467ded6c2c35073a40b5498f
-EBUILD moto-2.3.1.ebuild 3431 BLAKE2B dcbfc021b43a33853b9438033a43d75973a4616b39416826f2370a02edaff7a4999eb3d63fe63f779a05962a7b559dbb3e9b4ed5975277a03e9181517ecd2fb0 SHA512 23ab5de3292bcc4474bb1e3c92180e6d8adc702b15682aebc53002c38fa2c455e09de34187db9f753bfb8ab1f3aef4c8e12ec55af758ad87180c9dadac4f98fe
-EBUILD moto-2.3.2.ebuild 3543 BLAKE2B ae6cda764e663f1482cc5b60da1df1e362b752184983656bda8677eff815465915425660ec82b9961b88939318a6436de808ff55007a649d792a4257e1d42a50 SHA512 fc00e88c2151afcdddc1cdbfb4b1194dad26db2f724fe2e12abadcee4e45f259144da3bd3291807ec2581bbea2a07aac977e995f87e3d4d28d4053f7f7f5bcae
-EBUILD moto-3.0.0.ebuild 3477 BLAKE2B dd45f69049a0eed5a9dc4321114a3d4e855e1a25b24b2db2cd8ecf75660bc8a80741aa19f17ba7a147bf70986ac2999fee68c0b7aadfe73e093df5499f82cb73 SHA512 7a71df5bd07bd6a657d49711f2e1c3c32c391632d2fccb32f26dfcbfefed49a2553e632d3e12b230d82774463dd08d55be674d83c68d1d76fc99f93939c8e97b
-EBUILD moto-3.0.1.ebuild 3484 BLAKE2B a319d832a541d435cb16db5aec2986b454386266620f7f87cd73875ddd471509ad467d1952fbae22c4faf4b77364c3b374bd81a3cecea30936396d28b3218f30 SHA512 54342c862a04f72e046660cd5a5ebdfa0bed2579de9a7d599739190fed9a0778c9d36f38580b5d90dc1e7e7f778297d41bfb796ce5b34c8f7fb6536301d776eb
-EBUILD moto-3.0.2.ebuild 3484 BLAKE2B a319d832a541d435cb16db5aec2986b454386266620f7f87cd73875ddd471509ad467d1952fbae22c4faf4b77364c3b374bd81a3cecea30936396d28b3218f30 SHA512 54342c862a04f72e046660cd5a5ebdfa0bed2579de9a7d599739190fed9a0778c9d36f38580b5d90dc1e7e7f778297d41bfb796ce5b34c8f7fb6536301d776eb
-EBUILD moto-3.0.3.ebuild 3483 BLAKE2B 3b2da25a143f402591a6a965dcb422243fdfba25577f3b542378a1808f33c6345bd5182506e8d45dabc026429641ace0d8be4f72b6997f2032d8225ba9ee5c5c SHA512 8bc24dd9d7d2a16348a4d92f3ac2f7784c80bdbedfa4b19c33768c44beae7d64fbbea659fbeda6fb94a957b463ba1ef36b399a3a571c802385fdb7aa2bbb3a13
-EBUILD moto-3.0.4.ebuild 4021 BLAKE2B 2920086d5f10c8aeba35cc1b97a13994c4a9d9ec91362c6485d02d71ad379f28983a2b2d597076c27022b15312e35e96f4fd5f4c21c76f054c91587fb0c4a4cd SHA512 9e6e0a9355178b87a42e8beadec564c9e3e1af5ecfcb5e3d9deaf347323f2228204e8f869023ba5278e5b696f57450055b314e855bfec08ea1d1aa1e644d5fbc
-EBUILD moto-3.0.5.ebuild 4021 BLAKE2B 2920086d5f10c8aeba35cc1b97a13994c4a9d9ec91362c6485d02d71ad379f28983a2b2d597076c27022b15312e35e96f4fd5f4c21c76f054c91587fb0c4a4cd SHA512 9e6e0a9355178b87a42e8beadec564c9e3e1af5ecfcb5e3d9deaf347323f2228204e8f869023ba5278e5b696f57450055b314e855bfec08ea1d1aa1e644d5fbc
-EBUILD moto-3.1.0.ebuild 4021 BLAKE2B 2920086d5f10c8aeba35cc1b97a13994c4a9d9ec91362c6485d02d71ad379f28983a2b2d597076c27022b15312e35e96f4fd5f4c21c76f054c91587fb0c4a4cd SHA512 9e6e0a9355178b87a42e8beadec564c9e3e1af5ecfcb5e3d9deaf347323f2228204e8f869023ba5278e5b696f57450055b314e855bfec08ea1d1aa1e644d5fbc
-EBUILD moto-3.1.1.ebuild 3933 BLAKE2B f3741e4cec6532d334d673975a94d2ea557dd920cebbe52d42dab26bb882ed19377735b3e3224cdc8d5a3e0fc1f412a29e69dd7a4c3d3a3241f9dd88606de5cd SHA512 d881b2adf946a2f1a0f6e14d68a5a3565e03459b57d87a185c83b403288a77461506c49df2b145701fce48a9a14405a68e59384e629257b324f01b4c6ec5e753
+EBUILD moto-3.0.5.ebuild 4140 BLAKE2B b4bf0790620a560b228fccf99e0035fe9fdf58af326537f37d45ff0abd3f8ddf929062c348dcf39ea78f379b24d79ae1b102d1fa65c340c8bdcd911f71e71404 SHA512 ba1fd72d320c33566a46e1529ce4d1ea18622e0f91dc4f0ddb101ec9a8cdd5f6feccae97cd6acaadac0f4cbf4fd50e80c84c5c5d960ddbea81a36d40ac67cf40
+EBUILD moto-3.1.1.ebuild 3440 BLAKE2B 39962f6d7c6c4afa396c6c8fcb0214fd21b752e94f99533e6183a75be845b2b4d70a321905df41de36955e84e72161c50336b5753fca67deb19fdec95ed6983d SHA512 b41d702c3330cb04698e4def1f33d56300f381a2818f0dc33b0fa471a1f43c7837230daf26e4df6d40c95f1ca89950d29ec2a639512af59a5e4431e190de3a6b
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch b/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch
new file mode 100644
index 000000000000..f4ab312f0332
--- /dev/null
+++ b/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch
@@ -0,0 +1,68 @@
+From 878ce5bfd58060324fe58cb0a84653c02d895be4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 20 Mar 2022 10:19:18 +0100
+Subject: [PATCH] Fix test failures on systems with 32-bit time_t
+
+Skip tests if OverflowError is raised when boto3 is processing
+timestamps.  This is a known limitation of boto3 on 32-bit platforms
+(https://github.com/boto/botocore/issues/2355).
+
+Catching OverflowError is the best option here since some 32-bit
+platforms (e.g. NetBSD) use 64-bit time_t, and others are working
+on providing a switch to the 64-bit type (e.g. glibc).
+---
+ tests/test_acm/test_acm.py         |  5 ++++-
+ tests/test_budgets/test_budgets.py | 14 ++++++++++----
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/tests/test_acm/test_acm.py b/tests/test_acm/test_acm.py
+index b48897c1..6594787a 100644
+--- a/tests/test_acm/test_acm.py
++++ b/tests/test_acm/test_acm.py
+@@ -160,7 +160,10 @@ def test_describe_certificate():
+     client = boto3.client("acm", region_name="eu-central-1")
+     arn = _import_cert(client)
+ 
+-    resp = client.describe_certificate(CertificateArn=arn)
++    try:
++        resp = client.describe_certificate(CertificateArn=arn)
++    except OverflowError:
++        pytest.skip("This test requires 64-bit time_t")
+     resp["Certificate"]["CertificateArn"].should.equal(arn)
+     resp["Certificate"]["DomainName"].should.equal(SERVER_COMMON_NAME)
+     resp["Certificate"]["Issuer"].should.equal("Moto")
+diff --git a/tests/test_budgets/test_budgets.py b/tests/test_budgets/test_budgets.py
+index 578a7298..b3de3121 100644
+--- a/tests/test_budgets/test_budgets.py
++++ b/tests/test_budgets/test_budgets.py
+@@ -22,9 +22,12 @@ def test_create_and_describe_budget_minimal_params():
+     )
+     resp["ResponseMetadata"]["HTTPStatusCode"].should.equal(200)
+ 
+-    budget = client.describe_budget(AccountId=ACCOUNT_ID, BudgetName="testbudget")[
+-        "Budget"
+-    ]
++    try:
++        budget = client.describe_budget(AccountId=ACCOUNT_ID, BudgetName="testbudget")[
++            "Budget"
++        ]
++    except OverflowError:
++        pytest.skip("This test requires 64-bit time_t")
+     budget.should.have.key("BudgetLimit")
+     budget["BudgetLimit"].should.have.key("Amount")
+     budget["BudgetLimit"]["Amount"].should.equal("10")
+@@ -140,7 +143,10 @@ def test_create_and_describe_all_budgets():
+         },
+     )
+ 
+-    res = client.describe_budgets(AccountId=ACCOUNT_ID)
++    try:
++        res = client.describe_budgets(AccountId=ACCOUNT_ID)
++    except OverflowError:
++        pytest.skip("This test requires 64-bit time_t")
+     res["Budgets"].should.have.length_of(1)
+ 
+ 
+-- 
+2.35.1
+
diff --git a/dev-python/moto/moto-2.2.17.ebuild b/dev-python/moto/moto-2.2.17.ebuild
deleted file mode 100644
index 61bae22bcd59..000000000000
--- a/dev-python/moto/moto-2.2.17.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.20.ebuild b/dev-python/moto/moto-2.2.20.ebuild
deleted file mode 100644
index b0d11c5e4c29..000000000000
--- a/dev-python/moto/moto-2.2.20.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.3.1.ebuild b/dev-python/moto/moto-2.3.1.ebuild
deleted file mode 100644
index 58a1b03ef936..000000000000
--- a/dev-python/moto/moto-2.3.1.ebuild
+++ /dev/null
@@ -1,87 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.3.2.ebuild b/dev-python/moto/moto-2.3.2.ebuild
deleted file mode 100644
index cdc02be77366..000000000000
--- a/dev-python/moto/moto-2.3.2.ebuild
+++ /dev/null
@@ -1,89 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.0.0.ebuild b/dev-python/moto/moto-3.0.0.ebuild
deleted file mode 100644
index 7242900e6ca3..000000000000
--- a/dev-python/moto/moto-3.0.0.ebuild
+++ /dev/null
@@ -1,84 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.0.1.ebuild b/dev-python/moto/moto-3.0.1.ebuild
deleted file mode 100644
index 2d5483694a4e..000000000000
--- a/dev-python/moto/moto-3.0.1.ebuild
+++ /dev/null
@@ -1,84 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.0.2.ebuild b/dev-python/moto/moto-3.0.2.ebuild
deleted file mode 100644
index 2d5483694a4e..000000000000
--- a/dev-python/moto/moto-3.0.2.ebuild
+++ /dev/null
@@ -1,84 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.0.3.ebuild b/dev-python/moto/moto-3.0.3.ebuild
deleted file mode 100644
index a67cd1e6cf1f..000000000000
--- a/dev-python/moto/moto-3.0.3.ebuild
+++ /dev/null
@@ -1,84 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.0.4.ebuild b/dev-python/moto/moto-3.0.4.ebuild
deleted file mode 100644
index d9f4f6d9952b..000000000000
--- a/dev-python/moto/moto-3.0.4.ebuild
+++ /dev/null
@@ -1,91 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		# broken by new expat
-		tests/test_sts/test_sts.py::test_assume_role_with_saml
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_not_rely_on_attribute_order
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_respect_xml_namespaces
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_retrieve_attribute_value_from_text_when_xml_tag_contains_xmlns_attributes
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_default_session_duration_to_3600_seconds_when_saml_attribute_not_provided
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.0.5.ebuild b/dev-python/moto/moto-3.0.5.ebuild
index d9f4f6d9952b..4c400131d65b 100644
--- a/dev-python/moto/moto-3.0.5.ebuild
+++ b/dev-python/moto/moto-3.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
@@ -55,6 +55,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/moto-3.1.1-32bit-time_t.patch
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
@@ -70,6 +74,7 @@ python_test() {
 		# Needs network (or docker?) but not marked as such, bug #807031
 		# TODO: report upstream
 		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
 		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
 		tests/test_batch/test_batch_jobs.py::test_dependencies
 		tests/test_batch/test_batch_jobs.py::test_container_overrides
diff --git a/dev-python/moto/moto-3.1.0.ebuild b/dev-python/moto/moto-3.1.0.ebuild
deleted file mode 100644
index d9f4f6d9952b..000000000000
--- a/dev-python/moto/moto-3.1.0.ebuild
+++ /dev/null
@@ -1,91 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		# broken by new expat
-		tests/test_sts/test_sts.py::test_assume_role_with_saml
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_not_rely_on_attribute_order
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_respect_xml_namespaces
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_retrieve_attribute_value_from_text_when_xml_tag_contains_xmlns_attributes
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_default_session_duration_to_3600_seconds_when_saml_attribute_not_provided
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.1.ebuild b/dev-python/moto/moto-3.1.1.ebuild
index eeea7c760e83..71834ad342e9 100644
--- a/dev-python/moto/moto-3.1.1.ebuild
+++ b/dev-python/moto/moto-3.1.1.ebuild
@@ -54,12 +54,15 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/moto-3.1.1-32bit-time_t.patch
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
 		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
 		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
 		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
 		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
 		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
@@ -69,6 +72,7 @@ python_test() {
 		# Needs network (or docker?) but not marked as such, bug #807031
 		# TODO: report upstream
 		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
 		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
 		tests/test_batch/test_batch_jobs.py::test_dependencies
 		tests/test_batch/test_batch_jobs.py::test_container_overrides
@@ -76,12 +80,6 @@ python_test() {
 		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
 		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
 		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		# broken by new expat
-		tests/test_sts/test_sts.py::test_assume_role_with_saml
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_not_rely_on_attribute_order
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_respect_xml_namespaces
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_retrieve_attribute_value_from_text_when_xml_tag_contains_xmlns_attributes
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_default_session_duration_to_3600_seconds_when_saml_attribute_not_provided
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django
diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index 83dfb11dfb1c..d0f142713771 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,4 +1,4 @@
 AUX myst_parser-0.17.0-32-bit-test-fix.patch 1273 BLAKE2B d1d46785f723a61bdeb6e4fa62b2d61aebc4e525128b488c749956708f5b51e23ae265d6811d4ced35a4b10e8565abb9358518dd27ed6b494706bf8ad1bf5ae7 SHA512 315e9b82a13bf599313e431d57b75308689a7ba649d8eec08c0bf489691399badab68ca449ca0c5d2fff96f96bd8e4ce8d18880781ddb9d0e393fa05cd515c51
 DIST MyST-Parser-0.17.0.gh.tar.gz 877372 BLAKE2B 00dea98fa9cd8770480047a824e18a903098600dd52cea427e1cf3a4ff0a4930502967e136a3c6e9ccb4a7f6c54c8c4c8f9c5bfc701e1b24a0006b867f8ce74a SHA512 e9f4ea05ab55b0979b26f0211603aee0835a30fb37a0ca23f23b96e0b47670b6b8e443ee9759df5011d009e20d817eaffd4066c4be4920f96786c283aa206239
-EBUILD myst_parser-0.17.0.ebuild 1378 BLAKE2B 930e6ba489b1f4236beaceb06871db16ea6e0892b6187d79060787ca552ff9e63d41685f8edc519218a47481c1e24d18c24004ee33196e91e17f067dd7eddcf2 SHA512 3dffd5d489890a05279026eb8228d94eee22f2f5e32782aa81b33a20775ded34ae9e2c8466e99551ea4eba7a7cb009b540c82607d341591698803ff7d43132ff
+EBUILD myst_parser-0.17.0.ebuild 1376 BLAKE2B 4e7eaa3c4c07795b2ce7278dd3ac1a12ac097c06cfaeaff2be7db417a4532c92128e72809324fb621cbea5e0534d32f6705e70b55b0c33dde097999ce5ca3ab6 SHA512 9714196c4dd0ff376fffeadbc9599c17433f0e687f06b4d3d8be23aefbdf20ea8de31939359d754458d3c4f633b3203b3d8e426f38cd7d94bc57a67da0660994
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst_parser/myst_parser-0.17.0.ebuild b/dev-python/myst_parser/myst_parser-0.17.0.ebuild
index bc4b72e42a42..e2a7f33c4954 100644
--- a/dev-python/myst_parser/myst_parser-0.17.0.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.17.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 43201d0f7732..19ec6cbd4b64 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,7 +1,3 @@
-DIST nbclassic-0.3.3.tar.gz 21924 BLAKE2B 382d41c2eeb6ffc9588b80c0bc84e7e8b581fc36f2628d46577ca0a6956c50086a7b9a3bccb1c318fc60169a0367c8c5e1c6bba56b0a35fa063768f8fa580d52 SHA512 74b765c842351b2a93e92850193db7d3ef1a0b11c0c25a9adb2d1b8f7a6f88ae083cc700cda004d874340443632e738a24d26349d661613a707ad6cc42abd709
-DIST nbclassic-0.3.4.tar.gz 22308 BLAKE2B e5adddbd89f22ea1391149d97484f34c3f4d1a7601e471859834a06f5294868bbb23e96a536e792599f5743b68cb72bb91c88ba1e79d4fb4dc0f1ad6ee78041f SHA512 fe18a3523f7cf6bb411fe2e78f6bd0313e18a8a63a51649c99bdfc11365e2d775b8e6b879da1326c5389ab1a69e52a267cafa905348fead74b24a1d5d65e8646
 DIST nbclassic-0.3.5.tar.gz 22668 BLAKE2B d7e74e1274294e9d0d8888d0ccb2718fd02d73eca22d29b3b944a1886f4b7dfd8c7ee893239856790f0b7e84e3c9102c27fa12cd06be8a4015b0197e3516d41a SHA512 a3b5b0b4f11be93adee4f8669127de0b1a5c9d38fedefbb924b7b446db9f0e7e0987b17f62f7d831d7a2dd87de605a2300973735a4d2b8cefbbcbab8403a3d1c
-EBUILD nbclassic-0.3.3.ebuild 961 BLAKE2B 9a76fe1b6414b64c5b47647d58452475b6efd28a052a7b9fe6c480f0715ed078b59c411ff89e7acfe6172cf239be64b0f0dbc55da1ce6ba58202f1c879bc2436 SHA512 1fdb2a3175fee83e53225e05ded32cb751ded41347322530ae063bc6d6037d78048d220a9cc9decddecb53c69d55ae5ee65fcc1ff3d28c4dd4bfc9d17adbdfa4
-EBUILD nbclassic-0.3.4.ebuild 961 BLAKE2B 9a76fe1b6414b64c5b47647d58452475b6efd28a052a7b9fe6c480f0715ed078b59c411ff89e7acfe6172cf239be64b0f0dbc55da1ce6ba58202f1c879bc2436 SHA512 1fdb2a3175fee83e53225e05ded32cb751ded41347322530ae063bc6d6037d78048d220a9cc9decddecb53c69d55ae5ee65fcc1ff3d28c4dd4bfc9d17adbdfa4
 EBUILD nbclassic-0.3.5.ebuild 961 BLAKE2B 16cf343bd564b66b477c86b5177217dad54c5bd5452b88022160a514aa479ac29d0c30c2d7ffef9bd9d0380c8d205259f4f0e9e0a519d99cd63d8abd348c9dfb SHA512 8a984443fa1840890f5c4955de691fc23cb066968ed53093abdcfda8be525ead9022a0962fa2aaa84cf37370a6c48251179ac8101a7975a29cece7f8e3dacadd
 MISC metadata.xml 410 BLAKE2B 0b5a5047ac30e2bfc7f85fa8d5243dc4d90f21b3ba4cfa88e6dfa08d8a063a49fd962650424521a436963a40cd4d2b54ca15326f29aebd3df158c4985d94cd26 SHA512 3ce674ac4b73cd15fba38ea29f8064ce2a5c5b77ae58cb0b046a1b9b9263a3149674a5e24d96f3517d6a5fc2cfd13d5de15090ac40aec4865ec0626e91b28723
diff --git a/dev-python/nbclassic/nbclassic-0.3.3.ebuild b/dev-python/nbclassic/nbclassic-0.3.3.ebuild
deleted file mode 100644
index 727c1391b449..000000000000
--- a/dev-python/nbclassic/nbclassic-0.3.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="https://github.com/jupyterlab/nbclassic/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv ${PN}/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/nbclassic/nbclassic-0.3.4.ebuild b/dev-python/nbclassic/nbclassic-0.3.4.ebuild
deleted file mode 100644
index 727c1391b449..000000000000
--- a/dev-python/nbclassic/nbclassic-0.3.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="https://github.com/jupyterlab/nbclassic/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv ${PN}/conftest.py . || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 4799942a7979..b5b4196062b6 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,7 +1,3 @@
-DIST nbclient-0.5.11.gh.tar.gz 75556 BLAKE2B 5c9e44ea1efc05457427ba6fb9bbb319efd5eb314ca4964e0df4b842faa3341f4f51ef74565434ddaf0dcf56c9e2a83ce7bd36ab6c50cc1d0349ecc50af75b51 SHA512 e4142dd28e21be7803651b8b7ed646e168a302edc2ec806b58fdd79454059fea3fedf270e1aaec6152433a15c2280bd38e4dfb0d740091a2ab2987530dbe3c6a
 DIST nbclient-0.5.13.gh.tar.gz 75335 BLAKE2B 02a1d7d84b51c3af81f4d511e3a68a94d28478d09241a174309d9338a10be9c2e7cc48601bfb844dcad979eca867890e96df47d0e2aa6d7f7881a2e899b79ab5 SHA512 cebb9c4216d4c1668908a0b332a32d63825e7c3cfcf78b3e918df16364a04a12c396646f4e0b215a9bbc40d1be907a361f90aff3721e299d17c852f8acec0d04
-DIST nbclient-0.5.5.gh.tar.gz 72661 BLAKE2B b2be54c03c12a2cdc641e329946bae37a7b8c1c4aee8ac686c6e3350f27cf7a0a2e64653afb8acac7e373f5cbbab05feba3c1c4d7e8856974621f0d1c96005df SHA512 3066f847c175ac26ab6918b71e84a8f87bc922f624011b707f8b0a6d872c123d7979a5ffec24a933b6f98a7f83bf530926ecccb5a1c6f24bd84b3fbda07fdf48
-EBUILD nbclient-0.5.11.ebuild 1006 BLAKE2B 93ad8436d3725b180c994b221d19337fbd20495256da637dc27f563d2295884ec69145e183c51d7816f6c392883a8f273ae73d412c96d0759c629ce805dd5f09 SHA512 27b3d652991d765129ef10d60a98b6d69fdd77c918471a0c43bf70eda09c9973d2e1261c3c6246440d2e9c41aedae523f25c9e6ac3f65078fe300c7ed092597f
-EBUILD nbclient-0.5.13.ebuild 1008 BLAKE2B aa47867ff684479eee57c19f462bd2d77e024eece2471033aea95ef06c5a3efe731a1e40b3a13e1325ada471891a95d091e49bdb2d47832728ba36b48db44002 SHA512 2329af027a08b5e1f2fcd949ac65f48823f186a63ee40a7502afe814f3a9b5699b94c5d5dfeb0683a85ac8a84212cecddddc225378da838624ce9a030f1a8b48
-EBUILD nbclient-0.5.5.ebuild 967 BLAKE2B a8c661f25d41290d13edee8518a0ff86a0ade4e855652b0e38858a0aa0cd299054aaa04623c36d9e2f99b7f3010b4178fecb438e91cdf4ef3c93f23b87aca53a SHA512 cd5b391f57f1c6aafb17901b728039f4c8eb6b4f0c3f986a0c296fd1190aaad09c977d7429038e473211838cec973560c48a75c71086a9217b5d84aec8449c2f
+EBUILD nbclient-0.5.13.ebuild 1003 BLAKE2B acd57e17097f4c31a83c6be486ea68e104d1ea79fc7ce935e08250312058c1b16e5bc77ad37dddbfc7d57f30c6e097aa28f769de6bdba2415e83d247b88f48ad SHA512 277f53437d914f2a942fba7598e8492e69fe4aa4449f2bfd9643d923e47201b6100fe5f62b5660ecbc1ab5a71fd7b318d5935cc75b2c09b782f79ae9aae6d839
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.5.11.ebuild b/dev-python/nbclient/nbclient-0.5.11.ebuild
deleted file mode 100644
index 3c26e9ba6a0e..000000000000
--- a/dev-python/nbclient/nbclient-0.5.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-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 library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.5.13.ebuild b/dev-python/nbclient/nbclient-0.5.13.ebuild
index 08b83a96fbcc..958c41f4405c 100644
--- a/dev-python/nbclient/nbclient-0.5.13.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/nbclient-0.5.5.ebuild b/dev-python/nbclient/nbclient-0.5.5.ebuild
deleted file mode 100644
index 842d2c36483a..000000000000
--- a/dev-python/nbclient/nbclient-0.5.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-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 client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 9daabb020f4c..829b7591c5f0 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1,3 @@
-DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244 SHA512 be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-EBUILD nbdime-3.1.0.ebuild 2508 BLAKE2B 226e7695cbd4609c7aa81a7590cdf07f033fb3c3670ab77bda26697c111f59e30ca2b003d6a3937f061be1284e493fd3a696a938c55301952dd9e8f6eccf0197 SHA512 aa3683566821f5dec4cc311db1677bc34bee6c256897fdf1562a77d42292378756a0736894131411549515ddad4415f88c0f95ab539eaaece41976bf23de18b4
 EBUILD nbdime-3.1.1.ebuild 2508 BLAKE2B 41aacea8bdbdbe4304f9cc9fcb52fe354087901f36771c431e73b8cd870b4d1ce9505ba00b5550a1741583d5105d23d3cb300c3f04b1190643ce4e5204752617 SHA512 ab48eccca7e1a364b4ae9640ada07252952f8ebe8f28c2c5d256a9c918f13c2631b90e0d0838e59daa115bfaed7aab50a9d2a0b359a84c0a210353da36038ad2
 MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3
diff --git a/dev-python/nbdime/nbdime-3.1.0.ebuild b/dev-python/nbdime/nbdime-3.1.0.ebuild
deleted file mode 100644
index 5a7c22168e01..000000000000
--- a/dev-python/nbdime/nbdime-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="webtools"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-		dev-python/recommonmark \
-		dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# yield tests were removed in pytest 4.0
-	sed -i -e 's/test_offline_mathjax/_&/' \
-		-e 's/test_api_merge/_&/' \
-		-e 's/test_fetch_merge/_&/' \
-		-e 's/test_api_diff/_&/' \
-		-e 's/test_fetch_diff/_&/' \
-		nbdime/tests/test_web.py || die
-	sed -i -e 's/test_git_difftool/_&/' \
-		nbdime/tests/test_server_extension.py || die
-	# reason: [NOTRUN] flaws in deep diffing of lists, not identifying almost equal sublists
-	sed -i -e 's/test_deep_merge_lists_delete_no_conflict__currently_expected_failures/_&/' \
-		nbdime/tests/test_merge.py || die
-	sed -i -e 's/test_diff_to_json_patch/_&/' \
-		nbdime/tests/test_diff_json_conversion.py || die
-	sed -i -e 's/test_build_diffs_unsorted/_&/' \
-		nbdime/tests/test_decision_tools.py || die
-	sed -i -e 's/test_merge_multiline_cell_source_conflict/_&/' \
-		-e 's/test_merge_interleave_cell_add_remove/_&/' \
-		-e 's/test_merge_conflicts_get_diff_indices_shifted/_&/' \
-		-e 's/test_merge_inserts_within_deleted_range/_&/' \
-		nbdime/tests/test_merge_notebooks.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use webtools || mydistutilsargs=( --skip-npm )
-}
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-	python_foreach_impl python_test
-}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index b65648b3e1ea..fd08aad50354 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,6 +1,5 @@
 DIST nbformat-5.1.3.gh.tar.gz 130922 BLAKE2B 866eb53dd3f04c09f4a08303c5e84b672cc826d2d9b369cd85038b6c4075e74dce88fbcae80fc9b5450faf1c4971d121abe35e0a2ce2a8e73e020d2bed3a5594 SHA512 b4bc3d51d6e940ce1e2b1f5ca1005cf3d466b2b7b589383a31c4d2908c4e539344f4c8fb9e92993469d4d66f363c35082f0c16b8a63aa61e19fb24fa5ac910fd
 DIST nbformat-5.2.0.gh.tar.gz 133519 BLAKE2B aa9ff18ff879fe4b85af6d552a7d2f44d10bb96366e7af15214f7ae4c9d193a24bee8d0dc0ae1b71da13f44abaf4093e412f32b8357b4846985940c002a17b7e SHA512 55718e84a5125f8c28c8cd1be0725669f4d56bc22e6dd92b907a0e8cda27e17f8f56aad29806ee9f1c2c58641dd80455f04241fe5a54f8b6309575bb7656fc87
-EBUILD nbformat-5.1.3-r1.ebuild 930 BLAKE2B 9cb9af7c657447b840fc6053b2dc13020b8e20befd350d00456ec10629ba8dab09b75577cb09781dc5113b77c5957275bcb29dae93f623dbacd4f7e36a6eced3 SHA512 3e14a86259f881a1f341c1f523b653f92c25c36634eed48ea0d422bce7c2d7342aede05ad5fc1aa85d8f863e111c1eef95bee41231e7c8ebe62b7a5ac55acc1e
-EBUILD nbformat-5.1.3.ebuild 918 BLAKE2B 8e208fc6ff06b5eee741bb9cc1f6efef28b7d5f30ea29bf7153bfbdb92b06f0af29b01bcdd5d91e9645914eed3283b8721e9073176b703f1cc1a99ff4477b91a SHA512 0a9172b6b19847d27403a4ca3c363f899364394f0f0fbb155cae0708a3fc9d1f5242cd1139b1b70df2ebeb550a2034b8af3c9587224f551c80415a88517a4251
+EBUILD nbformat-5.1.3-r1.ebuild 922 BLAKE2B dcbbcf1465eb24317cf56a1042c020dd39d810297fe7f00a9cc372b21810bd63239687ba1289415251899bc9d4722525c2f2722f96d00ac4189dd6693e55c84f SHA512 8e238f819ab89c8596cad50912b4e770ee87d6f370272db59bf8add9563f117ecc457c0d310a6121ad69b5ecd3fc7b044ab395df1e4296a28c96b6aad168339b
 EBUILD nbformat-5.2.0.ebuild 864 BLAKE2B 3ecf8643664a97dd62d9e7125ab6c0f3467838661b7bb57dce7d240419afbf063e7411a0dbbfb5863bda1c072566d93d3b216bbd68bde91bf6aad920ce8d2f93 SHA512 0776ed55aa2963de7575b543b4e7a51116a4eaa5c6ae52a185d44e560465afbb70658b8289698825ef000015754dc01d7f422057b2038b97b2d916e98ad8cadf
 MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
diff --git a/dev-python/nbformat/nbformat-5.1.3-r1.ebuild b/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
index e9c7277cbd9d..a3a30ece4f3f 100644
--- a/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
deleted file mode 100644
index 798393d1db22..000000000000
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index 0e6a88ad844a..8538a88bf272 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -1,3 +1,3 @@
 DIST nspektr-0.3.0.tar.gz 6314 BLAKE2B cb7b9b5b35a455d4e72e78d93db49b4f8e274c7d7a6c8bf7ccca52cce2598a937d31b76f1a30c4aa6d673e4ce52c4645ce7392965df35b0888d1c69226e08f00 SHA512 6fc22ad7858858f3b956ba5918ca92468f13d4b7db0e4861b836e63153f7e4319c6468e4f73969ce3fb7845ca8d97808b9db2eb2705a47fe1a8c4c19b9c2ef33
-EBUILD nspektr-0.3.0.ebuild 1526 BLAKE2B 2ae674a51e64b58d2bb7f4beb462566158efd9276741eefedc22035b2b9465b9abc94df8749514e8c74fcb266c5fbe4d5634ba3a41f4b83d18b51123c378f739 SHA512 aa776765741a1deb663b1fec5630d856699afeac7cac28a7c068bf09b0f948d0ec7b0ad88164c68fb9f13a0626c71e100411bdf6b419039d628af2918faac8ab
+EBUILD nspektr-0.3.0.ebuild 1557 BLAKE2B ba2e147088fc7a7585bd49bc440ca9b04aed321798523a7c5dc7133019d4f442edbc8dce6e1158fb48a2b7f2b231bf4f8387ebb312ac5019b19178e107b7d4ff SHA512 da68bd11d288ae1178c0385c822c57a73fcdfed35ace5ac99b78bea5d0be6ba95f43ac77aa92cb1797468e0e6e1607ba228f7abea903b9e617124981496e551d
 MISC metadata.xml 343 BLAKE2B c5ec4b6c1f41692875fcb9a93dea4c0f253339788b94fd667709898e2cc49470f113258137093fd29986ed8fbadf2ea64f95319c51568f12259b8869558bfdab SHA512 da052d5ee619430fbfc021b9eb8d3967dc4d6ca3ce0bc5c9b1badb067d7c0babe12abde3fbc9c4710bc6a0cf081e6bc445504b852ec714f819781e1c4780779a
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index 1dfff8ffd725..664b424a9047 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index c3115a4945dd..b725ec8050e0 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -3,9 +3,11 @@ DIST Nuitka-0.7.2.tar.gz 3754512 BLAKE2B 6d4dfbc51ab5144f5690864abd8ff1e143f9838
 DIST Nuitka-0.7.3.tar.gz 3784700 BLAKE2B 016c8c88c40c07e97e56c8a37f60c4a6a1a1a1b0895adba5110b508d07f8ae8561c295b5611408ad571e0fa2df7d874a9f5a4180f2d8a62eb355eb4bbc02fcd0 SHA512 d9c672310cfd05f054dad3cd7fb628415f78b0d8aa2551577e880f30fbc836cc08f49041b709b7b1ed41452651743a2d1ac719a6a214792cb749bc2dd6a3bff6
 DIST Nuitka-0.7.4.tar.gz 3785037 BLAKE2B 4bf1e5980071ca34059e5c4aec098a3ab2e2d33884f2bd4673972dbff490f6ed20b200525c3220d0652ede8c06374d0e086fee8c611e9ecd663c9ac4a13f016e SHA512 5066f01cb4ffc99550d0bef816201cb988180144ac9d0d4aa587fb894196c286c44a96637d956f8ef05b803d3bdc79f4d926ccf3db4a320eabd02fe5bd984beb
 DIST Nuitka-0.7.5.tar.gz 3785194 BLAKE2B a97a617dcf55fd12966b9e464398f5bda770a6bf7a026e90aa2adbe3ed43f1e0a6feb0741626f6eb24b07f5a8acfc1e17b54f53720a9a33f24f7da4fe321a9c1 SHA512 e31b2d4014cd533f916e5f023a9633d7f96ae7f4ca8da6bc3911dd23864c42e62f73d8f7e13345d0cdbfdfec0205be2ba75d6acbfd687949ed4091e978e6d455
+DIST Nuitka-0.7.6.tar.gz 3785026 BLAKE2B f8e3f58dedbe9688ae86741b61fd8a56a0d87ba8a2323d0379f09aa93aa954a4b8bc5f6aa736dc57bfd5bfeef2cc06ce76321d7af7cec585904111aaa86c0083 SHA512 dc30e29d671704f6be0c15a9da5d0122dd8b2ee1a764e0274529959cea0a6cb8d0e923027d91a7f4a58dfa2886a5d5a93afacf60354ced66b7f723310bedf188
 EBUILD nuitka-0.7.1.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.2.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.3.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.4.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.5.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
+EBUILD nuitka-0.7.6.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.7.6.ebuild b/dev-python/nuitka/nuitka-0.7.6.ebuild
new file mode 100644
index 000000000000..1a35fde421ee
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.7.6.ebuild
@@ -0,0 +1,49 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 87a9ddb5ae1e..300e0a306bd0 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.serialization-4.2.0.tar.gz 34024 BLAKE2B 709c71abeb9cf84d68dddbb5fc404401408b17eaeace13935bfd5e567899d087d4e5d5521546c3791e03c24591f64b182337d78f2d54d74e71e50922099bf4d7 SHA512 2a2c51d03432c35bf872b2da9c51f6deb764e38d86d5561843fe4f7a39af8383500b214039acb37f0e972141e7c9e5f20c457084e287498d4c93a89207bdd938
 DIST oslo.serialization-4.3.0.tar.gz 34114 BLAKE2B a123cdf8a52be65e5c8ce8073bd04db7013f88aae20ebbb8d32a8a4e30588d5e5c11ba8c60087264b0b55e98962172ecfa1030f48c223d52b6dbe814c69c9014 SHA512 78c8d08365755c2bd10fce1fbee403e3c8301bfe0f3b7dd9dccbd5aeb3e010cc00c7b295c3b33b472b50911f332aa3d40d761e49ca0252e522e9cd11017b807f
-EBUILD oslo-serialization-4.2.0.ebuild 1007 BLAKE2B 9cd8b00bc48bac106718bb72fbddf97354f4c604250ce4505ecfaf52adb48948c9be5847a9e76f4aee690f4a240bc5fce81ac5c55e947d2175a29c73efaa2250 SHA512 4a6a92ea4a6c1ae298f6f961235387597f9b26b9e29c0ac2f8b67937caebd87b758c4f095d7ee2b81fe9fc6149c90b1e1a56550dcfb943d13e13634ad508921a
-EBUILD oslo-serialization-4.3.0.ebuild 1043 BLAKE2B befd3cfc77a03fc3b16e86198dc8a7caf79e063bdc4b6b27a60d7eb88cf27833508960f219ca1cdf62c4a3b9f039188f88effa6dd94d00a6a0b5e9423660fa38 SHA512 ace85245c3959ad468cbd64b7f14244fc80fdc70a1ebdf12db41e9d6a2c3cfdf7ad9de7e56a49b7071418f0cd27e05c2b85d74c4316d8c7865b89bb04ad331a0
+EBUILD oslo-serialization-4.3.0.ebuild 1040 BLAKE2B 5d69725f3513e34d24cc5f0e98328f16e755f4bd63c2d9303c30bafc08b25cb9da34c15f7108b3212073600f8034dc8e07785f153be7e0548a2bbf73d98baebd SHA512 77d97a36efbfe3f290beac4b948dcb1dd46890f288b917179b57d15398cd819f23818ce038fad6d17cbb832ddeda04f0a40f87938008924e0685feca85538c90
 MISC metadata.xml 615 BLAKE2B e25d338d3ea1f94f81bfa5d225b1883ac14eeecb217ab0b4d8687bb8a7ddb35bd33e39d894444655f67bdf346cd394ad280aa511b8c291c4525265877ab75942 SHA512 a95c2e689c9f7d5a60fe1c4bdb9b78eaca78d78cac5ccb765696204122f65a21ea5285f6bbfb88cdbbe1042e69998872bc545bd2af1ab8765317f3a042860778
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
deleted file mode 100644
index 6e7d6b1f95c8..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-4.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
-
-python_prepare_all() {
-	# remove spurious rdep on pbr
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
index 7be2f3d2aa46..968510426ef2 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index c89623fb9294..dac4ce05810e 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,3 +1,4 @@
 DIST parver-0.3.1.tar.gz 29110 BLAKE2B da444a77907beac0bebd2dba812c8843052e27de1b8b802b5bdd37feb4ffe1cfdcabb84a91b6e6fe21275bce22e3b43736617df756570c6438af7ffd81a1ba87 SHA512 2ea7eb7be0c58657f5261d7b4729da6caaf2fac67db3fc3f36d29627bdbeba45f6ecb0e4bb251575b621908eb1ff5fa5ede5fc2ef0e041156dcc00548fd34360
-EBUILD parver-0.3.1.ebuild 818 BLAKE2B 72e1d8f5cc63b1ed2e57111656d0f48a44753801a8551d0c495b08adc3fb42929dc65af407c414fba57fc26bf3f49cd534504e0f0b382ad0c8365e11a618b4e6 SHA512 26baa5af6b7e7fdc35858b6f518f6dbfb8c394498896f24b001c7095a1e726f6712ebad15edc494f93a5d1c5f45801e20ab6b91f4f16a6b9102650f22f982571
+EBUILD parver-0.3.1-r1.ebuild 841 BLAKE2B a5ec1169a9b0fa920770aa66d07d8c11fe579e786cadfad02c8fd0597db0052337ba949c35af98b5ef96ce955eae8f3101337c1c980f956ba6a179e68c669c6c SHA512 feb94cbce12ef7156d9c954f48b82883826112103ed13ab71196b2180145e3269ab97bcd7449a0cbde4b1a5eadf0a8a66c925d17bfc90545fb85ad3b1bfb81ef
+EBUILD parver-0.3.1.ebuild 818 BLAKE2B b8e7ca11586b85130fdd503d8491829a57ba182591c851e934eb911fda1b94bbd713d1d4dc0c561225fb0863bdbbfb8b096628e429f825017cd2cfa74a814353 SHA512 905c7018ff31cf826dc915362ea839a7e9ae225cbc05a664de33346f26ab976a8f8e9a64567008f5b624254f3d3627b30971c0d0c7764821c54fd534d197d249
 MISC metadata.xml 502 BLAKE2B 2d9a48c3dda6814a6eebbcfd210a259d15b7ff00a77b3df667e55e934a0c8b590c3180118d50223d8799f9083fb1990b56d88143dfd380f1bc82b83011f2dff4 SHA512 0140aa49b40780ef0ed6fb364c6eaa5f6ba2f6da51fa0492dd147ed293be7f391942c1c30c86db2d2d49edcaf157767229511b26d0284e595a68a9917deb8ff0
diff --git a/dev-python/parver/parver-0.3.1-r1.ebuild b/dev-python/parver/parver-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..c155d8283573
--- /dev/null
+++ b/dev-python/parver/parver-0.3.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-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="Parse and manipulate version numbers"
+HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
+SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unlock dependencies
+	sed -i -e 's:~=:>=:g' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/parver/parver-0.3.1.ebuild b/dev-python/parver/parver-0.3.1.ebuild
index da8a2a081e47..0d92eb5c4126 100644
--- a/dev-python/parver/parver-0.3.1.ebuild
+++ b/dev-python/parver/parver-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
-	>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
+	>=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
 	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index c802ecb5e8b8..de4f7ff582b3 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,9 @@
 DIST pikepdf-4.5.0.tar.gz 2353720 BLAKE2B 6c15a07b686a6279d1c8bbccc1534a153ae6e809f2b1b63bf4a44f9d49f064cd8b102aa2bb50cb824689c25cc4850d84fb04355fa66dea1e0fc8582d9a2743ad SHA512 d664a192cee28143c06cd7653ba225c7fb559a6480b9fab3b87cfb5231678967af5ec1f896b8c48938cc1f1ca3ff00b1dd5a0df1807a84d17fa104a7dcd98dec
 DIST pikepdf-5.0.0.tar.gz 2353902 BLAKE2B f6c73372b73d303f0c17b68d8e317c0aeecf6515d720e8eb748123385f57fc49b7eba54243462864a5d6fe9b19acce85140bc3ece15695c086faec69c60ed98a SHA512 8ac3d2682b1490dc9fa4509d0db14508e3bbf001b34d5ba495eaee0d29d6a189309b6a71b3f92e620cfc3422218152edb4103e9e30cad87e4202571d23c04dfe
 DIST pikepdf-5.0.1.tar.gz 2354060 BLAKE2B 0aafaa27642dc2ee5994e670cbc7c7f828027111ce6a7aeb0ff71db8a07a271a1335c60ee9cbbbdbaaf9f8403e206df2c3083cc735cf5bc7f8810b4b113d1634 SHA512 d259806303a3faed861b91cc838efb1317b0d865220708f379d9a674e4ffc0a2752be9b09bcad9950edff7fe8a1c1511c56d9348cfd8ce7c0ca8893316a3ce78
+DIST pikepdf-5.1.0.tar.gz 2354197 BLAKE2B dd6fdfac9a5050ed0f935f4a17a4ce6561f5e67b02b8f651d3d9944aee329086827eda06c6fba95d4371147ab148394cde7040d003efcdad14dcf0fbe89690c5 SHA512 2b7aeb5156e296957c6f7a0c9c1e46e75368b6683f0c79d11a6e01c04c7cb58839d831990c8203f2d6ad5759b95e7766cf2e6fd831e582744eb830d3483fac68
 EBUILD pikepdf-4.5.0.ebuild 1612 BLAKE2B 34966388a2cba3665dfe6244f94cea16838d3a11c6761546cd45b0664a8906b280f1915554c4e73f8088b34c9674b694a1b9c8aff1effb23160345c27a208f5f SHA512 d44ff6b700f2c746eed927926e218b6c660a54bf23fea19b515ebcf0d5a24dc318c14184fe29915f8731aefa796d88fd2a1f445b4a378f34b5f6be3c7efd36a4
 EBUILD pikepdf-5.0.0.ebuild 1613 BLAKE2B 74c97bea4b029c3ad58ec60700d7fed34c53be43087ac1910a96e6b7dd46e8467f3daf478fd8e2a1837b10299df281c9183acbf6e4a7a2c6baee33a7e241fc03 SHA512 e5e9adbe684324eeb3e648bb25112833e51d9092a83076263913f79b8ec0d1d35532cfd6e2817178d4d2715b5c71ce31c79e142ae5ee9b9ff668dda4bd5c9ecd
 EBUILD pikepdf-5.0.1.ebuild 1614 BLAKE2B f45e2d4ad1fd6341de5f91b3472b483c335873ed5734ff7e5396d61ed3642a7e6c2d95d377c3b02a4ae20e3fda0264f578afd5ac011bfe0dce2a0f8541758777 SHA512 b2a1527edd8ef3036f74468a829a1bb9ee04692e4160a2db6daa0bf7c33790c3586cac160280df2b460db7e4da2e3a782689ebcbb3db38c62a5bfda00de045b0
+EBUILD pikepdf-5.1.0.ebuild 1614 BLAKE2B f45e2d4ad1fd6341de5f91b3472b483c335873ed5734ff7e5396d61ed3642a7e6c2d95d377c3b02a4ae20e3fda0264f578afd5ac011bfe0dce2a0f8541758777 SHA512 b2a1527edd8ef3036f74468a829a1bb9ee04692e4160a2db6daa0bf7c33790c3586cac160280df2b460db7e4da2e3a782689ebcbb3db38c62a5bfda00de045b0
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-5.1.0.ebuild b/dev-python/pikepdf/pikepdf-5.1.0.ebuild
new file mode 100644
index 000000000000..d3aa52613582
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-5.1.0.ebuild
@@ -0,0 +1,54 @@
+# 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
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-text/qpdf-10.6.2:0="
+RDEPEND="${DEPEND}
+	<dev-python/pillow-10[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index dfa51d99b060..622a4e8292f0 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,6 +2,6 @@ DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d
 DIST pillow-9.0.1.tar.gz 49512045 BLAKE2B 14f0969c87c57bad8fc38d873bba7a118d666e8b2e62e777ea17197e5ca973b3994bafb56b4464cde4059f2fc4040d73e7ddeec2a1053aeb1f201bf2ec2b38e2 SHA512 73893fe079bb2405c87b73b13b6eff198fb8970a891a7c9586bd2620ea0310d54cb35b1d594c6c6d3859e47d8d467700f987ae32aa6d3dc4a2e9286e8749869e
 EBUILD pillow-9.0.0-r1.ebuild 2889 BLAKE2B 5aa19477632d17ae9ce031f5dbcab51e1b315fd7b8a82cd3e3cf4c1ef200180d8bbdd607dedcbf390e319bdcfe8960d966d4f5ae1544de413b408aaa74549546 SHA512 d902760494cd2d8dcfc32da0808678ab5198d8eaf4c1e8534ec586f380de317b15944627d07ae0984b11e9a06afc98fe0b115e981a5844b73af0370572f41ebb
 EBUILD pillow-9.0.0.ebuild 2637 BLAKE2B 393b8e2fa5dbb13ef28acfbaf87709496617eaa904ada6f5503745e933a960aef982f5e11df5e4204b8cd754eb505508b79db01bce3d15089d9f56621753eb7e SHA512 af0aed73003e291f08aba7ae98bf803daadb1fceac2ca058a994c62865773648e04aa310fdf445ce2c8d5d7d965bfc113d40df52447e11ce340f6997f2da91fc
-EBUILD pillow-9.0.1-r1.ebuild 2888 BLAKE2B 86e987d7dbe47bf8a571e24c3da622f9c2c37cd2704eaee2f5bbc4e022da88e61dc9096ba28b1637b3e40109d815a98e20576cc80a55a3132710f37f78074cc6 SHA512 fc67f88e28ad74f4150debb7f302b86d689ac7f4642a1696f64523d07c921fe0d9c77f8ff210809a12223b6d767da42791784e75b0fc246f1df0b4bdc3877c40
+EBUILD pillow-9.0.1-r1.ebuild 2886 BLAKE2B 140c4bcc03263f063958eda8516af17d34bc0d8864280283655bd75f6c82bc1a15f6c14ab613f69ce8a323d183e027b68e6759a8d0fe8e73d83f9283e52ffbe9 SHA512 a5334c4c8b0c3dc7678a764c2aa5305f820d7af8bc211f6cc0d918a4a5fe0300392b129affcb286e372304dfcb248087816e2cb427b13581e0c02fedb6638fd9
 EBUILD pillow-9.0.1.ebuild 2639 BLAKE2B a77660a7c500f3df1f1e0af026ce44610a9f63476bd52e48c215ddd32d692f0da1b565f37752014409f711626dabac600e18c66b032e38feeff8f48b5f2dc1dd SHA512 7200c180661b56943c1df9a6161e06a9afa041cdeb78965fcde758d5dd1cf5d5ade8acfdc954f4bc8fbd741f3511b32b3509c79690bbbc7f50f54c5a5312fb4b
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.1-r1.ebuild b/dev-python/pillow/pillow-9.0.1-r1.ebuild
index e8726d4477e8..f534df0431d8 100644
--- a/dev-python/pillow/pillow-9.0.1-r1.ebuild
+++ b/dev-python/pillow/pillow-9.0.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index da96b8bb6dc2..4fbf03d97faf 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,3 +1,3 @@
 DIST pip-run-8.8.0.gh.tar.gz 22145 BLAKE2B 18b915a29a1767022a609e356005e87f035c3d9bab6dd5ab44f9f42668f4d64c4ee5360cb92b217aa2b7b94e0fbfdb5f0e494e668d9bed8badc38ab36cced353 SHA512 301083a34dea08035819024f17d8108f9751a765cdfc8f2e273b948c7746111efedd80765a63c3ac145bdf7d2b41c9a0b2b20286181c4c94cbc5501fb81eb74d
-EBUILD pip-run-8.8.0.ebuild 941 BLAKE2B 4de8f8f2fcca14d3d479f663e4f5147045a825d9bbc5c82effb2eacc22e70e9369b7f1eeeef2bf29d75e4ba2b12d9199493d2904bcfe9b5192fee11ca9e5d01b SHA512 0251157f35c1ec44cead2002e838a29728d7a4e0e5491fe3a22ba757c9b565ab9282065db051ac709da198cdda33d816484baad64f9c12fd6c23fb2223b0b491
+EBUILD pip-run-8.8.0.ebuild 953 BLAKE2B e7c2f2191f47b6b6d581fc49b7f14242b7340a2312ac30cef751fa4d906b36db7e820d3560bfa584af1d1623c89b0301e424049da8be8af4197d107ac2b8798e SHA512 01b904d1a493fbafa891c169806dc1a492baea1819f5a0d6f2d29f5e17d35741458f8e987a9c732dd4465d726e0295bf8e977aff83b313241ae0affa8d8e17a5
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-8.8.0.ebuild b/dev-python/pip-run/pip-run-8.8.0.ebuild
index 5d9fcc277727..3b817fa4d1cb 100644
--- a/dev-python/pip-run/pip-run-8.8.0.ebuild
+++ b/dev-python/pip-run/pip-run-8.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index bf7fcb64c497..9de61d6eb087 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -3,5 +3,5 @@ DIST proto-plus-1.20.1.gh.tar.gz 66180 BLAKE2B ee0299c8e9c9882ce417f6f885df18cd8
 DIST proto-plus-1.20.3.gh.tar.gz 66941 BLAKE2B 359d95d37b8a4dad282cb9b33909982ffedca25cd3907583d689996d6e516143c0e4eb2b9bb06bc50e12fabe197f0622a3488cf21136decefe676980b20c7a9e SHA512 411089eb76508a5ca94d6b4228dd4bc1f8d01d4f5209bb2ab0e6e240d8061761c9c76cd03b3a4da7771b45a30df3b0ca4c17f7fca3ed6e710a9724ab7bc0f60d
 EBUILD proto-plus-1.20.0.ebuild 1022 BLAKE2B 8da6815a92a64d5a90058920490521511ad51946550f6a876febaa010a87635a3bc7c284269469a7335f3c2de476e0d1234a8815ecc82d50837eeff56a853baf SHA512 33cab9bd304ea4349e48d045989b6ccb238589383d495a184abbce4e6534382eb7a39143d8ef875a3283ebf9619f10ed28e0ebe8b52d13b94931e01b00dff315
 EBUILD proto-plus-1.20.1.ebuild 834 BLAKE2B 3fdcd159b52f5536561a97585d5a28ddb85e4b018982b0fe6e334d8625ecc2755a7acaee2e2d707fe1ea1f563ce4f6572ca7000359cc48e3ec899a55e27e1ef1 SHA512 c6d1bf3af3bfe55ec0f636d98e249198a375c69c01132443378af8b147c49bf68fd8823067c19875a97f1614245ea5348e79520f89f796744deb5335d7d5acac
-EBUILD proto-plus-1.20.3.ebuild 847 BLAKE2B 8a3fe45d9d07efcbfcb369e7d65665783f2b36e2df3d3b4043e4d8f9b7901959428e80d4c8bdbab9431500784b5ac796d3d2ac6c85911ad99055fdb559d20025 SHA512 83e8c4ce2c74fc4dab14524d4457152c9fe08c0e9cfb1135a654c2e07fcaaa4627c5e0334cb7d1f03b255a13a2359dd351ff52f083684299996de3c49f0f357f
+EBUILD proto-plus-1.20.3.ebuild 845 BLAKE2B 8214d5ada51ec352bbdd8bc095cbc9950c7da65cfc465bda2617d3d57af848ab21b0280c1693afb827ffa239a05de38df98e67c20158baae8326180fdbe9b051 SHA512 628b2274032b69f4af43d369a45e1486b45746467e5ddb5b082b5de3a355fe7706846db0c8e10aaba0266f0dfba9e71085be763f544db3ec1d69fdd0b109c798
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.20.3.ebuild b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
index eeb0c597e244..e3ac839e6f05 100644
--- a/dev-python/proto-plus/proto-plus-1.20.3.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index a4a5cbc6d995..eb2112663586 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,9 +1,5 @@
-DIST pulsectl-21.10.5.tar.gz 40769 BLAKE2B 8346717714b4e9fd017ca917388d2ddff9c7b5a5a74a33e03e3fd5fc02048ba3d1873fb1bd10a12410dc44d88c253a4afc71f1f2542e70f36f4985659fcd9fb5 SHA512 353af9d33bb6e9f070e46a934f0933935631ca5d254430ece8b9aa9a25dd31607a45718a45c71f35f2e3801c78d7eea18c5e34f69e5a983cfc0115a8fcd05334
-DIST pulsectl-22.1.0.tar.gz 40796 BLAKE2B a401500f3927fcc86db7132a9e76b31a8dd2144fb1cf6d62be30c6dc4648298f4ed378061b48dc4c64adb3a24d25810613024d6f652aa72b696f9b05605613a8 SHA512 b55ad512c9b7b11aa848465fe8cd556c76b5e10ebc7862aefc6b459cd4526ca1a0e284e81560b5e86d22acfa8409d09683043ca789c4f59f512a77cf2273cc7e
-DIST pulsectl-22.1.1.tar.gz 40813 BLAKE2B f5f5dd1bd958d9a053fa9da1aab7aa49680b7047641088fae9a110162e8be859de275dc79990366197c1be14e0c1e555cd2a37dc20f36ae5ad9bcff29babd1d5 SHA512 7676db1d1da3816d94a297b25613e44a02cd560a4c5495a25efb90f9fafb97e16844a5e36bc67457594afc6378860e57246cc5d07ab22aba328679c6ff1bfd8b
 DIST pulsectl-22.1.3.tar.gz 40899 BLAKE2B e0a3361ce9126afe9a79817165405c38638cd7b2328162750607d7c674431f0e57762f5aaa50ab17325d493b16a5370feaa836e6899cd91c64f299af008c8825 SHA512 cc60ca006518f8be327cf7aa0dccb4820b0891e7118989b31c968bd740134751033802dbe54e203c56cf6a5d541732684dd27128c14f753acc5de38b639bdf64
-EBUILD pulsectl-21.10.5.ebuild 492 BLAKE2B 40f2cd35e4e7e18a7e2b994001604634ae5451bf64803d173b7780f1cf900efe32a791d02ecee81b093c274248a5a2a7e37d7aeeffc4c1c2a6fccedd32095b87 SHA512 c78a114e5fc8e07b16383efd11f9af7a24b957ccc6fdf48c18f6d80f004269624d246bc111a11d2f9396137921170c63197e0ed3fa1d6da73818a5ecc173aa60
-EBUILD pulsectl-22.1.0.ebuild 524 BLAKE2B 75899a613349533f7c0d04b34c56d9921a11af34dc3a7a07d1ae30def19c1dd65a561b116df1daf547ecabc045c6996f3197e5ca0c6ecd1537f26970928f1996 SHA512 b0c81195633e702ca1a50c93f2b235d2673dde2bb2bd2d599c924716e04620f1e2bb63a4ee671d07046ff63852e08265daad343c224925eec103903008be9aaa
-EBUILD pulsectl-22.1.1.ebuild 524 BLAKE2B 75899a613349533f7c0d04b34c56d9921a11af34dc3a7a07d1ae30def19c1dd65a561b116df1daf547ecabc045c6996f3197e5ca0c6ecd1537f26970928f1996 SHA512 b0c81195633e702ca1a50c93f2b235d2673dde2bb2bd2d599c924716e04620f1e2bb63a4ee671d07046ff63852e08265daad343c224925eec103903008be9aaa
+DIST pulsectl-22.3.2.tar.gz 40901 BLAKE2B 5b3eb752865e95cfbb70a7228409fea70b4c55c7297d652b4614df7ea4764dcb446f7a3e25bb89f6a55badbf6b300381c7c28c56f0a47e7faf1e63003f39d02c SHA512 7fc11c792a9e586d191a32831e0ef8896c40da1fdeddfd4467d7ec352e5e0ef0c910d7a2e8e82e1a381b16afefa17c9c9db4821be74d4694c934337b2a862f0c
 EBUILD pulsectl-22.1.3.ebuild 524 BLAKE2B 75899a613349533f7c0d04b34c56d9921a11af34dc3a7a07d1ae30def19c1dd65a561b116df1daf547ecabc045c6996f3197e5ca0c6ecd1537f26970928f1996 SHA512 b0c81195633e702ca1a50c93f2b235d2673dde2bb2bd2d599c924716e04620f1e2bb63a4ee671d07046ff63852e08265daad343c224925eec103903008be9aaa
+EBUILD pulsectl-22.3.2.ebuild 525 BLAKE2B 2a94c1afaaabd288e84a8d7d31428d044fb5a3416bcfbd543c33c33e387b35db414f5e3d8068fb15c63a4dfc46d47476bc39356f6500132d3fd7c400f7f03170 SHA512 1b98fe73fd4a7abd2d1c2576749897d8c54b54317ab1f85a155a59ddbdf0709a20d6b12321d7e98b824fa472f67daaa51e36e8710266ab4280205111f714bd73
 MISC metadata.xml 558 BLAKE2B 6cdebbc1f507bbab92256bbac867a86468b733b40dacfdb71090738f5505ea6ac33b24cbeb06835e10d9845e3fd9189a6c34625176f12c9dc7f4a1511069e8fe SHA512 b15eaa0564bc6dadf8d46eab154d028b4cbde26fa099793aa23df8f82eba86a4125d173eca8a8d2d73359dc67171dca9d8716e1495168c7b6c8ff5c701a21577
diff --git a/dev-python/pulsectl/pulsectl-21.10.5.ebuild b/dev-python/pulsectl/pulsectl-21.10.5.ebuild
deleted file mode 100644
index fcc1db8926fe..000000000000
--- a/dev-python/pulsectl/pulsectl-21.10.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-sound/pulseaudio"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pulsectl/pulsectl-22.1.0.ebuild b/dev-python/pulsectl/pulsectl-22.1.0.ebuild
deleted file mode 100644
index b7d66bc938a0..000000000000
--- a/dev-python/pulsectl/pulsectl-22.1.0.ebuild
+++ /dev/null
@@ -1,20 +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..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-sound/pulseaudio"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pulsectl/pulsectl-22.1.1.ebuild b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
index b7d66bc938a0..1ac5a8b3118f 100644
--- a/dev-python/pulsectl/pulsectl-22.1.1.ebuild
+++ b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
diff --git a/dev-python/pure_eval/Manifest b/dev-python/pure_eval/Manifest
index 026f64d9d3c0..d8e8342f7aaa 100644
--- a/dev-python/pure_eval/Manifest
+++ b/dev-python/pure_eval/Manifest
@@ -1,5 +1,5 @@
 DIST pure_eval-0.2.1.tar.gz 19430 BLAKE2B 6907cf2fc2a7118274a80dacdebeae163be57cc31086bc66f8ad9960f4624accde78149db9098bfba902774b367e2e0e9c5aac53c4e75119465d5f07cabbf17d SHA512 938d5bc5676ca39b728ab5a9c98d33a1eb7a2e8a66e61e3ae16e516a7c3bcc1b6d73c402faaec44581baeec6fee7297092c2473c257588948fabf786b14a7204
 DIST pure_eval-0.2.2.tar.gz 19395 BLAKE2B 19f86a1436e5f1a026a24f62c435e8970d84960f4cde1de80c58949b1aede6aa7562e8430e10e3f7171212c31d5699a3321fad5fb2ea1eed961a30d43a632a79 SHA512 35d20cbbfd513b7ac341759e619401a5f57b7b9df8abd09ce6414d4ee6bfa45dcadbad7529d067e81ad7ea2107c14fd03783a3a77f8074dad30d2e5161656804
 EBUILD pure_eval-0.2.1-r1.ebuild 479 BLAKE2B 0ceff1433490579ad5fbea615675f23b2a1b7bcd0e7f968d1d3e40b50df24d88ec05d15de7767adf281ffb13953e6ed0a82351f713fcf3ae592a62a975e98b39 SHA512 3763a37493975c1ae2ebfa042308354f866a524e982c39b1ec00a2d6b8b24c3c9fef95bdb76923fc0f85916002aed9dad537a3b1fa8f508df2a3a37fb9b082d1
-EBUILD pure_eval-0.2.2.ebuild 536 BLAKE2B 2d255d044c7f9c762651a4aaccbe763fd07df3f1af421c00c432545386ac0b6af12c1ed5198a4ca8bb64b019e707544a0e543a69554a75a36cbbe4a0d238cfe1 SHA512 e1294c616232e361c2bc91e4750f456b7d6fb3be922c544c5e87eb78b148f3bcb47b28ec4e0d6f0a163af61e5d1e17400cf58ea9d9502a00a4c037618e3b1801
+EBUILD pure_eval-0.2.2.ebuild 535 BLAKE2B 5c2797c22307f2d84de16ab126a542b27dddaae900795527f977d8a410661b28d7b9330b6fb7d43fe400ec70f49f1fa56396f2fca23a3a8821985344ba2bf2f0 SHA512 14ca328f640c6846d1047a6b1be59d0b9eb0be8bdf6e5717d9975921ba3a3afee8abb51b84b553fffdd279db75d15ea38aedf4745d145293676843c8a73b5880
 MISC metadata.xml 373 BLAKE2B 56f08bfb33fbfefff3f37063133e1a5dab14daf3d30b0674e9b39d8ed72e5d1468f02ed3d353d508a28c4af1c5c7f858043246e043a9ce0da4937aa2b07d4993 SHA512 69be5163434e36fed944075b834e8fba4745698759e12258cdb9ed968e523528e1e11d291892f3a8992390edd9c54cc08b5fbb70d7473db5e274329cfceea101
diff --git a/dev-python/pure_eval/pure_eval-0.2.2.ebuild b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
index 2680522ae8e8..7ac1ce88ebd3 100644
--- a/dev-python/pure_eval/pure_eval-0.2.2.ebuild
+++ b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 744e9a6aa37c..fd4970e7882e 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -2,5 +2,5 @@ AUX pybind11-2.9.1-numpy-1.22.patch 7014 BLAKE2B 1031edbb4985778b791562c499cb852
 DIST pybind11-2.9.0.tar.gz 698784 BLAKE2B bfbe173d580131e445d759bd9b1a8929ceb9fc357a1ed8873aa8024fb9226a37bb97293dc0189a67ae61a232f3790ca6f635a30d0a0401c867cde98f1010438c SHA512 87184c9e09e1340f2d34786a66560fe77684a3629b517f78321073a1f0dfdb766365d3698dcf6f08e5141b1f4da50ec917e61b36538e5a1ec9fd1b68f29cd396
 DIST pybind11-2.9.1.tar.gz 703882 BLAKE2B cc162332b637f81ea5d3098a2e9882f16a9c889e83e6ccd36d2a2da2f90361d8d188abd559f2313b45ff1de7d9ee56ee198c1193b47829d1fdf6d8871ce35b0c SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588
 EBUILD pybind11-2.9.0.ebuild 1079 BLAKE2B c35aef66a8e3213e7e3a017fd00db9f37c5683ff4aef60bc3ac4c5715ae508baf501b424b412bfce3d9fc0b920f3da61f963d59fc6e2a6d305b8c357ab2aec20 SHA512 24b94bf416689f894e3b79172fa803d2367af012a2519de3ea89236abacf6b7aefc36411f27c882832e6616b10ac28136012cca816a9147b7a16b094d02f3ca2
-EBUILD pybind11-2.9.1.ebuild 1192 BLAKE2B 9b7d291ea19a39ebeee160d1e0719c66942ad29c96eecf2dbc34ab26f543760e1bfbe05c5720aa7a0e18968f4569c163c0880f23e05ee98c4a0ff51cfaf636d9 SHA512 15cb299d4c0e876caff5f9cf716d701eddc3cf18540c3cc9ed3aa02b0f6c2f414b79c34f6e6ab69fc52007474b5143fde87148e440fdc42b4c987bbf4c23ad4d
+EBUILD pybind11-2.9.1.ebuild 1187 BLAKE2B 0933f0578e879cde8da9bb2c1a9748cb7638bf5e3758f8894e09ef073ee3a5d8e004e86fe5799962e77663f013e954ca93293cb6de5f6bc27d3f3b3027abf9cb SHA512 e60cb0dd9c382de727ca49281ff8bb30a79914e9a2eab898730a20f6a2d23f4b55c67924cd59c53d23097f90416d65cfa485c37a5b093caa34d6a13d3c648c4b
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
index f93c74dafdd7..fa7b38ae4c8f 100644
--- a/dev-python/pybind11/pybind11-2.9.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 1c30413916ab..a0f6378e0766 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,5 @@
 DIST pygit2-1.9.0.gh.tar.gz 312349 BLAKE2B 067074d58887597cdce9b7bbebb96a8ec8629c4dc42c87c2a0a9a23849bc2e8e36763273c7d883ccfadbc9f71a3b4b5612a9a7b58e3cfb39475e568d85cbdc64 SHA512 8934f1099004a536b78973f74efc8854cbfb736369a0592c382fbc1325409105640235a2b3ce4602ad0dce863cb9ffd34b2359c9840d2abdadb55e2a43df18f9
+DIST pygit2-1.9.1.gh.tar.gz 317487 BLAKE2B 56855e656eafc27f24d8d59a0f21e36c49d292d322e6809257036ec0673f88d3299bca76c8f1c1a16bc79d667f0c6a355467ac5960c9999b11c8eddbf398cec6 SHA512 cfc050ef8cb6af7eace49d2e2ca10c77893abcafa1b319e173d39553e01a595ba084e345dedff22e22806527ecaed5387584f813b30184931820bb2bb1c93e58
 EBUILD pygit2-1.9.0.ebuild 862 BLAKE2B 4707708fbb49544937f943955a62373e905cb05d22c1f3ae68f406d70bbbf82ef58c682ce9b5b3b1184ee26e3942668f55b20e33fbd3a81089f6f82aea6c3046 SHA512 3597f6f45971d4f6bf761d1e11ae3b12ef3d0410c17d7f5161bc8f97283f98ec40189d23ec82e3fd207167819d4251032c16412a4117d5d8160f6a1bc5a50d0b
+EBUILD pygit2-1.9.1.ebuild 864 BLAKE2B fd51ee3d11518c65d2da352aca0a9ba5b1c1c45f88d720328d52e97f1d7e2c64dc8bf31a128c1cc3eed3a29c7118758feb43e0b9aaa11370796a045645a2bf03 SHA512 6aa2ff8b2b74f56215d95b2db88d11c87e866ed950af4235baf6e50e3a39a5185b679ad8ef8e42f3d9a95beb50f0f07ceff4a649408e36fbe5644bfd45bce1b6
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.9.1.ebuild b/dev-python/pygit2/pygit2-1.9.1.ebuild
new file mode 100644
index 000000000000..89ada6d61a8a
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.9.1.ebuild
@@ -0,0 +1,47 @@
+# 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 bindings for libgit2"
+HOMEPAGE="
+	https://github.com/libgit2/pygit2/
+	https://pypi.org/project/pygit2/"
+SRC_URI="
+	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	=dev-libs/libgit2-1.4*:=
+"
+BDEPEND="
+	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+}
+
+src_test() {
+	rm -r pygit2 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 4c89c7d9d012..9a064d85f5a5 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,7 @@
 DIST pyglet-1.5.21.tar.gz 6516128 BLAKE2B ab7f23dc4ba48450f3da4efd30fadd089777f50b5392945636886192e89e230475f5bff9ba02cd166295423ed67f98b89fd186d18601504fe0f024c203a198c8 SHA512 3df0134dbfdeb15baae059bae489158273fd4797d5dc4da903ac2fdd58ae9e291e8d5371ebe545bd125a1670adfec84cb9d9f4f11841d594f3e4d38e5910ce2a
 DIST pyglet-1.5.22.tar.gz 6522926 BLAKE2B daeaabe414813ee850fe13bf6054919683017525ed545807da437f916105853108645d415efb4a0c8b6fdbadc7e1db241113a656ae031432bccd2fe7105bfa10 SHA512 d142bfa1cd533a4c10b93affc11b094e28cae56e0353bc56b5f5b993aedfb4ae3713f8e5ae7f9e9a646d59e76fbfe19e5b56442eb9595f2e994539c032a4c802
+DIST pyglet-1.5.23.tar.gz 6532823 BLAKE2B 0f69766ff424385c623c0b5bbca74741f4a55008365a90617a8f688954cbd58e898f733b893ef5dc2e1a25f9aab400e1d6f17bb932353f1f4f339e73f79406d5 SHA512 ed088ee37521d8594cb7fd017f86c3ce0f8e8794bc628c5404cbe2d33fb56db0fa306e83e89be7d132be68be73619fdd30d4410cd04a3bcb2f5f012443fb8ed8
 EBUILD pyglet-1.5.21.ebuild 1362 BLAKE2B ea65c778b893c5859519055f99ea4adeea189453cccaf6f6b5882167f54098f244b099728e372ae90ac1c38aa8f0c18609dfdf542b72a5a96eeae0c30429ba7f SHA512 648c946b8cbfb0aab010fb879abc14499e94a32112e523f6ea4591ad958b2209b1a604bbb718e079b38ac9f8d9f064f17ea64e9f6b4496697c515cf258379570
 EBUILD pyglet-1.5.22.ebuild 1375 BLAKE2B ede3fec1843bb62e662e4495aba072ab775848e51fa725985bb20f7f473e44032ec2485bcfa1eaaae98c24822b82a9dca75aeacea53526deb2aef5fce7c68278 SHA512 21bb71c988e9f96d484a0b88501d22f177a24984f9b7885e2249a6d34f7fcca06b3474627d9c6f4b14d2d2635542dda3bba24afe45a0ac9fcc7fce21f7dfb89e
+EBUILD pyglet-1.5.23.ebuild 1375 BLAKE2B ede3fec1843bb62e662e4495aba072ab775848e51fa725985bb20f7f473e44032ec2485bcfa1eaaae98c24822b82a9dca75aeacea53526deb2aef5fce7c68278 SHA512 21bb71c988e9f96d484a0b88501d22f177a24984f9b7885e2249a6d34f7fcca06b3474627d9c6f4b14d2d2635542dda3bba24afe45a0ac9fcc7fce21f7dfb89e
 MISC metadata.xml 1037 BLAKE2B ebbed18b0f2da5a586f2b97e18a01f8464455ba32ab74919501b9940e8c0f0bd1058f546c6ed781aef7ff97cf890a09c55712313f9589097c973688670071e0e SHA512 384ab6a4f5a5613c4883e29a714425ae74b7ccca1e205a14f08d653da1eb939ff39e31c54c000e7a61ac65fe8ededef0e9380c70bedc7de1580403ed51a68bbe
diff --git a/dev-python/pyglet/pyglet-1.5.23.ebuild b/dev-python/pyglet/pyglet-1.5.23.ebuild
new file mode 100644
index 000000000000..48457262adca
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.23.ebuild
@@ -0,0 +1,63 @@
+# 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 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+python_test() {
+	xdg_environment_reset
+
+	# Deselect openal test, can't open device in sandbox
+	local EPYTEST_DESELECT=(
+		tests/unit/media/test_listener.py::test_openal_listener
+	)
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	virtx epytest tests/unit
+}
+
+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/pymad/Manifest b/dev-python/pymad/Manifest
index 782fea00f9a2..4fefff65b6de 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -1,4 +1,4 @@
 DIST pymad-0.10.tar.gz 26815 BLAKE2B df694f1fcc7b2c6d0d0aa064b60d061ade2240085867b6a12b3ed63a93cbcac20ac40b3929fbf5b8d9c7b6dbc52883130d02b309ce7690addda6c78813ca2847 SHA512 68a7c93031d174ab50dfa406eec4166be2158d39c4231baee18b7d9c879692376cbf491bcd3e5747e65c496b07a40d1597532551aedcdf05d0fa46f6e185a3d8
-EBUILD pymad-0.10-r1.ebuild 530 BLAKE2B b49ee7f86b147e8ed10d83830c70842a59dd316bb6010434d6de91316f4a0810aceeda113cf94dafebaf1919bae50e24897c185bc502685fa56ad08538c7985c SHA512 4d45dd6c2b5835d35a13be7e167f5c6b643ee749442e67d6ca1c3345ef6654c2119e3fa282d5a59b9efafc76f01206fb22171befb43aca070a92f099ccefb5e4
+EBUILD pymad-0.10-r1.ebuild 573 BLAKE2B 8374d2baa09eb088aaa4bcb85df56c0bc8131eac5c1517a9cc22582f93cb2561dd63f591a2184c8a8cb128ab69eef18aa4684c9b026afd72b7a42c10faba9081 SHA512 660c8e5cfa778e78f6abdbc271bdd88c6e4eb05b0b770143486aca490e4e07d6fc078f05c0413ee14fa48c684a287ecc9d391e8feaf9e07546bc8570d3f89957
 EBUILD pymad-0.10.ebuild 526 BLAKE2B 232c8fbf1facc1d99e2df341e48eb40cfe5afaa2024d0bc4603c3fafa4d0cbd7bcd567f147f88364ce2d8db2da6aad0468ab6507c80853170a95e65cfc926ea3 SHA512 e82fd24bdd5755298f2a359076953dbda1964c187791da26718a3f9e35cf74fb2ddfb4d4e8c5271832a87f85b349b996160fa676a317bb86f4e49312e46d4f72
 MISC metadata.xml 361 BLAKE2B 7fe46dc6890e49f46abd33d87400a260162295a0b386e9ee20103cbe2165b820bf4b39253634bc12dfad6ecd4b6c9b2e88ed791427ddc50c75f819b5536f28a4 SHA512 d0cd267049f6cd4e697d51bdbd9b1e93570b0a4517f00201a10ade1503b95f7a6b5fb91a8c72ddcf7ace18622ca945e853509a0253172c56cdff0d93ab9c4ab2
diff --git a/dev-python/pymad/pymad-0.10-r1.ebuild b/dev-python/pymad/pymad-0.10-r1.ebuild
index f9e7b3d99845..0708a1057149 100644
--- a/dev-python/pymad/pymad-0.10-r1.ebuild
+++ b/dev-python/pymad/pymad-0.10-r1.ebuild
@@ -4,13 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
-HOMEPAGE="https://github.com/jaqx0r/pymad"
-SRC_URI="https://github.com/jaqx0r/${PN}/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/jaqx0r/pymad/
+	https://pypi.org/project/pymad/
+"
+SRC_URI="
+	https://github.com/jaqx0r/${PN}/archive/version/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 S="${WORKDIR}/${PN}-version-${PV}"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 8f499bbc2f89..2ae74a227afa 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,3 +1,5 @@
 DIST pymdown-extensions-9.2.tar.gz 1008401 BLAKE2B 017f8de124c8bfac8d53fe9ddb7aba5befa728f851cfc207b774d9da340fb8c5c067f3ffb399702c2d86ee17b740158c92a2dcce0d3470afca5b011499c86836 SHA512 2b33d63181d4e4e2e9a98c23ff48edc0425bd9a7419d339817210707b172538a5571a4d430276beb43ebab3f9e3941074a53116aaf4d1c4a90d1db2a76457f04
+DIST pymdown-extensions-9.3.tar.gz 1009329 BLAKE2B 6efe25ef0ef81d7e6b494b94e54c41c8e99cab517cadaba09d073996aef4b35c79e88386dd9ccd8199b3c4c6e105a1c428aa4b96069a6d1c44bf0296cd586b7c SHA512 8dec73e94d159b10f644268ed757b3326f1ee5d2a63e8ea806a700898bdfd82542c1791db0d6fcb29deee913276b23bdb5966511e9863eed332ab760d194c5b5
 EBUILD pymdown-extensions-9.2.ebuild 1224 BLAKE2B 031ca42e3a7faa80e2576b861164a0305cccfeefac5f7e95026fbf1e86a7ae147f2b1d72d62e7a6c45fc0ccde777f02b4f68710e2bd8de7dda20bc0f7d5fe0ec SHA512 7999bf6056c34ce7ed0768eb818bac7927836c169ae756b752ce1d0e9cc8013303cd90f275f9fb5de66a7b4ace1d4c7cdaea55414dde9d88f37841efd910317e
+EBUILD pymdown-extensions-9.3.ebuild 1230 BLAKE2B 0e8be1908448f88d25ac389b66562935894b5226e31a74aa0ee58a14b11ae3eaf99c5dd563ff3ff17f26bf6fd063bcff102df95df584097655e4c0d842791252 SHA512 8ccacd867af970ae9d1f20bdd86633dd965dd1269bae3bcf446b452b9328b36171b9e2ade507d9cb9796ef80e3c3cc404641a37d975fbc0b888337803a512e5d
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
new file mode 100644
index 000000000000..2f25204f92f9
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
@@ -0,0 +1,56 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 382d9e48e2d6..c94d833bc858 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
-EBUILD pymilter-1.0.4-r2.ebuild 601 BLAKE2B 2faaf9603726444b77584d6ed5cf1aa631c0ccfbfee5bf58a0a46bae9a206d8b2df1f6b0013aa7e9df2e4eca0d6915ff5c43f191594444ff06ef5c87cf77e082 SHA512 81d9331a6eba27cbbafb2e86e8cf327020be8931589a92cbddf8d29db315330da7c0761473d712c12f7489d75ebe371f6249189580d37d4e13f2844d2cd20663
+EBUILD pymilter-1.0.4-r2.ebuild 617 BLAKE2B 8318f0f8c532175ee9c4c1417942019ee44b9253373e4083d2952db3342f62d9ba3bd8a525ea69d23eda458da970b2657b5c03a4572357db54457524556fb36b SHA512 85c107d27b40d4ce1730875e3567606d482916630d4147e21ac2e3760d65675951879862d3de06f852dff096e48b6000b2eb8cf0def15b2bba6ea33b338581db
 MISC metadata.xml 776 BLAKE2B ade1c407dcad79191c6ab02df2a369d38cbaec3757e9cd0da85d102ab916d51a80534c3bd07543f0f5a0cc0fda3069f0b0100c93bc3c470c39048a62acc3c6b0 SHA512 06ed5a5c5f91416ed6ca9daebbc78a300e35070133401166c63ec9f5179beba2b98f53345ce6dfc254d95d7ea6cd1cc32a15e3ad66ebb54adb1677ff5c9bd10a
diff --git a/dev-python/pymilter/pymilter-1.0.4-r2.ebuild b/dev-python/pymilter/pymilter-1.0.4-r2.ebuild
index 7e176d188aa8..4df4b583f2ea 100644
--- a/dev-python/pymilter/pymilter-1.0.4-r2.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.4-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -17,9 +17,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64"
 
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	|| (
+		mail-filter/libmilter
+		mail-mta/sendmail
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index a1603ff22be5..b92a4d13fb85 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,7 +1,4 @@
-DIST pypy-exe-7.3.6-1.amd64.xpak 13698534 BLAKE2B d47e70f5d982b273b31da94f4f9e35597ba79389caffb06df1b397b4de91b90fe23183afde609225155debd80acbc827ad8a7a6d52e2f2192f9fe80cc86d6af3 SHA512 500ba779dd0bb0a525bab520f5eb7155d81d386ae785b7a23d369c20345719f280b0f639d444807bd82a8a9cdadd8c85cb4ce3b31abc74e377796aa8e88c260a
-DIST pypy-exe-7.3.6-1.x86.xpak 10322051 BLAKE2B d15ce84560a4e0f56446b7b514c3a20ecf84de48b89e15bed4a261946f1f3b39cfd49323e600c5c186d9bdd75a900a3688c124daa5d9dba7bf0bdb82873cc3f6 SHA512 4ac83e5334666efccc7c5d59be7838032f9082055d320fa3b44b58c18c4349c4a5ebead0c9ae11b24069f80f82081f8119ec4c00287f16b80b83b21db429cddd
 DIST pypy-exe-7.3.8-1.amd64.xpak 13659803 BLAKE2B 438206eb417422b749d21ba0de71611147df9d0a40b6bef12bfc068fab92e7cd39878b1f15c97b6efe3f2751b29efd2f7ee9a6d084fc405384012b3c3e327552 SHA512 2c88e383302b8c873e1dcab1d24e0fc0455f751c2e5617926e97aa2414d84a437477ab029b9ae0751c418658250f13b54cb8abc871bd543ec58e392acdf4195f
 DIST pypy-exe-7.3.8-1.x86.xpak 10179209 BLAKE2B e7d32ca389ab1dd92acc848caca0fb8e965f25f0ec9b3ca433984417d5979e4742926fcd5d6566eb89e19513b6fd02adcc1c5ef3305c52db84107cf14af1010a SHA512 df6086c046e6ad1da3d4d04dbc1bd6889b0ff760e6e10d4fd85c7add22cfaa31d6873dabaa18593aadc3e52d837043b3be1fec474c829debd79612adb7b0d07a
-EBUILD pypy-exe-bin-7.3.6.ebuild 1126 BLAKE2B bd04e885a90a599f9e64d86460ec8f74abf622d83cd8eefccfcde349ed06f67ecc956770133af99fb48533fd2b8235e54bcef2a719fcab696759213a009c950e SHA512 eb58e00a86ede3626a7c8410ea2e6edcd7bd074f6095d44ad3cac985f9fd94ebc575606fbf31aba375cbeede04f2f8adc2d0aabb3019bae74ec362fa0d26f0b6
-EBUILD pypy-exe-bin-7.3.8.ebuild 1128 BLAKE2B 7482894adb16720a4ebf3c816fc628453b4c53073f018ec1c711c7bd2815cc2b7822d51501bd4981a2bc0017e1e16bce64d4df4fa65ce55b9ce54e81d52332e3 SHA512 637ec7c8b42c665cc18414065f30d85f91b9cd5d2bbbfef4b1bf929d435bf15ca4bc75376e94421644ec854cd81bab707f42f969daf396e6ea527a895d0e5c1f
+EBUILD pypy-exe-bin-7.3.8.ebuild 1126 BLAKE2B 76dc66d2136deded08828868e447174826745f6fa32b24ef4a552a9bf0f401e113c650aa634a7ef93a81a2ae46deeabfab10174c6a97e7daf32ef0a296012a93 SHA512 4c4a9818436532ed18dc1070eb7d3b57940f1c4e90f5591a180d913423947b9520bd1fe986d003258de474a443bb9c0ab21eb692722f0283c4089c3ae9c12c70
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6.ebuild
deleted file mode 100644
index fbee1716b1b9..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	|| (
-		dev-libs/libffi-compat:7
-		dev-libs/libffi:0/7
-	)
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${SLOT}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild
index cea4b178d7c2..c0d51a4e97db 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	|| (
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index e11f611004bf..de793f667912 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.6.tar.xz 7904 BLAKE2B 6a809f8f1fd59c18627abaf81b47fa5948d39d5ece86fa416944c1c6585ec5d43b56f4228479a6afdca9788a0ecfdc83fceb4eeea25f289c1dc0b2dbda79b882 SHA512 01fe42cdf94b559ed787e253325f7df0add62e30e77c6b6e4c0301c81ff624a31167d95b39d24d72f28441468d571112f424957de38e7f26ecdbfe0f33617296
 DIST pypy2.7-gentoo-patches-7.3.8.tar.xz 7428 BLAKE2B 5362c34929e2053fc9a806e9894f35cce02ba1ebfad66cc64acc200ade4317934ee50dbc072194d19e201dea2a678abd609001ffe7e39bd6890a3b26c9d6d00e SHA512 6a7bfadac8f638e69419a6a1536af595a63bb2b4e3028da6423bd164d3df5399901b217468b1b374a5162ca8d2e5a61c4a19996f9e63109ed414a1aedcaac5d6
-DIST pypy2.7-v7.3.6-src.tar.bz2 21621891 BLAKE2B a2d18ae9d455747484de491df228e7f26af46fc3bc1fd1c16ceba79eba5a3a3272d48312c9da112ae9310722b5af33098f28a7dc15d7ff4760886a8c974692a2 SHA512 df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3
 DIST pypy2.7-v7.3.8-src.tar.bz2 23279006 BLAKE2B 7b2f5bfaffb99d3444f355039f743a21016dea22cc78cd5feca05eb12ce0e5ed39dafd22a8726994d0aff789e68b506197680e7181087313d2c5cd17b674ae4d SHA512 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2
-EBUILD pypy-exe-7.3.6.ebuild 4304 BLAKE2B 23387e2cabe080c84c97fddd49d750c173d0e4f73206c1bd5da7b5bab2f18d52b4ec02e01f79da17a5d6b01ad98a3933df996659f126e07143a06d9dd08da76f SHA512 7f3ab03fb5d0631079244afaff23064d84d02f4409fa0000a36b570ad6a63f438381cb4a5e94320e794725c31dbc4d614f6e8de71217ff01533f3caf67d3d529
-EBUILD pypy-exe-7.3.8.ebuild 4306 BLAKE2B 405a50a34adc6817abdee55d687a8808da1f7684fa83acd14c1a744bfa350e666a4b21dd4f3005dc1e0c202a9779546895050d00c0e27459cbbb952052477ddc SHA512 b2878588958bff974bad1bd3fb090146a1198549678a892f9ce43d568288050009cdaa98444b643d8f6d6664b108caa5ca5e9432987708df2cd1e3bba4831924
+EBUILD pypy-exe-7.3.8.ebuild 4304 BLAKE2B f43f62bfec5b1b28710c0020d24fe303c8bb66a305ab0f0a7091ae6828ded8bd1321b03beb429c6771d7d54ef9fac0e03467906db9bc144c5ef713dac17fb486 SHA512 04c045e764b54631267bf9f5aa76e999cd6b8a262998ce2c9170c2b70c705aee0d8273d2c822cfd1cccbd608fd093d5583895c84e236f0a5db82baab15e1658e
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild
deleted file mode 100644
index 9807092f95bc..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PYPY_PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild
index d051d82c202b..ad86981676ac 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 59e4d0c4e0dc..33870ff83bef 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.6.tar.xz 7904 BLAKE2B 6a809f8f1fd59c18627abaf81b47fa5948d39d5ece86fa416944c1c6585ec5d43b56f4228479a6afdca9788a0ecfdc83fceb4eeea25f289c1dc0b2dbda79b882 SHA512 01fe42cdf94b559ed787e253325f7df0add62e30e77c6b6e4c0301c81ff624a31167d95b39d24d72f28441468d571112f424957de38e7f26ecdbfe0f33617296
 DIST pypy2.7-gentoo-patches-7.3.8.tar.xz 7428 BLAKE2B 5362c34929e2053fc9a806e9894f35cce02ba1ebfad66cc64acc200ade4317934ee50dbc072194d19e201dea2a678abd609001ffe7e39bd6890a3b26c9d6d00e SHA512 6a7bfadac8f638e69419a6a1536af595a63bb2b4e3028da6423bd164d3df5399901b217468b1b374a5162ca8d2e5a61c4a19996f9e63109ed414a1aedcaac5d6
-DIST pypy2.7-v7.3.6-src.tar.bz2 21621891 BLAKE2B a2d18ae9d455747484de491df228e7f26af46fc3bc1fd1c16ceba79eba5a3a3272d48312c9da112ae9310722b5af33098f28a7dc15d7ff4760886a8c974692a2 SHA512 df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3
 DIST pypy2.7-v7.3.8-src.tar.bz2 23279006 BLAKE2B 7b2f5bfaffb99d3444f355039f743a21016dea22cc78cd5feca05eb12ce0e5ed39dafd22a8726994d0aff789e68b506197680e7181087313d2c5cd17b674ae4d SHA512 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2
-EBUILD pypy-7.3.6.ebuild 4889 BLAKE2B fa7c9441aafed6a8c796b83bcf6ccb3787fcb8497fec00b9e5922e0c69c7b0d9924d82bd736d0cb4afb9be8c1389cd0a07eca9b029d2c612f921155c4ac9c74d SHA512 f641ab44b4f9e141c4e74656092d479047c4de3c6cbe4df3deb5b2424acf9c6ff4745ff5077dbb4c937d2541b43d833e385d773fc966acb6ce0fc2c6839c6901
-EBUILD pypy-7.3.8.ebuild 4972 BLAKE2B 0e23807fbd0ae78ab6d29b8e7d06cdcc20d1153b6f030d5663774b6fcc14a60a0c3353576de3393f77f85cc3c5136ac865b4cde8754e840f5400ab1b7eb97ffb SHA512 b6ecf42717c42c22d05ebcaa1eaaa12de4c33d121dd833a93c63bfe447c09be58560eb260f5e8b8e79f33a62e21866c76b3e4d76fdb1fc00c483a76ea5638b33
+EBUILD pypy-7.3.8.ebuild 4970 BLAKE2B 5a02ea5af0d28b944b26cb51ad2be044cc724351e3c9a89237a75520cd0f436eb539f095ea101e221c359bac6802cb12856e5a0445f35864176685d5c1e0206c SHA512 dcbbe30c25a792d9bc85908ce80744f5c6b968188073ff48aa1242b6861945edf2d375b16095b31a00a2aabe8057b4ad6508fc76ddc618c1942edcd164b117a4
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy/pypy-7.3.6.ebuild b/dev-python/pypy/pypy-7.3.6.ebuild
deleted file mode 100644
index e35be56f475d..000000000000
--- a/dev-python/pypy/pypy-7.3.6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	# verify the subslot
-	local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")')
-	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-	cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=2d3acf18
-	local local_cksum=$(../pypy-c -c '
-from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
-import binascii, json;
-print("%08x" % (binascii.crc32(json.dumps(x)),))')
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.8.ebuild b/dev-python/pypy/pypy-7.3.8.ebuild
index 3ff6876b5f97..3c46dcd3cbcc 100644
--- a/dev-python/pypy/pypy-7.3.8.ebuild
+++ b/dev-python/pypy/pypy-7.3.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 4d9352515f77..8de17b505d8f 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,7 +1,5 @@
-DIST pyspnego-0.3.1.tar.gz 308888 BLAKE2B 23d77718bcb3deb807764ef3098c8f25b487c18b022ba9e48bc46bbab8f77de82ddc4a2bd66485041b1012958304d77236f54e9f87150e68631045bd50ca2a0a SHA512 2f46c727dbb29e1b9a7e4912c14fe49f47595ef7134358eae03e0645cce927e69e3612d11b1b5986fbb945f684e87d6eddf08bc6153af9d29325718a6207e3a1
-DIST pyspnego-0.4.0.tar.gz 324322 BLAKE2B 97ef46ba072df46f873a9f2bdf4dd440a37395a87856da92b5438af8ed05aad381189eb86b6fe031ab77158c482f91a3fb12dde69082decfbe328c150d8210f0 SHA512 e110bffebf746e7ef1c1bd74e071ec7b224c30cf7be12f6c1101feb58d85fa6f4fa48e946e1a620115b2857dcad07c77986800d623cc1a94b24a253d3205b9ea
 DIST pyspnego-0.5.0.tar.gz 325693 BLAKE2B 7674f498624e9b3c463db9ee60e9c5edf84cefd3642c9fe2cf0df58364c96b0643cf962d00edf1a6be9d8452e344e920cc1edec70bc39e8f65a6428204c36328 SHA512 4abb5726f9432366453069d32344b2be2169301cb0a6f96bcaac3f49f807c2ba819ad85a50f7979e920ddf3a4dcd13f6fc868e8d72c3c00cd3b9ffc97692b4c8
-EBUILD pyspnego-0.3.1.ebuild 863 BLAKE2B a919ee52e45c16141682ecfa2752af406646ceb5e386893ced19c24b4d81a2a554a2b29c9c19e3b6629f1e098987245327acd3740e74dc91c5eb1ae24e9d73a9 SHA512 b5256dcd898b145b88639f024fd47559ec9fd6cc887f456c623e0e441cc642d15150f51d798cd0027d5b525b214a0c01ed605d08bbab8b474dee3fca90548746
-EBUILD pyspnego-0.4.0.ebuild 1259 BLAKE2B 5749f5a00a68c449cb44d9866e96f937340af01831c520554b252d888cc53050042bff7f1f630066fdebd756316e10309bf7ed389a377d15c5df72e292c0b37e SHA512 7ff67b73d2c0528cd61f1a2c66cd836e64daae623ff60936f4b682e16b5afa8b64436ca86c661d62c92720634c2159dce7e8bac7865222bb014f1eee1b7625d6
-EBUILD pyspnego-0.5.0.ebuild 1259 BLAKE2B 5749f5a00a68c449cb44d9866e96f937340af01831c520554b252d888cc53050042bff7f1f630066fdebd756316e10309bf7ed389a377d15c5df72e292c0b37e SHA512 7ff67b73d2c0528cd61f1a2c66cd836e64daae623ff60936f4b682e16b5afa8b64436ca86c661d62c92720634c2159dce7e8bac7865222bb014f1eee1b7625d6
+DIST pyspnego-0.5.1.tar.gz 325941 BLAKE2B b6acb16ff91dc5c0e4b738d729096e60346e8fc74c153d567f8d766a027b96733a00c6d26104fc9fe871974d92079e89ac899f79b7920ff87fba0475e399ef8f SHA512 d5632783103359d056f2c6597d06b134147705c42a63d52c71c6007542c0fc2a8e8255872944e8153b605fe231d26f80af79f17fd5cb19ffb7b2ee560a931aa5
+EBUILD pyspnego-0.5.0.ebuild 1256 BLAKE2B 017c0793505ea24b7f86b58124ea1d3b688fa2517d744ce189e17633ff45313ea4826f96e3acce21176562792b55674e4a4502d6eb1b5c5617b3a9597073835a SHA512 b4a103ff72fc7091b44c2f56e9424d98b65b6d4c9267c70bb0ca46233c33fb2c1ece221f4dfa882df88e589d8937015435f27bf72b49e33201a48592456097bc
+EBUILD pyspnego-0.5.1.ebuild 1259 BLAKE2B 5749f5a00a68c449cb44d9866e96f937340af01831c520554b252d888cc53050042bff7f1f630066fdebd756316e10309bf7ed389a377d15c5df72e292c0b37e SHA512 7ff67b73d2c0528cd61f1a2c66cd836e64daae623ff60936f4b682e16b5afa8b64436ca86c661d62c92720634c2159dce7e8bac7865222bb014f1eee1b7625d6
 MISC metadata.xml 370 BLAKE2B 113adf1bd70a99f41e2b8cd4d5bb69cbd4f6bffa1dba325a8a6e35a1b5ee2800ef1d4b9ceec9be2ad1291fdd054fa81fdb841cdf40b5e969360bf1ee2e456960 SHA512 baa8a1fee20b0cea6308fbfa24fc395cd58e8729eb703692cc2a109e838284ec21559d4c9af3c99fe6d63ac6a8e04e3a3c824cb073302f788f2fa5dcf1dbf00c
diff --git a/dev-python/pyspnego/pyspnego-0.3.1.ebuild b/dev-python/pyspnego/pyspnego-0.3.1.ebuild
deleted file mode 100644
index 4dd5ce88267e..000000000000
--- a/dev-python/pyspnego/pyspnego-0.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="https://pypi.org/project/pyspnego/ https://github.com/jborean93/pyspnego"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		dev-python/krb5[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi dev-python/krb5"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.5.0.ebuild b/dev-python/pyspnego/pyspnego-0.5.0.ebuild
index 27b39859d871..261f1db15a3e 100644
--- a/dev-python/pyspnego/pyspnego-0.5.0.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspnego/pyspnego-0.4.0.ebuild b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
index 27b39859d871..27b39859d871 100644
--- a/dev-python/pyspnego/pyspnego-0.4.0.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 24c5d8db413e..f3a29c284fdc 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-metadata-1.11.0.tar.gz 14135 BLAKE2B 1de1c47b1d7775040075de479722fd07cb187f14cd37c5fe73458fb54ce01653295288fd11add8066170b8dc39f80c8749e739deb01ac8d579ef5e6f4339478d SHA512 09867df6158ba66f55a0a812b3731b4372f874b6bdc91301ed0c4d4c38f6fe9a4f936006d4e27f8c68d4a2d6b0fe5fedee3c6269bc6867eb1c7d73a42bda0361
+DIST pytest-metadata-2.0.0.gh.tar.gz 20152 BLAKE2B 8ce06c327a3242a049c9af2476536a85e99d56925ba4ac98d7e07f72900f8b50c59950f25f4ccbc9c6c17eb2310ad381862f24d26410bbd68a6c2868cdf83547 SHA512 b22cf7925d3f38242670efde5e5482c7f971af78edf7bcccc765602dd4d688502c9b3b5b2a9723b37334bb8ad2218eb2318a82b8b2d6576ab8d69fa1ca321245
 EBUILD pytest-metadata-1.11.0.ebuild 548 BLAKE2B 2565f81c140adb4a9e66c369115800afcb4812e017557b6bcba37790e6951d35c0a5928c6854ed679c5811158066a4d763cff8a477589a308d1a590180f2674e SHA512 0ba35808b470c5adcb6a76eaa5f7381ba97d6eb2328f122bf41ee5a08b9a6b66596190fdcc622be2e777b3f513f338d0adeaff3ee44e9c73383bf764d6ac3fcc
+EBUILD pytest-metadata-2.0.0.ebuild 697 BLAKE2B 1a977ae128dd0c636a295c74c5bac65625b4a2e43ac500464efa503e488c55b3ef4fc0a26759268a2192db72bca5819a1ef2122b78fcedb7c0f34380b5b54e5a SHA512 adcc4371dd2ae2d209641c64d7339a64c1283555bf992ee959e94d11ff94fdb15e3c370a2e07841b20d0e69ba7dfce40bd9c8ab50eceed662a912f0a5a8318ad
 MISC metadata.xml 385 BLAKE2B a888886c89fe52cd8e209fc9638fc3cdbf9b7dde0114c46d57b4f9b91f1ef49ebdb3f967e913036109054547d3840c8bd5ca24e5b80ac541889c48ef63748233 SHA512 20094512c77c3ea6f5501aaff0fc9b6ef07aa0580c555e3da5d6ad25e1ecf2f9f42443b7a43256f3fb99aab029a83a2d2696e9a0c8b2ce81e95ef15ab0c33b23
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.0.ebuild
new file mode 100644
index 000000000000..967fd1ef649d
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for pytest that provides access to test session metadata"
+HOMEPAGE="https://github.com/pytest-dev/pytest-metadata/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-metadata/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index cf79268dc1e5..d41902121971 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,5 +1,7 @@
 DIST python-dbusmock-0.25.0.tar.gz 86674 BLAKE2B 9a9f5aefece0f48725f8a453d298fde78e86c86901f5dd3c67032be41cbc52753b8b0da8e8ba3845772e68ba6dcf0938af405f961fc5425808017dd8b30e1419 SHA512 5d7c2f4ea75c7a0f2c6bf63b673c180f3a468239082e0248778441d8f07b78fa3786c1d37498f758954a4727bdb24dc83ffc0671bfc4b2956402aee52c363045
 DIST python-dbusmock-0.26.1.tar.gz 87707 BLAKE2B 9f4761ab5f227e78dd5343f3ddd4b83d0494e77d3b381f719890447998baab8096b3bf817259b080dda78619f8407ad532044cb60aaf7a5280459f423754df0f SHA512 dcb46f6dbd17471e2135c0d8fb63cbaecbc9445ae7bf74691abb03b93d5283ab41ea71071ece03870aaac19eaedd546f01c0839116421047f1ac77619f2c73f3
+DIST python-dbusmock-0.27.0.tar.gz 89469 BLAKE2B b6fcdb5ded2b4f50d4c3edafecf028df57c3aae6e2a1e87d78c41f879f495d06ab097be0996b7b1781aebd4235a5ce7c6b58f48f5c74e2d4c2b49a3439ce9cae SHA512 4f3a7326b27d7b86d9a77019c419209077021a88994b8e5ae302686fcaa8b7c7736644ab26d9e3b5a2157634eb56a0b2dbe304a092d93104c94a13a43d53b5a1
 EBUILD python-dbusmock-0.25.0.ebuild 833 BLAKE2B 63f487cc0082f793112dc4da582efdb98aed150387d4f18f1d16ce2929796181ce404f5f78795cd4e944251da212c97efc5708410d6840a03888f5ef7185b081 SHA512 492b3531f9aed8eef1b5245d2c2c838e38cb109d3d45bcdda2919c9402699ff66d1a5057fe3935c67bced404a6e3174c5608c8e2652409bc6b39c7d1cc8aa4b4
 EBUILD python-dbusmock-0.26.1.ebuild 874 BLAKE2B 6365190ef0b6c86d3dd7a71afebb394cfd29cc52b87bde74f7f7128968137a66ce4534a9caa1f3ddbb4c145fd6b8d4eeb12d63bd8cabc5b1224fbd01810caf6a SHA512 1cbe9fcfb47a23e5b0cd446a1b6a260776959828ed311471463b91f315142b50a577b19e5a135e11053b1bb9bd8fad81c9eb785ff9124d3467c98cc55c400d93
+EBUILD python-dbusmock-0.27.0.ebuild 874 BLAKE2B 6365190ef0b6c86d3dd7a71afebb394cfd29cc52b87bde74f7f7128968137a66ce4534a9caa1f3ddbb4c145fd6b8d4eeb12d63bd8cabc5b1224fbd01810caf6a SHA512 1cbe9fcfb47a23e5b0cd446a1b6a260776959828ed311471463b91f315142b50a577b19e5a135e11053b1bb9bd8fad81c9eb785ff9124d3467c98cc55c400d93
 MISC metadata.xml 457 BLAKE2B 7c93de164cfb7badf62932420c9fff4eb07e2247ab2293f5299649e79fd1b8b8d51b30a3c685d9d88043e4e4067c557961be45d9cf2fdf1a13bee5547934eb98 SHA512 0b9ece97d74dc9a74fc9a3f55b1561c7f1473ce483ee7be53f875c740d433409b846161821d44e48c0a5988b5999e5704cf5f6afa2436f57fd1b654518ce1f87
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
new file mode 100644
index 000000000000..4b29c538cdd6
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
@@ -0,0 +1,36 @@
+# 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} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index c17a8158e952..8c945d2f9acc 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,5 @@
 DIST python-evdev-1.4.0.tar.gz 86010 BLAKE2B 958d85f852e88a27fd22ec2511ba1367a69141f294d96f55d45fb5da176c539aef09a6c65d31be87581d0176571c7bd1ca84d580e920e460c3ca810d8efa45be SHA512 a98552bb1c5075c73ebb0a2a3a0fb241e061ed476d5342c8e8e23b3da86fa769a7d5d8027cfa243542d8b62efb89a9b1daf1c4768173295cd466714e4c53029d
+DIST python-evdev-1.5.0.tar.gz 86384 BLAKE2B 6cb6fb634d974b8ab15722def24037019590f510792fcf2bb64d8c2ffec0871ab4075674eb45a737185e4b42e39d0cd556760d51b13b5a97b79d3ee64cfd342f SHA512 27ceca723a0157fe9efa2f7aad8bb790c63d2b8d399f629eaf11fb387f3ebde0885b2d8a5297492968d625d8d9b186877e074334115e70551a1b121c8864339d
 EBUILD python-evdev-1.4.0.ebuild 758 BLAKE2B 0360e57adb922efd858e795a6d67397ca48d2ee265b733159ab1dd999f0f25e9231542a4015effc74c8683abb4f5a828d22e14e02bfb8c1db902e780d60a528f SHA512 4edf3a0f4900876c86d05cc6e5f158c8f4ab4aa3734f89484670c6a9fe5f81ce09282f3e73f71034d138153b746bcfd6827a538bafde06de576a84ac48b0dfb6
+EBUILD python-evdev-1.5.0.ebuild 732 BLAKE2B 9ad9db6f0ee828c8e8acd7f480a8910c8a12411ee99b81ca69c812255473d3e6cf613d99cea773cf036a51038eacc5a7b34388a0be1d60d5729bad7272482514 SHA512 f90f9d77f6f42876029241ae4b256aa73d4c426c01c438cc04d4d471fddbf91de5b005f142ecd8cbbc9d2218f07c3346d4013964c42672c4d60348ceee6eb3a2
 MISC metadata.xml 236 BLAKE2B 3432dc60db586ece2a4503a7360be713bbd86c5fb6f0bbd88becdcbff3d3fc1ea0686e836da9ce965cc7f3934cbf0b098000efba470d85ed4dd27d43581ff656 SHA512 e4094b8bd3c78483b7a36697dd232f371a826cbf485900b3903d679f945659b8af64720786fd02a414052df6de2e2b0aa2bf7119a2a4b9e69ca70e8649acb809
diff --git a/dev-python/python-evdev/python-evdev-1.5.0.ebuild b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
new file mode 100644
index 000000000000..b24eb9bdeb46
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
@@ -0,0 +1,37 @@
+# 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 library for evdev bindings"
+HOMEPAGE="https://python-evdev.readthedocs.io/"
+SRC_URI="
+	https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_uinput.py
+)
+
+python_configure_all() {
+	esetup.py build_ecodes \
+		--evdev-headers \
+		"${ESYSROOT}/usr/include/linux/input.h:${ESYSROOT}/usr/include/linux/input-event-codes.h"
+}
+
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 01fbc3a67f30..e8784d43e3b6 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,4 @@
 DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605
-EBUILD python-ldap-3.4.0.ebuild 1981 BLAKE2B 89514ee16e046ce9d53d7228eb4c924c657ef77b1f546287b233da9f0d7f48b462cc751bca53844f7bc8ec01bac3a6e5fc9831c02e97b4f6d3ef6861f7bca9bf SHA512 f7dffd4d0eeaa7bad2ee5de84a9ed920806fab057163d9788c1e41301916834ea6341b93d53ac81ea203b0f27d7dbb75c6dc2ad7fc6b254c168344ef706e313c
-EBUILD python-ldap-9999.ebuild 2121 BLAKE2B 41453d4bea20f0e62c78330f7f0c7c815471007c4b4f9f37796c4c88572d258067b27165664847dc84d7436a253c925af3948df461599b4bcdbfd67ed1b1b59b SHA512 4a1fe143cc02b90f29449929893a007714a164aa32e3e75c1df256c62d366825936a7593fde102a97c082bf16f4eaddc011f29829f2dad3672f5a733395ebd48
+EBUILD python-ldap-3.4.0.ebuild 2026 BLAKE2B b6cdb8c1c3de0c11d05625deaa7fca40ca7a9f82f8d219d674aa02def6e29e42b132f3e222ea81123d31936029226b1ec25ead54f3292d025194b91f1282d03e SHA512 21b1953aa5fb0efb195763f2129ed4357b3b5d37eaeea7da602f8a215221f9e73dfdca44fed1d94705c446acd2b3f8212b77967bf225c6a45772ee0e9c9e2f55
+EBUILD python-ldap-9999.ebuild 2030 BLAKE2B 32a24852de09d6b86c045942bbbf194513b4bb5c314fc8d3d17d333bc0467261bfed6fe43bc9187247d59e55ed89e87e9d29d1f2d74264e4274ac4a0234e4089 SHA512 6cdffdf419e5167a658e950552a78d50b4217e43c7cf1c8f90e2c47a32ecf5860d377d65c79703816b6b139468744dd9350449d1cfb632167ed3ebc5c6c142a8
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.0.ebuild b/dev-python/python-ldap/python-ldap-3.4.0.ebuild
index 08db219b9570..f4d62b66991f 100644
--- a/dev-python/python-ldap/python-ldap-3.4.0.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.0.ebuild
@@ -22,15 +22,16 @@ LICENSE="MIT PSF-2"
 SLOT="0"
 IUSE="examples sasl ssl"
 
+# < dep on openldap for bug #835637, ldap_r is gone
 RDEPEND="
 	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+	<net-nds/openldap-2.6:=[sasl?,ssl?]
 "
 # We do not link against cyrus-sasl but we use some
 # of its headers during the build.
-BDEPEND="
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+DEPEND="
+	<net-nds/openldap-2.6:=[sasl?,ssl?]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
 "
 
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 2abb6ecf585b..a01b853838d7 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
@@ -18,21 +18,20 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 fi
 
-LICENSE="PSF-2"
+LICENSE="MIT PSF-2"
 SLOT="0"
 IUSE="examples sasl ssl"
 
-# We do not need OpenSSL, it is never directly used:
-# https://github.com/python-ldap/python-ldap/issues/224
+# < dep on openldap for bug #835637, ldap_r is gone
 RDEPEND="
 	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+	<net-nds/openldap-2.6:=[sasl?,ssl?]
 "
 # We do not link against cyrus-sasl but we use some
 # of its headers during the build.
-BDEPEND="
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+DEPEND="
+	<net-nds/openldap-2.6:=[sasl?,ssl?]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
 "
 
@@ -58,7 +57,7 @@ python_prepare_all() {
 
 python_test() {
 	# Run all tests which don't require slapd
-	local ignored_tests=(
+	local EPYTEST_IGNORE=(
 		t_bind.py
 		t_cext.py
 		t_edit.py
@@ -70,7 +69,7 @@ python_test() {
 		t_slapdobject.py
 	)
 	pushd Tests >/dev/null || die
-	epytest ${ignored_tests[@]/#/--ignore }
+	epytest
 	popd > /dev/null || die
 }
 
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 44e2267d1b35..d4d7b38ebf09 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,5 +1,7 @@
 DIST python-nbxmpp-nbxmpp-2.0.3.tar.bz2 122433 BLAKE2B 9543a93c2ea372fbe8412c410252907eeaa00e2576bbe4a614141d521d03ef997481b482e9990376cd5b8139e5daa01e51f946fd9792fb26bc0084e04f3b1de0 SHA512 6ba1dc045a7f6d761e8d9d5da9f4799aaff96155fa7260c76820bbe9c11d95a11777fe73b9f405ee9e4b93be2167dd575fae4cb880f0690bb6a99d091a5eadfc
 DIST python-nbxmpp-nbxmpp-2.0.4.tar.bz2 122568 BLAKE2B 3ca2213018ee561e9778ca6107e3a55ef6635a1f859d7cec6f08ac7ac6b3e3a7b4dd2dc38e3305fdcfca94b2003aef5525efc2f992b25fe5d5e44090c199fad4 SHA512 52e819019abaec8fb3fdf7c64bc7bf29d94d77d8b3c550fd8c05223eef81e50d8a992fb12b56198f389860f1bd55f915b781ae5a1d66b40bcbe17fec3fa0d540
+DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
 EBUILD python-nbxmpp-2.0.3.ebuild 721 BLAKE2B 937344a647bb03fa3774a0464373bcf5225cf319cd636f6fb92d5d38bbdb1c312e77211e3066eee9a44fb0968481670df20ae43234ad6969307c17e3a21c1f9c SHA512 14cf28fd0c90d20333cbb3f896abb2f17a85a80db699ab5947e5ed926ab2601fcf1ff6a7f2af5aaa215dd576255172412e3b6a4e077b7bffa16a0bb143507a58
 EBUILD python-nbxmpp-2.0.4.ebuild 734 BLAKE2B c97467ae99e94ae12aa49278b943246db88c4d60161c864685d0ef1e31608c45105e16bf0f30cd5a849018d2bb58ce96f9a186f3436ffdb738ab3cc7f18c1ca9 SHA512 b7cad747ffc5f82e63f82a5423586b3091f2c8d4cc74ee6d8a32af9f5346b184edcc32748d39243d40eff647c133fc042075c7905bfb621a5c5971951f50d7d4
+EBUILD python-nbxmpp-2.0.6.ebuild 773 BLAKE2B 2baa10a7af5f03e54a94524d566327dc1d533ea2db4a7bfedb33a3cde60968f4954dfc551774c2998fd90a38a5fef65d1c0f25d53b22adb990c4122ed3296045 SHA512 d1ac5b484e7e37e4643101eb22f9440d926fe958dbaf157c92fb9d024230b5920757b8865b1f42b6e9c244ba6de75d327d763a6ed61492d66761525ae7059775
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
new file mode 100644
index 000000000000..9130ac17363c
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+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[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-slugify/Manifest b/dev-python/python-slugify/Manifest
index dc631fe6e129..8ca226b0338f 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,9 +1,3 @@
-DIST python-slugify-5.0.2.tar.gz 11728 BLAKE2B 701fb3f679cd4f714b5c57c14fb8cbfefa5b8268e9c4b877dd1e558e8a7dac325d69519b8e666043b70540908dcb250f561cebf0c5f444f9a3cfae34d97456b1 SHA512 79cdd1d0312c9e34b07dca2e898f177a85b31d3f290403375032ae962df61f3a9c4167f4bdf10f47afd17d544731d6961810f8a081ef615d76d8758c1207e6b7
-DIST python-slugify-6.0.1.tar.gz 12184 BLAKE2B ecc39ad73ba4bf68a630c105b22c234c9f8089c5063457c02b21ae5bbe5c021741ce754eabec51bb125ae549274b26f6cf8d986b66ce0ede5a653e70b4528712 SHA512 b97aba9f3b74009a802b1a7bd356d1eb27d239a05d8617c8f0107391e9f09e9a7cb6b45437755a1c86c4eed966e8975f74f6b760e17090d2c56e4db5935c0b69
-DIST python-slugify-6.1.0.tar.gz 13279 BLAKE2B ecc51c97638f675573576457f6e6dee14fd2f07b9292e3a32134215887adf945e6b7cc0e373b558c7311a49cfbac1b760191b3e77597a86dac1ea48527d549ac SHA512 4a274d5490bbddb8a600357200d44621cf3304c42a303148156cc732650431e76466099e4eee308e81c881b0da4e39b92146561cfd909a796e153411b22405c9
 DIST python-slugify-6.1.1.tar.gz 13259 BLAKE2B 2f85061775d9e921bf5679ab47d9a5b4fed2d2e1703aa2717e21c1d43fd1b93ef5d7060151bb4b473cd901aef16d3d905d2ca5004ae7bc61e906464bb52494a2 SHA512 2ffe8420b2f0504c57f42bf20aa0145ae521dab8d1bbefcaff1a815aa04377c7eb48eab929890915a9c9632a5c1cac4d3e7e093dcdfdda59f8ecee1ab787cbb7
-EBUILD python-slugify-5.0.2.ebuild 543 BLAKE2B 97e438eb813bce17e76dbf7379eb967af083fcaef20c71799db30411a7e2a53aa2dd95906b773d6e3692124b519710ef10278ab54891c58138de04b33e0f0913 SHA512 4792d41186e9d0d67746d8b994583a431523021271d9c4c1c58ad0ac59bb7ae5a465f99abdecb5e64eb84da353a2bdb996e9a07beedb4bc3d2f5b78e3286daa9
-EBUILD python-slugify-6.0.1.ebuild 584 BLAKE2B 389bd79753490e3825c03d9621425b50388013bf4caceb9bfdc26416328bc9356119d7cb2ed96b21b5d7359c778fda917202c826b007e461d19eafaeaf503a74 SHA512 308bb22d56cdd49c42084591daee65cff656fb821ab999986bb576ebfd95d01bed501c55e46ea0c249f11878726962222ffaacaf3458460a97a9e759692b2422
-EBUILD python-slugify-6.1.0.ebuild 584 BLAKE2B 389bd79753490e3825c03d9621425b50388013bf4caceb9bfdc26416328bc9356119d7cb2ed96b21b5d7359c778fda917202c826b007e461d19eafaeaf503a74 SHA512 308bb22d56cdd49c42084591daee65cff656fb821ab999986bb576ebfd95d01bed501c55e46ea0c249f11878726962222ffaacaf3458460a97a9e759692b2422
-EBUILD python-slugify-6.1.1.ebuild 586 BLAKE2B c4dd1aed8561618af63ec58833946947cdfea9b8675c6a7c399fb9e7e626a3b6422ea7be25692e6c8c26f706c40fce59835cf405993e09a8df724fbbf2ccef28 SHA512 8788d8e39593f7505c02ff75feb4782cf3587c0fac248fcc197428c5bd65f041d642ee5f5ff819e50c225c51b69487f33be3b7c096af8fdf222c8f343ee0774a
+EBUILD python-slugify-6.1.1.ebuild 584 BLAKE2B 340b7cd01febad318a054b9bdff0db899a326d1b21b87ec9505d4369294a64ccf3ec5d1e7204c5cad17d650231c2e96580c055a6c2b0bf9e46ed5df2b6e86b56 SHA512 506777e50cb53983e3daa0e5394dc1ff0f0180e20b8e22feacb42d75e3f0438d5a772aa433bd60f650fed6971875cbba99ada2f47500f01cbd7d0f5f8eb8c0df
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-5.0.2.ebuild b/dev-python/python-slugify/python-slugify-5.0.2.ebuild
deleted file mode 100644
index 5b15078fad2f..000000000000
--- a/dev-python/python-slugify/python-slugify-5.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-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/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-6.0.1.ebuild b/dev-python/python-slugify/python-slugify-6.0.1.ebuild
deleted file mode 100644
index a518490e8af1..000000000000
--- a/dev-python/python-slugify/python-slugify-6.0.1.ebuild
+++ /dev/null
@@ -1,24 +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 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 ~x86"
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-6.1.0.ebuild b/dev-python/python-slugify/python-slugify-6.1.0.ebuild
deleted file mode 100644
index a518490e8af1..000000000000
--- a/dev-python/python-slugify/python-slugify-6.1.0.ebuild
+++ /dev/null
@@ -1,24 +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 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 ~x86"
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-6.1.1.ebuild b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
index e06ea5dfd456..b21f1c70787b 100644
--- a/dev-python/python-slugify/python-slugify-6.1.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 9969c34bed80..ca8cda77e4fb 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,4 +1,6 @@
 AUX pytz-2020.5-system-zoneinfo.patch 1294 BLAKE2B 0f6f4cf1c588b90827decb19d82d7adf97f44769b2acd4038d6b818ae27162f576338b61de6775b4aa387b4a1cb434b36d6f14fdf1eaa3c878e2af7e9ce32620 SHA512 aad785a23a3681de7d52c4898eae4d7f33ddff9c136f52111ab0aef076d0a3c72c7b0aa0910e191f3098baa05c09f522e927a94967481a89d1d1bcbe99824e3b
 DIST pytz-2021.3.tar.gz 320512 BLAKE2B a5f67650cc4eeaa8030fc7d5b7a66bcc397b95e41b492367981580678e1d535cdb425066d4821d9c5f94e4fd813c669987560030c046fc63ecffa2f46e0c3f89 SHA512 c45099f319592976b7715d9973496a2c7438a1b958ef8b90a1ad1fb97e7035624fe6191796727d4b7edf3236271bea4d864e25d1d92431e8cf767ac798448882
+DIST pytz-2022.1.tar.gz 320473 BLAKE2B 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe SHA512 7737aa28626743026b7de932b27bf44d7b209f495d9dd7f90c6448ec271e007f23004fcd04982e2ca6d0a4075206e1dae7b8836319c299b5559c514366d518a6
 EBUILD pytz-2021.3.ebuild 871 BLAKE2B ec460007d7b2b7c4ef4857c50478baca2870c286e06b9a9a85ec3837f0c91c8683d1d0135ab8997133ab805e37257dd30daa9b6092c538dcb3e483b3368d0b51 SHA512 742e0fe376b4fa6977f28826b2bd87fc430caab1d74471581553a23a860b56ff97be73b33ca1ceab880d5b1fc5d7aef60282c1823e11ce67b739228c53c993b5
+EBUILD pytz-2022.1.ebuild 922 BLAKE2B 9664a900ded0f036ecb98a874feaf33400241628b736a7a0f635c3ad87bba598860f0685e53c259a04415f9c019d814106dc009beea9f32ffd2582351a357636 SHA512 78ad57b1229ced35cb694c696ea02d2ed61c7c0286eb3a0830ec00c75805ad200d85e6156b51b0891813ff917b7049efc9b001a03a9348adce87c1d9ba8f4949
 MISC metadata.xml 765 BLAKE2B 437ebaaf2229928930ce99bed100856934d5dc4fcbbd5fda5b164041668404015421800f59c408168c83cdf8d8a5db126dc1f6261ac6a92398bdf0d733ca96d4 SHA512 dec5518cc05dc97ba6897a6d2f55933b2561153d55b60511183e4adf6d308e1a2213fd870b5ce7bae11c157d33ff1bcf0a37d7a2675e92a8b02eca0f660af29c
diff --git a/dev-python/pytz/pytz-2022.1.ebuild b/dev-python/pytz/pytz-2022.1.ebuild
new file mode 100644
index 000000000000..9b90370f8669
--- /dev/null
+++ b/dev-python/pytz/pytz-2022.1.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="
+	https://pythonhosted.org/pytz/
+	https://pypi.org/project/pytz/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-arch/unzip
+"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
+)
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 934b6be46211..bff13c7ef2f1 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,3 +1,5 @@
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
+DIST redis-py-4.2.0.tar.gz 2419627 BLAKE2B a4429e17dc90289032c5b98cd482fc6e1349b4b63b2c3f289be1df9d0c667a9f568cbee71d34f88c140fbebf2b0061e9bb3426f1548bccf3c0767c040419251b SHA512 3c4c7f859e63ebadf8d4b01ce14d789caffa18b1f177b6a2269737cb20259dc0165773b1c838c3c08edeea790976183b156f886815b42ea709b4b3a0f2aa3354
 EBUILD redis-py-4.1.4.ebuild 1918 BLAKE2B c1646652b418e9c7e7e19c086f387f517f0e2f1367e3d93b83c6bb63eae38f376f1cc82d2ad49946f2b51f580e3170487416be43a796bf6f68b1ca2b138cb3af SHA512 9733635fffe6f1334cd371dafa897be7820fdc2e4bf9ffc01ebb563586c27bd84f3f51f15ad49c2790ea83cf6598362aed272cffbb6b50596e0912f3d64578a2
+EBUILD redis-py-4.2.0.ebuild 2200 BLAKE2B 4f827a862840d98e49e27189f630fa3d1cc5dbbd5c90b48b9884ba6b688ece4fc1e727e04cad0bf110a27f03ae5397a547c207544dffb830eee1eb1626ae8149 SHA512 ff10a2bd560af96b6062ec38cdb6b2a87b6522e3d30fa963a08a44c3701d224401ea1a16648ec5ed442a90f43683b05660ad5eb26872c6d14f8f36f639a16920
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.2.0.ebuild b/dev-python/redis-py/redis-py-4.2.0.ebuild
new file mode 100644
index 000000000000..e13112f1a58c
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.2.0.ebuild
@@ -0,0 +1,88 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not used by our impls
+	# https://github.com/redis/redis-py/pull/2062
+	sed -i -e '/typing-extensions/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+
+		# Needs a second Redis running
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	local EPYTEST_IGNORE=(
+		# SSL tests need Docker/stunnel:
+		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
+		tests/test_ssl.py
+
+		# Needs multiple Redises running
+		tests/test_cluster.py
+	)
+
+	epytest -k "not redismod 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/rich/Manifest b/dev-python/rich/Manifest
index 8f58af1cf818..de955ff02d4d 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,6 +1,8 @@
 AUX rich-11.1.0-pypy3.patch 2986 BLAKE2B 29f1c880febeb774666f27ebd333f0ee93eb8804f5ffd596d45244b23c45af14ab6291cd766b5446f13bc59ae574891281c85bcda6b347fec2cf4a6d6c742891 SHA512 0978f0af54893d8f28943fe2daac873447d61fc2799e088f156d44f6927f94129ad5d7fdec5b6a36a7d89c1dc5b3b04dceb2e8dbc1c3a69064685560d51222d2
 DIST rich-11.2.0.gh.tar.gz 16300346 BLAKE2B 520f512a7e26613a4cc881834f8c150963b84a6dc3a43029dde6d64d1e405d82422b9c6f0098293b6f9bdb55749c7929426dad14840c9a287889c1a6a70f6bf2 SHA512 ec1178a6a320a48f589ead5163e974725f79ae63ddf9a2deb66400e43619ade8d366dbef6b524e66e603647a957b8e26266845a0bcb85912fd9ad2a81dd92f5e
 DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
+DIST rich-12.0.1.gh.tar.gz 14857207 BLAKE2B 8e6419904ef0ba91d4b15059630f63769a28323600cb212f07c2a239201489e2078b8c4c792f486bde75efd9d09afe832fa2e2235ac91433ee24b33fcda02e68 SHA512 61077663b46a7e615b29df3b75b15ef97979c804abd283cc26f217ee8128b74a514fd7b92831d1d8928f768d2ec8230d8cd1da733106b424704a3187ee18ce95
 EBUILD rich-11.2.0.ebuild 1125 BLAKE2B e26b876bc97c0844fb95f221eb0a82f7b59a18d633c4514a376dbc0bda68aa7cd4a0aaf61011f22bc2945b4292e4dff65a5a7c55607f569d120aadaed079fee2 SHA512 2745e1b93ce8024596923269e0263427c149a654b3082ba6df45e59fee1bd11734d3ef0f85011acb8e427106a5f84dbe4bf0944ca5f40013f6e32427a334b927
 EBUILD rich-12.0.0.ebuild 1081 BLAKE2B 20aa21c4eaeb5e2b9b7c7fe701743a00e2d2f7811b657b89b07c021624df6738bdb6c2eb1c9c3da2827524c7e7e77dd7fdc423d8eac93eb9e80bdcd6d375fb8b SHA512 d26e8692de7610fee7751c6d2620ee442dbb3a00e73d39aff1df1bc5a01f2424cd5640e72d32f87576a869ba60cb71298dc20cc27bdf598175b8c5cb61ab6a99
+EBUILD rich-12.0.1.ebuild 1081 BLAKE2B 20aa21c4eaeb5e2b9b7c7fe701743a00e2d2f7811b657b89b07c021624df6738bdb6c2eb1c9c3da2827524c7e7e77dd7fdc423d8eac93eb9e80bdcd6d375fb8b SHA512 d26e8692de7610fee7751c6d2620ee442dbb3a00e73d39aff1df1bc5a01f2424cd5640e72d32f87576a869ba60cb71298dc20cc27bdf598175b8c5cb61ab6a99
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.0.1.ebuild b/dev-python/rich/rich-12.0.1.ebuild
new file mode 100644
index 000000000000..e156699e5e9c
--- /dev/null
+++ b/dev-python/rich/rich-12.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/Textualize/rich"
+SRC_URI="
+	https://github.com/Textualize/${PN}/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/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# check for exact color render string, which changes across pygments bumps
+		tests/test_syntax.py::test_python_render
+		tests/test_syntax.py::test_python_render_simple
+		tests/test_syntax.py::test_python_render_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index f824c25aac13..5d37464cb58a 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-1.8.0.tar.gz 38313602 BLAKE2B 3f071ad3dfa350bba7eaf8e06c8bdb660f9dc1e
 DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672
 DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79
 EBUILD scipy-1.7.3.ebuild 5504 BLAKE2B 7ae97cc6ad67b52f498f142c1be014921409c660d4f424157dc520913027eb733bc76e25d63aae15b449dc0ec30319f7be88f3655f5f391f2e6d8eeed9cd936b SHA512 f3e37d183e960b0481522f40998d767d0a86e9068d87c3ab40dc33aeb269bd98981efba5f0494d153f86e28f43c7249edeab8b3a4e497407819e4171d2555fad
-EBUILD scipy-1.8.0.ebuild 5274 BLAKE2B 46ae3b3682dbb8a8ac55a303c2b3d7caf44799ac3ffd325b37f3871c97601953a795257c2fb106276c3c6723350488bfce42355183cfdcccb60f78fefcf548b1 SHA512 bf775b08a8f0725ea50c328a93f1f34c18a5956c8719368fda95e18fc134d4f883d6cf6d8ac9a902148f0095fdd517c6e3d3d9c6a2e5faeae902d3d969768550
+EBUILD scipy-1.8.0.ebuild 5273 BLAKE2B 6f0aa850ef56f9e57b983ec370aae52a5aac85b8e45f3d73c51a4ee1e92446dd9b3ecffed38b8d45ad75790bda15b1e4f42397a59cf10ce081d8e97bcb9befde SHA512 5f064fb4f8373dfb7efd61bcf41dd7bfd6ada5c74fab52ba6ab1c68e0bea4dc75c131a18c7ab7fe698c837c98a80d3992761aad236f9d92f7cc1ebe35f9b4e13
 MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
diff --git a/dev-python/scipy/scipy-1.8.0.ebuild b/dev-python/scipy/scipy-1.8.0.ebuild
index 4b24c3e9e009..7dc252a8212a 100644
--- a/dev-python/scipy/scipy-1.8.0.ebuild
+++ b/dev-python/scipy/scipy-1.8.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-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 +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index cfebdf54d83f..1fae40c7d249 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,7 +2,7 @@ DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b7
 DIST setuptools-60.10.0.tar.gz 2420706 BLAKE2B 66d7f3b648b1e3222736ddf46ff97441bc9ed4dc528e0d4ee32ef18c99b2d3488e7525a1598a18df4f2cbdac409a4096a40539807c343d99707068a15003111d SHA512 e679bd84d31cb68f92899e0b25d5a6bf85cf63d9c8e1dfbfe974d7bf819cb36f451596b8715000be6a93656b972dc6c4d90a8a8534a6c88874a0be8140f2f091
 DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
 DIST setuptools-60.9.2.tar.gz 2425956 BLAKE2B 09baded7eef555ebd76db1672d69cd06cf6bcfc1126ba0fb0143b038d6599998f53460afc914f761d44ff25710802f6f371a793dca60040240cc328da0a3ea92 SHA512 be99bee951797632a68d08b94e0b604763662c13f58cecc872615081036081b3d72c5c468af47649449d6f7422f52ee99cf2f87fa9c840d10f98cd0217c0cff2
-EBUILD setuptools-60.10.0.ebuild 4025 BLAKE2B 5321a8ab82b403a6a0c8deaf76087f93eba7d26c4fea3878d858b6451b8c4f68eb3cb657c7060f4192c627b112ab2ee3550e0e3a545fc7eebe152043d108f8cb SHA512 2774ad6093dd95f744222fd64090eb13d875d85a6d283e44e3a2dc0e2c2aab2a0573fd01e85114e0469b9842db0109f9d97743a2e336fed8a78cce937c067d7c
+EBUILD setuptools-60.10.0.ebuild 4056 BLAKE2B c12c9851a8b099e6bf7772879397c1ed0186ad299605636e1cbd1aa07376e4609cc5d5652977406fe35942eca2968c408dc116b77a2d8cc6876f719e5b107b21 SHA512 08b794ccb16b3c9175304f6ccfdc12aa0e20d1168bbd5b42c8217b18a74ee6ace2079b66fe9de041ffb804ad0b99abda589742eaad001fd1fd8e8d6968b4a072
 EBUILD setuptools-60.5.0.ebuild 3392 BLAKE2B 93280ff6c52f3f0e6bfc94057bcf5e60db4d71d50f20d2aab7589996a625ab09c3645a5232711386d304517af149f2fc460c1e04d4f86658415b028de61a254a SHA512 6a55a979216217d7f6c39460e8058541423c33bb1474128dc6e2c5bdd69e13a10a4581057b37ccc2f5c600ed6f495e96f9aa8b0d4f9cb0a6e0fb2ec4b687d0c9
 EBUILD setuptools-60.9.2.ebuild 3958 BLAKE2B d9ab297e87453adc0395b0aabbaeea1b71f9ddf4137cc6276bb3ccda55e4b8138301c2008dc437a71919dc080cf3c171bc0b46ccef0bf9bc5ae948a335d684ac SHA512 af7c6a4b1c370e160fcebb0ab6502c770ec64064fb8fe803d9432c8f252ea132d2ae5cacec41ececcedf9888fab9910a11051215cd8a7c2f6c6c83efbf0a3256
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-60.10.0.ebuild b/dev-python/setuptools/setuptools-60.10.0.ebuild
index 79e5d16558d2..664c89e0ecdc 100644
--- a/dev-python/setuptools/setuptools-60.10.0.ebuild
+++ b/dev-python/setuptools/setuptools-60.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 2b38ddab7778..ced95ca8e6ac 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,7 +1,9 @@
 AUX slixmpp-1.7.1-fix-py3.10.patch 828 BLAKE2B 639e86be2d2289386ee782adfaf8fb05e6e994f21f65edf5bea552cc3838db440b753177fa3f4f76f200dabb6600618fbfdbdb8547d3e781a88d45c926a32b54 SHA512 1894d101d2d0afe6a59342e8aeffa530ab0a3732e18f0b7599b7abffcf559d0791f85cda9b5e87b181bd4c473ec3d88dee9be7be8c07c1e8db6943e18b000bf7
 DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b36fa31a9dd315e363fc67e36d080df0dc70d82e65c6802c41377c2e98f56ff4e23cc5e9a92165c3d3b7565493f SHA512 5a59fcbb901e6f4456049f1ec2bbf781b1ec7c5a3ad4b66216d4c5daffa7f0606f74b941647fe2b53e6c8cdc476371305c7b7a2ca24d21450e19548f888be3b1
 DIST slixmpp-1.8.0.1.tar.gz 532519 BLAKE2B c4cda06d1d16ef92404263a90a6abbba46e526b4f9edc54228757b73c9faa0f04e9340ea80b5f0491017bad04094512bd25fe04fc095742b639cecba73db058b SHA512 0bfa39f126f2154702e160117b619f41319362723226ebf0ed4b803aafef0302d4df9d9a4cff5fd890507a10ac7424a07cc3bece519451bd56be400998dc0178
+DIST slixmpp-1.8.1.tar.gz 532622 BLAKE2B d0c12c240c8a14df0a0765f8bac02eb545951a0b9749ec9569d651caa3457af1a71f1c6b3a10db879fe25648b1c3c456b78e48042a83124b0a8d4d35df60134d SHA512 13b355592d564b7e211e6007fa19099e619480d0a87332b68163115852840ad2f0c70063b4260fc88d4da67e13ea97c88972fc05999c1870256b0de0257409f9
 EBUILD slixmpp-1.7.1.ebuild 757 BLAKE2B 396df75ba07ec319cf7301f00c5e8350299f7150270f01674112492f392678f65ce4690f7879df7332e2b9cc83f017826da4fa49fda2eed7327342d8d1267af7 SHA512 1bc48e432662641a7878fd8ef6b55821192b39f1217624a1a1ecf4b64508107c18e76a0b03895ecba9b5cd31c9c6df25d27a1764d24c21b5bf867855b0ad49e8
 EBUILD slixmpp-1.8.0.1.ebuild 781 BLAKE2B b8ad5eb2383051194b23e1fea137214f427591852a0944776fda66f06074eb44af0e37835eed92019585bc50b663e9e6dc8fc955796a88f0919f9548ff535f23 SHA512 e34094e3919cd5eeaa7cfe90d8f143d41c899f586eb401249cd00a439e55ac8f1a21626d8ee2b2ac8846f293f88fbc735c8f0161896c0c93745a7dd193474908
+EBUILD slixmpp-1.8.1.ebuild 781 BLAKE2B b8ad5eb2383051194b23e1fea137214f427591852a0944776fda66f06074eb44af0e37835eed92019585bc50b663e9e6dc8fc955796a88f0919f9548ff535f23 SHA512 e34094e3919cd5eeaa7cfe90d8f143d41c899f586eb401249cd00a439e55ac8f1a21626d8ee2b2ac8846f293f88fbc735c8f0161896c0c93745a7dd193474908
 EBUILD slixmpp-9999.ebuild 781 BLAKE2B b8ad5eb2383051194b23e1fea137214f427591852a0944776fda66f06074eb44af0e37835eed92019585bc50b663e9e6dc8fc955796a88f0919f9548ff535f23 SHA512 e34094e3919cd5eeaa7cfe90d8f143d41c899f586eb401249cd00a439e55ac8f1a21626d8ee2b2ac8846f293f88fbc735c8f0161896c0c93745a7dd193474908
 MISC metadata.xml 530 BLAKE2B 33851d8e4b4acade2d0349540d63047db59627a7c0c84c9cab868360a8d53671336bce427fabaef795fb17c235740e3bc6ded84549d89cd433becf04de97566a SHA512 b14827992560c3f6010721507e7c9b6344525ca347a2f54987cb5678083beca92cd095a421d4fa45a18cc7c64c6c0b6f86f2f3af0bdcfc44267e30e63922f48b
diff --git a/dev-python/slixmpp/slixmpp-1.8.1.ebuild b/dev-python/slixmpp/slixmpp-1.8.1.ebuild
new file mode 100644
index 000000000000..1a7f67fcb5c6
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.8.1.ebuild
@@ -0,0 +1,36 @@
+# 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 3 library for XMPP"
+HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	net-dns/libidn
+"
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
deleted file mode 100644
index 22f80f97a172..000000000000
--- a/dev-python/socketpool/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
-DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3-r3.ebuild 1466 BLAKE2B a98653e90f0e561be3f96c9f75d4077eb7a493add49cfd602f30bcbae930d573a3871f59f39775b7f88248a18ee0ee821c5523a2e516fb136f67b0a47c4cc444 SHA512 a31a778176d3887dce6b19ae5c5b521e11e8bb039bba4d6941dcdfad1b151cb5c58b51bacda1a35941ff0ba5d0c0a87fee5de1ffd92a0c4d57a2bba1eb10c377
-MISC metadata.xml 672 BLAKE2B dbc29dc11dd8d78ed5b8a2904f1ef92372a66eabdff75ced74c601bb846a9f8b857b94f05f91ae4bafc79848546cdb61b1dac0425b0f6cc8b3a5382fddcae4dc SHA512 38e803b2b1fd8e2667c4107cd95ffc1a395a5919e7db00c833fd94d5302779f018a7ca35fa6a32b0658d51f87060854d0b8c85569f9c54ded68fbb0c6dd1a2b2
diff --git a/dev-python/socketpool/files/socketpool-0.5.2-locale.patch b/dev-python/socketpool/files/socketpool-0.5.2-locale.patch
deleted file mode 100644
index aa0af681a768..000000000000
--- a/dev-python/socketpool/files/socketpool-0.5.2-locale.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur socketpool-0.5.2.orig/setup.py socketpool-0.5.2/setup.py
---- socketpool-0.5.2.orig/setup.py	2012-08-05 12:33:47.000000000 +0800
-+++ socketpool-0.5.2/setup.py	2013-02-05 00:22:13.685705089 +0800
-@@ -5,7 +5,7 @@
- # See the NOTICE for more information.
- 
- 
--import os
-+import os, io
- from setuptools import setup, find_packages
- 
- CLASSIFIERS = [
-@@ -22,7 +22,7 @@
- 
- 
- # read long description
--with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
-+with io.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf8') as f:
-     long_description = f.read()
- 
- DATA_FILES = [
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
deleted file mode 100644
index e482f10311f6..000000000000
--- a/dev-python/socketpool/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">socketpool</remote-id>
-    <remote-id type="github">benoitc/socketpool</remote-id>
-  </upstream>
-  <use>
-    <flag name="eventlet">
-      Install <pkg>dev-python/eventlet</pkg> as needed for the eventlet
-      backend.
-    </flag>
-    <flag name="gevent">
-      Install <pkg>dev-python/gevent</pkg> as needed for the gevent
-      backend.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
deleted file mode 100644
index 7ef6347c4930..000000000000
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple Python socket pool"
-HOMEPAGE="https://github.com/benoitc/socketpool/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
-IUSE="eventlet examples gevent"
-LICENSE="|| ( MIT public-domain )"
-SLOT="0"
-
-RDEPEND="
-	eventlet? (
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-	gevent? (
-		$(python_gen_cond_dep '
-			dev-python/gevent[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)"
-
-BDEPEND="
-	test? (
-		!alpha? ( !hppa? ( !ia64? (
-			$(python_gen_cond_dep '
-				dev-python/eventlet[${PYTHON_USEDEP}]
-			' python3_{7..9})
-			$(python_gen_cond_dep '
-				dev-python/gevent[${PYTHON_USEDEP}]
-			' python3_{7..9})
-		) ) )
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9
-	sed -i -e 's:isAlive:is_alive:' socketpool/backend_thread.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -r examples tests "${BUILD_DIR}" || die
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	epytest tests
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples
-
-	# package installs unneeded LICENSE files here
-	rm -r "${ED}"/usr/socketpool || die
-}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 8c83ef3a667f..b2ac286e2f8e 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,5 @@
 DIST sphobjinv-2.2.1.tar.gz 1150428 BLAKE2B 13bec53b00d14466aad652fb822ba32156d4ee3141f2df5bf55eaf77d03627c98c48dd142757ac43fe7dbf00716a85ee4c03060dfcf89e1d9aca4cd2589df5b0 SHA512 9247fc38e5d49adab0921f31e4ad1a8b2ca260c7a921b5fb9db7f800ee484335449031b0f51f81149ff71edba6cc93ab14a683ff6cdce2494322d05474e9a2c7
+DIST sphobjinv-2.2.2.tar.gz 1188094 BLAKE2B f693254f3746b0e5cb6cc863be381f41d26465eab2e1494c29f30f1a72374e8d03dfa5c433958dfa1dcbaa0a7da1ff454c42da5c09011fa67264c26e3623a302 SHA512 36e7667b071f30d4ca066422b21d298c5691321d813ba6ad9eb7a69cd4107ceb18365ee2f95865fad64ab872428b035661a3f513df2e4aab1124b48f49c7280b
 EBUILD sphobjinv-2.2.1.ebuild 1538 BLAKE2B c8604ec45bb62d73955f3e65e5a2b8614c63fad40033da95cc72ad7d40cab42b4d9e6b489917c0cb801ea627ed8634f50b9177145b4425ea24b7a507129d7d08 SHA512 029b7303c2cd42b5d0052e146b07d9f776369c031b470546783ed19619c957cf89870ff629d3b093d5cb3989387fac98f3d0fd084262c157928d6aa6a5c51aeb
+EBUILD sphobjinv-2.2.2.ebuild 1548 BLAKE2B d38cf7442a6d10d22e079b5137d483eb9f29a1636b69260e24702977c3fb13197133f464ead429d63b07829d9f56436ce41a412e0a351db4f026ec89d08cdae1 SHA512 088b9cee5d9fa05300186a25ae60a7d471ae033ad6c9999fce5cc38b1f27ba9456d77d4516539f1f76f7bba31405847d2e11f0e4b951f5a5e87832983420cf25
 MISC metadata.xml 894 BLAKE2B 9e3b9ad864c23cd1cf346de1c06bf25035de4566733c1716846267aeba3aa09c025e04b15b67369e74f703e4b3205d89e35fd6614627d9f5630fd233320843eb SHA512 f5407da0c6c12279317b17d7174627d1fc3a42f249c1e63acd73c0367c526aab6b62fd358a34760c4986d3d487839905e2ddf5e40c62668933280c5278fefd9e
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
new file mode 100644
index 000000000000..fcbe9ae1f403
--- /dev/null
+++ b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
@@ -0,0 +1,57 @@
+# 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="Sphinx objects.inv Inspection/Manipulation Tool"
+HOMEPAGE="
+	https://github.com/bskinn/sphobjinv/
+	https://pypi.org/project/sphobjinv/
+"
+SRC_URI="
+	https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/dictdiffer[${PYTHON_USEDEP}]
+		dev-python/pytest-check[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues \
+	dev-python/sphinxcontrib-programoutput
+
+src_prepare() {
+	# --strict option is deprecated in pytest>6
+	sed -i -e '/addopts/d' tox.ini || die
+	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
+
+	# remove bundled deps
+	rm -r src/sphobjinv/_vendored || die
+	sed -i -e 's:sphobjinv[.]_vendored[.]::' src/sphobjinv/*.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 99db57d1223b..9ec1e8eda75e 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,11 +1,9 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 AUX sqlalchemy-1.4.27-drop-greenlet.patch 1422 BLAKE2B 7ed9aae160a3b2d3a68c08f32d7a271f5c6ec1b2d93dd9afdb77b73655b1245feeb2982e8dfa9ae7ef0e5e55bd2e2ac7146c95e9eb605a067ee309df5115b28c SHA512 abcc4a546a879fcf7b491259cc520365ead64948fefc47847f6761501a463577a9787f024360d25c2061829e431866d309f5c28b4e2af592f9b4224f583229b7
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.27.tar.gz 7907686 BLAKE2B a9751a82e81bcdcf1bd344f0275c0ff89df38c7e9eda4470d147f4b50b0a2a0d7e9861d932fb6382328ec0e2024d72279ea889e4dadd61a4a33fc3e085521604 SHA512 8d1d76596b1698e320305a07e3f0a56607568ef60b6be36c86c0cabc843c8d6d62034d7446eef69f0cd0687de474d34ce1161c1adb9fdeea8c0b47af372015be
 DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5e16fc54c3a9a42b18cc13906640e4710146325e870598f8905074bf6dad42ea524febc029b1dd5f063e978ebc9a442 SHA512 e54261fcf992845b2e6be47d23f530aec28c7517e6741b1b6a101b9888d3dc3162c1eeab0acc1edb33f56f1360bae3cdccdbcbff0e1e88e477c93d0cd910c17c
 DIST SQLAlchemy-1.4.32.tar.gz 8077546 BLAKE2B 8eb0b617cdc147da21722f3e9b7c9c0659c9bc02f0530c724a7c8afafa9ea018c0558b58baa0387d84627115d474e87996fe8c7768ac53d55a0c817bc8f167b7 SHA512 e9bc125cb531182c97c9588bc7b87028ec334efe63d81d0bee0e7f74b0ce88ac183236298a05cdac42f3a0241b543528bf6f225d199e4bf6d8199caca63581bd
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
-EBUILD sqlalchemy-1.4.27.ebuild 1257 BLAKE2B 2acc083acaf78a5811a2d602e9e6ae4f19f8feea99fb882d0e79675d29d2e514d79eef0283d6b9968941bbffa73a514c125ad86ae2ffac7c2367a748f5176a37 SHA512 13cfbd30ab3478af1d5558182381d0185b29929f6e7c281e38bc0d317583afe780ef42841bba06c150b001b394f5bc567bf424c8ffee03242b1d4fac2bf0540b
 EBUILD sqlalchemy-1.4.31.ebuild 1904 BLAKE2B 0e84fa418b508f4793ceabbe655c227b3f2cd92bd626e5ecde35a9996182f24690db87cfaf5172eec8d0ec27e425824180fa1f5fddf4b68ed026d7c6ad95a373 SHA512 9dad795092985c87f6929f9e8f4184ec3ae99458e2bf2518da13769c059bb24b91782d8fb4d5b00e7eb5e477428cd1eb7c1dc2dfc03c521bc7576aafe52153a5
-EBUILD sqlalchemy-1.4.32.ebuild 1912 BLAKE2B f6ea99b012fce4f621493cec1ff17cf2d8a71026fc468b133b1f2906e487dfc9da7b488bae9a9f23efef1bacdd305b826a9f5852ba9dfd62c384a3728de43ee9 SHA512 70ec1122ec5ae85c527270dd89e8ab04bd1a04912d39f8b04537db35deaed5248190231a9e391705c443b8bdf3fdc04e2e1b7f8ddb5717cf23e02e0355b5d1f5
+EBUILD sqlalchemy-1.4.32.ebuild 1918 BLAKE2B bea31a01db2aced03a30892bda95b78b949a3f7cc3f447a9657b12b2c2c42680b8426bce9d2033b3e752d28c2ac23766c3ddd154ded311986bc0606114ac0533 SHA512 ec947ce600497e7dd9c46f1d318315a209a84c22bcc42d67949e1310eccbd8b706dfa93805123ea935d793e4299de61004c3693fd695af5c0dbc02f351d0d4c4
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27.ebuild
deleted file mode 100644
index 90bb840f0b10..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.27.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.32.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.32.ebuild
index 0a79fdbd8814..65a46c488df9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.32.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.32.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index 75cca29efd82..94e08b6ee50f 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -3,5 +3,5 @@ DIST stack_data-0.1.4.tar.gz 36049 BLAKE2B 277d403a441ddd6e3d3019fa8e49e5703d140
 DIST stack_data-0.2.0.tar.gz 36618 BLAKE2B af79e5c46d03967a8ea6a992a0672a5bd3676a8b088be412782b8c6be6f58a14de1c6e6ff0cd4ae764a65c539a83aa4d7491bb7fe81761452d430d30f70d20fb SHA512 7d6a1a0ffdc667b3ac428b378f1c4f14c5ded99ec244e3cb558bb39ba0c319e9e1657188cb686c8eb788e1af2be6c0b51beae825b73f2685d7b0bc1341ebe5d9
 EBUILD stack_data-0.1.3-r1.ebuild 723 BLAKE2B fc886c84a9411e3835ba43e5a9f895da836a2ce36fba337a2fc8e0e6db52df16a6e9a5f5e18cd80bf53179341bebde648f4d6106cfdb3263af3c6d32d3947f8e SHA512 63cf26ba605d82f9e6b392293d1b3a1a115ed1cdc53d0844205f62f39f557a9e8c3e4251bd632ded01615d69a3b8677413ce4c43feb74ff23b90d374924abc76
 EBUILD stack_data-0.1.4.ebuild 770 BLAKE2B b360e41d59d6b6119b400af19e927a93ecc919b03acf2341bc1b067e93c9de1aa737b803aa3ad12264afb73df48fb0e75ed847376b25c89d863de692ec671558 SHA512 4c2092ec59d9b147ccb13d8be3489ee4766bcfe833284d454cf802adf104750fdbb93937abc718cc6e664505e24466bc4eeb689649f2cef28d2dadf68ba43b72
-EBUILD stack_data-0.2.0.ebuild 823 BLAKE2B 05871d9da8571c0c03ad198f4a8f1b22ccd895ba821332ec0b57057af806bd4d69e844c108cc75c419d67cd99d2bd9609693ccd024b870fec4af9ef3eb037ce3 SHA512 bccaeeb0085a64a4fab3a23cdc2dab78176653b536f1fabee46d018da711130090a628176eca84947bf44fd7b2a5f49fd1beb47eb635bd9a068471ff2e0fe863
+EBUILD stack_data-0.2.0.ebuild 822 BLAKE2B 7446ed9213cc07de8a0399ab78120b0b4f93d8bd3424bb649b7e84c916b10adab8c6374cec7c3f59edd75839199ba1c7af48b117ae50d933f4b0f728712244fd SHA512 dbdd6b91d4536241548053ca83bc6e40ab6459caabc99bf058dddfe804b451b6ea1f918a59a154ee54d8b160e13a63e925e42fa72f72e32663883e327aff8f10
 MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/stack_data-0.2.0.ebuild b/dev-python/stack_data/stack_data-0.2.0.ebuild
index 754820d01faf..a057ee3621a3 100644
--- a/dev-python/stack_data/stack_data-0.2.0.ebuild
+++ b/dev-python/stack_data/stack_data-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index e617060b6ef9..1cb63def7b4a 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,7 @@
+DIST svg-path-5.0.1.gh.tar.gz 71178 BLAKE2B 3b8c1e30c913aff770d73eb5bbb4ded19363a80015f7e9b4ab63b46d6bdf7866fe800a702d328d571d744fbdadb097e843f89130b50e0d60398b6914d9740c9f SHA512 95a286853f4f5497297ec27e261f1864ce9829fb7caa73c69b9d4d1449463a871ae0a74fa85619bf3cc24cfa329944c9c970c6f89ff6c5c1878473f433aa6bfe
+DIST svg-path-5.1.gh.tar.gz 74165 BLAKE2B 170608b5133902eab77fa03fa042cb4a8b9f7a6c895b5faae567e7d8de574b0de55a68274cd3adbb0cfcbb1b60aec2432529fe5063b40657b0ca5cab59e205fe SHA512 a8812bd9bc5da3f0f2bd34494cb1e64f3a3dc5b34db75e35c89872b7a1caa91062cfc97b5f1b2bbb5f955b70a71052f2962c1d8769d508c945ec553b003869d4
 DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
 EBUILD svg-path-4.1.ebuild 480 BLAKE2B 456f6e721426de877c05d587eef6436723857ec23a43c26de9d63e3906bf0d946fbc5cad905ee0d69702c67e01680547330b981241b0482ec5c755db4e4328dc SHA512 0de1164bfdea0258ffb381f9857b43d8cb6ba9b09456ecaeac9d6ffc61753e59c39a222446c678b46db3e76b94b3c0238a65fa3fcc90fbff09012b4a457347e1
+EBUILD svg-path-5.0.1.ebuild 589 BLAKE2B 70f055c1fb140de9530adf257ea66da0e37579f8104c77d464198654778457f8d47faa2dbd920322b3ede50d5e1b4eb94673555d89c462fcf44b8abdd61d999e SHA512 1e846000121b1adbe942a9e681514ad34f5d21efb734deaf5df1efe4229a3b05ea253c49eee2ffb5f2a7ecde89a9d318194634a6ac511fc0a82327eb7c8f5feb
+EBUILD svg-path-5.1.ebuild 590 BLAKE2B f841d949b802780e59f87c4209dfd113d77d8e39f7e2d06e150ef561c18a3f46e5b5eb2045bf240bfc51a18438dca286ede315c38180157fea2c8fbf1918dcc8 SHA512 5c54af846b8a81e729e0eed073567ee6868644c11b12f8ae4ae6fa79fc9bdc26129d650eb3d5a4c65ec497d40d65dbaad684455d5bd8b3be81d46dac57f08ece
 MISC metadata.xml 861 BLAKE2B c1f1d0ab41fdc21c6134352e7261aef6f2b277aa94f9a5bfddac3281c8aef4111e1a3bd83e949fc5b7ffcc92b23bde7ede101552a06cacad9c7b82063ba64353 SHA512 5ac8a5bd6e6c46d9c5d9d320c004d2f0536acfe5cdaafad5288246a9a442a0bb6491746c767adf0d441417172d6e9ed995d4891f6959fa2b6b5b804c1c68d413
diff --git a/dev-python/svg-path/svg-path-5.0.1.ebuild b/dev-python/svg-path/svg-path-5.0.1.ebuild
new file mode 100644
index 000000000000..c4dc52ae51aa
--- /dev/null
+++ b/dev-python/svg-path/svg-path-5.0.1.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+MY_P="svg.path-${PV}"
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	src/svg/path/tests/test_image.py::ImageTest::test_image
+)
diff --git a/dev-python/svg-path/svg-path-5.1.ebuild b/dev-python/svg-path/svg-path-5.1.ebuild
new file mode 100644
index 000000000000..ec9580166a04
--- /dev/null
+++ b/dev-python/svg-path/svg-path-5.1.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+MY_P="svg.path-${PV}"
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	src/svg/path/tests/test_image.py::ImageTest::test_image
+)
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index e2c00f600ded..e73c6be1b23c 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,7 @@
+DIST sympy-1.10.1.tar.gz 7666681 BLAKE2B e522e71058ebc8bdf3c016e3067bae9138e9a9a15ea658cba1fd35a04ce58246b5c3d7ab9c231d7071ed20b588ecfaa9275f383825b511a40c9821eadb53dd44 SHA512 7b6d5718826951bb1e477a78c3de8b95b8edda103981ad03c9f0da125ad35d72d8e5b5716d478ac4f00810939f1dc35786cc2e0a6b75cffb098cc1be9d8f7168
 DIST sympy-1.10.tar.gz 7665598 BLAKE2B 423c501cbdec9369b094156ec4c06c38e52daa0824f61fc2d57b0002473428c7b2df59156bd129c07ea57bb712577568b014b1b48ff0a1d1555ccf25d2fe01df SHA512 0107c68b38809fbcec597339447fa830a9cb3c55863799c41dfb5d122ac7564fdf7c685fe2eedaaa3b8d5c9160b196ef2484fff4c7e99aa17a5a562f3fb73be5
 DIST sympy-1.9.tar.gz 7476018 BLAKE2B 5ab9920bf6d16eaed3af30100e7593551a4dce29dc76605ccf87d55e8a7c14514b5733c9456353403cfc96008fd5d046ce04f44bb7e69f844d545bdd3e55e7e0 SHA512 139712219ba6bf420ba89b3f8d086ab8883c5ab965e9308ba9ee665ac3ac69a9b16fa30c6f5dfbc77dd34873ff3ff95c0d058954d7f9d853f5e9537efc24dd3c
+EBUILD sympy-1.10.1.ebuild 1670 BLAKE2B 3e22191aeb5aee834565e68054177bd48680d1d50d58631f361f0e98ab5409d34fd17f65c7ca5c79905d0f6b1d44ff239a94346b8054f2d130c4380fdc3e455b SHA512 6898bab92b21dc755b1c550d0877daf5da0908f844f50c5b8de5a698ec5f29acbcfb0f1114a5e5f6d7df72c4cdd9bc60141ec493fdb84c535958914419b4c786
 EBUILD sympy-1.10.ebuild 1630 BLAKE2B 1a8e852035e42e4588f3d23ba1a9c0fe5a2b70364469a8828f1fad51588a77f6cb2a0bd1bbd02cdb28835d3410f0ead84edb5f77f2f5a8a27c1e6e7fd1046e8d SHA512 4e0d685d362b2dbb92416d2205200a1f0c331f5f4dc93e931878a6e228f288c790062ec950f11790453e3f5da6a3281e65a479b1dab8abf955395949a40e0e9e
 EBUILD sympy-1.9.ebuild 1597 BLAKE2B 871fbfdbd86916c14c7f7d691f6e41057ddb4e23ae7e7ae2142902b55698633e03e10609979de58cb682d000d0ec3cd73f469b57b1e2e9d6ba41857e9060b208 SHA512 6b361907c76f58f4e488e3111585f4a30d9e464170ab3595cbffe05638311a28f919b0e07b8d3bf1255f8733f8b55ffa1c8b160575387f8cfc98600911b26e89
 MISC metadata.xml 1715 BLAKE2B 8e7464f09c9d4b88e448c70a041ee1c3693587dffacf697ec6c13c069b90973f6be1e0f50fa40ebe9b12e7a33f1bf21e175e445563ea639bfb2a96dcae5ab96a SHA512 f5baf2997f559dee17355a7612b479dbd13048376f2bb2b26401150502d59eaf500066880379d9bbbe4ee7ba29e99821a27067d2e2df284bbfda9fb99058b23c
diff --git a/dev-python/sympy/sympy-1.10.1.ebuild b/dev-python/sympy/sympy-1.10.1.ebuild
new file mode 100644
index 000000000000..b75ed090fb89
--- /dev/null
+++ b/dev-python/sympy/sympy-1.10.1.ebuild
@@ -0,0 +1,66 @@
+# 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 virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://www.sympy.org/"
+SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs"
+
+RDEPEND="
+	dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	aesara? ( dev-python/aesara[${PYTHON_USEDEP}] )
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.md )
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/textX/Manifest b/dev-python/textX/Manifest
new file mode 100644
index 000000000000..75ab901ba719
--- /dev/null
+++ b/dev-python/textX/Manifest
@@ -0,0 +1,5 @@
+DIST textX-1.4.tar.gz 21967 BLAKE2B b9e5b15715e370795470be855e0425075b1f704cab0ea2f24021345d8748f9f1a36e84618207c7684cadf86dae2ee0d613af3aaf217a881ba922385a544064ba SHA512 7783f4dd1358d8e0df126f1be893c58e32f57015fd577bd20d00a17b63111d6e48222c9b78420a307fcd0833f6d9ac3a1398d55986681251f7c378cdcd68c8a4
+DIST textX-3.0.0.gh.tar.gz 1827894 BLAKE2B 1b4dff3919838b8aa27faee9387fafd6771891b730c221e10a5f2593d138634950d6ced5a7344944913d99e591ed87adfac403add582baa50b0b94c9c6498572 SHA512 59b175a3f68b0a5b9b3522e814602c791df3fa7dffb8fabffdeed79ce746ae698ee61c748ce991d8cfee15e094c9437530912e84bdeed4531d0bd96d07477c90
+EBUILD textX-1.4.ebuild 737 BLAKE2B 4eba28a3a84eef41c63d8190c552e6e4eb216707cce8b133259cc48c1c47aec5886ef4583733efae1691ec38001bb0980e549e2283da00840d8d26b8fa4340db SHA512 3b33a1401c3bd9fd6acbf3d5d14b01fb921b059c3a0204863c15abe6bcea85eddb2c665bb7ba6bac7416c7f2877c1ee023fd468e7e7e3d57e44357e88c078b2d
+EBUILD textX-3.0.0.ebuild 1275 BLAKE2B 8a5af7a334b3fcf7451a4ffce669b4a70aadfc9fa906c70f9107954b6d22730d4b6c33502a864f21c477fb128bcbf07534f969f5374010f58ca6425dbb55bb2c SHA512 f9cdc85d0860af13a1f0d877cedc4e0a7b3c12bf31faa0a2111c5ff5aff84697689d97a9ef4579632bf6a6f5b1d9b4f23b74a4a30269a4728e96f654637292eb
+MISC metadata.xml 338 BLAKE2B c8501a0068d2c612d598ce4b6a381693def6cfa5ef548462db75edbd1697651cf74909b9d93a8f2aa0055f3a4a05eb0ff06e7d72e59e453af5d76f53a5bbf137 SHA512 8ad3cdd270107b756aec1341799fdac495c3d8bf31a722e378df596f8d842867e2e4509e9eff0e31da5ad54a4e107d09268ade15cbcd47ea67eb14157d89b939
diff --git a/dev-python/textx/metadata.xml b/dev-python/textX/metadata.xml
index 3d4b8ec02717..de4b16fe0e05 100644
--- a/dev-python/textx/metadata.xml
+++ b/dev-python/textX/metadata.xml
@@ -6,6 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">textX</remote-id>
-		<remote-id type="github">igordejanovic/textX</remote-id>
+		<remote-id type="github">textX/textX</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textX/textX-1.4.ebuild
index 4c427c4e236b..e32c8487351d 100644
--- a/dev-python/textx/textx-1.4.ebuild
+++ b/dev-python/textX/textX-1.4.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
-MY_PN=textX
-MY_P=${MY_PN}-${PV}
 DESCRIPTION="Meta-language for DSL implementation inspired by Xtext"
 HOMEPAGE="https://pypi.org/project/textX/ https://github.com/igordejanovic/textX"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # pypi tarball omits tests
 RESTRICT="test"
 LICENSE="MIT"
@@ -20,14 +18,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/arpeggio[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/Arpeggio[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
-S=${WORKDIR}/${MY_P}
 
 python_test() {
 	py.test -v tests/functional || die "tests failed"
diff --git a/dev-python/textX/textX-3.0.0.ebuild b/dev-python/textX/textX-3.0.0.ebuild
new file mode 100644
index 000000000000..44ef615bbff7
--- /dev/null
+++ b/dev-python/textX/textX-3.0.0.ebuild
@@ -0,0 +1,59 @@
+# 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="Meta-language for DSL implementation inspired by Xtext"
+HOMEPAGE="
+	https://pypi.org/project/textX/
+	https://github.com/textX/textX/
+"
+SRC_URI="
+	https://github.com/textX/textX/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Arpeggio-2.0.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	# Update the shebang
+	sed -e "s:install/usr/bin/${EPYTHON}:test/usr/bin/${EPYTHON}:" \
+		-i "${BUILD_DIR}"/test/usr/bin/textx || die
+
+	# Install necessary plugins
+	local plugins=(
+		tests/functional/subcommands/example_project
+		tests/functional/registration/projects/*
+	)
+	local p
+	for p in "${plugins[@]}"; do
+		pushd "${p}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	epytest tests/functional
+}
diff --git a/dev-python/textx/Manifest b/dev-python/textx/Manifest
deleted file mode 100644
index 7b6959cc4689..000000000000
--- a/dev-python/textx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST textX-1.4.tar.gz 21967 BLAKE2B b9e5b15715e370795470be855e0425075b1f704cab0ea2f24021345d8748f9f1a36e84618207c7684cadf86dae2ee0d613af3aaf217a881ba922385a544064ba SHA512 7783f4dd1358d8e0df126f1be893c58e32f57015fd577bd20d00a17b63111d6e48222c9b78420a307fcd0833f6d9ac3a1398d55986681251f7c378cdcd68c8a4
-EBUILD textx-1.4.ebuild 799 BLAKE2B 3b4c3e66c3a5af06aeddde9e3928bbb0200e4428eb3563ffcb5eba87f48b1552ea66a5f48cd47d6ba12453882656f901020a510d635744bbb728e05c85960e92 SHA512 b325064394bf3404870ffc9ccfd60ce9b313c755bf96103fe9f7cce97c2531c8f590de6b5ec792c733375dfc36e7c696436fd6c0d8098976c4c37b419012235d
-MISC metadata.xml 346 BLAKE2B 8c9fe275fea182b19513c5a9eacc379d1d707d0dd55751331f02f6392f13fa7e2195046a2ff574db2cf42530832f94b7ac3c4259eb2520b4c7e4b6f5145f1727 SHA512 13cead7fb5cb56b1e23fc327b357b1e6630d60faf42891d0e5cd8ea94c2826cefc770f98b3999c533ee0476a73c90d478b2a8b9363813c98efe5be010fcf0eed
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 4df2eeedd7cb..b348071ce7c8 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,9 +1,3 @@
-DIST tifffile-2021.11.2.gh.tar.gz 261953 BLAKE2B 039e25b173d2074b5a869394bb40cd62410b34c8a86bf047cd203aad6ab0e3217d0f4006bb092840acb314598c73619e48c66daa04c81f9965ca46b81f055d6e SHA512 5bd3340af027547bf07d78523c5c2abcecb428606d72daa446c7f3cd06f7c8da015e20cd0f4ebeb1e9a49ce0aaf6c2840170dad7a8a28e403716d4bdb1ba2238
-DIST tifffile-2022.2.2.gh.tar.gz 263421 BLAKE2B d0360d0cbaaaa53425624c81e6cb52fa2fdff96582058a71649361ebc9151ea732652051ad9086710c20a79a88db9a4e8092167142052a3d0b0106b5bbe378fe SHA512 591b61eba84c421420e53e185f27d7f17bc6ae1cf379259e4d5ddfcfa52ed991560d907c5a63c5fea50773f3d497202433a9570a56aa2bc392fd4ba712d94988
-DIST tifffile-2022.2.9.gh.tar.gz 264011 BLAKE2B 529eee731cf6c7b9fe925dffb70117517d560bdb0fe991f86d5a32d6167aa3c7f265466f72e51531b45e86d466d749d1880c1b6beadd498a999e0e59e174a08f SHA512 642a93b2f809d70faaae7265b80aaaf7d7c3190b96aa0e3062f6c708e6484e3338ec319163dc9eb3156553377d4a4152cbf908c7c2df406d1b58b289ea95bdc0
 DIST tifffile-2022.3.16.gh.tar.gz 263653 BLAKE2B fcd30e2fd38a12438332badb17e937ab095a8088f9c878b84166a67c7486f436a76d39832df22362f7a74de5da537602da82c982fb4dc0699fba1603adefdcef SHA512 8069a87b241cbb11b3efa8ff679106f2f11ff9045d790fb1612076a60b87791f30afffb55b57d19b70ab4441935f418ad91fb0956ab572890704023e63dea84a
-EBUILD tifffile-2021.11.2.ebuild 1392 BLAKE2B 29a491ca8a5b880117ae61cbe143a7e6a6151b25794ac31d5ed0edcb86ad3b68e5060152145a3ea5e93f295c266ee4f3d631844d6c3d88c274ff4a6228d7b968 SHA512 427d69fa2ff5053463759d2cd32912f77e438d4c797f2328a2608b6f4554a1afb0f003aae44f714922f75437b68efbb56349cd117cef21ca85764d94fbea9129
-EBUILD tifffile-2022.2.2.ebuild 1269 BLAKE2B 95a1bc97800e704cce4b621fb47933d4eaa4f12338ef912dc3a3f75ca49d622a27371f30bb40295f04ea1ad421f55787fc1087533ba256bb01f75d31264cfd77 SHA512 b84b2b9b77d23e2c7fb322e38437f6704f92dcec6c3ab7c71153f3982a339ac9b4fe8c96462cbe76898d78c6ec33bb9199f23f78e129e485ff9aba14c0acf310
-EBUILD tifffile-2022.2.9.ebuild 1269 BLAKE2B 95a1bc97800e704cce4b621fb47933d4eaa4f12338ef912dc3a3f75ca49d622a27371f30bb40295f04ea1ad421f55787fc1087533ba256bb01f75d31264cfd77 SHA512 b84b2b9b77d23e2c7fb322e38437f6704f92dcec6c3ab7c71153f3982a339ac9b4fe8c96462cbe76898d78c6ec33bb9199f23f78e129e485ff9aba14c0acf310
 EBUILD tifffile-2022.3.16.ebuild 1269 BLAKE2B 95a1bc97800e704cce4b621fb47933d4eaa4f12338ef912dc3a3f75ca49d622a27371f30bb40295f04ea1ad421f55787fc1087533ba256bb01f75d31264cfd77 SHA512 b84b2b9b77d23e2c7fb322e38437f6704f92dcec6c3ab7c71153f3982a339ac9b4fe8c96462cbe76898d78c6ec33bb9199f23f78e129e485ff9aba14c0acf310
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2021.11.2.ebuild b/dev-python/tifffile/tifffile-2021.11.2.ebuild
deleted file mode 100644
index 88ad83347a2a..000000000000
--- a/dev-python/tifffile/tifffile-2021.11.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.lfd.uci.edu/~gohlke/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/dask[${PYTHON_USEDEP}]
-		' python3_{8..9})
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-	# requires files not in tarball (upstream misses this one in skip)
-	tests/test_tifffile.py::test_write_predictor
-)
diff --git a/dev-python/tifffile/tifffile-2022.2.2.ebuild b/dev-python/tifffile/tifffile-2022.2.2.ebuild
deleted file mode 100644
index bcfdee9f5d5f..000000000000
--- a/dev-python/tifffile/tifffile-2022.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021-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="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.lfd.uci.edu/~gohlke/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-)
diff --git a/dev-python/tifffile/tifffile-2022.2.9.ebuild b/dev-python/tifffile/tifffile-2022.2.9.ebuild
deleted file mode 100644
index bcfdee9f5d5f..000000000000
--- a/dev-python/tifffile/tifffile-2022.2.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021-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="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.lfd.uci.edu/~gohlke/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-)
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index d1a9b853089d..1402de436aef 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,5 +1,7 @@
 DIST tqdm-4.62.3.tar.gz 167952 BLAKE2B d5732fc97256e1fc4f55bd1a0f69f98a87e7132cc1d8484baa12b7615da5a95ce20268515539c595c2b2aaf20f9a9434c17d581b3b90ea3cad3515150e469471 SHA512 1083ca2080163c98bbb55e124ce9d47c790e47c83cd8dad60e4c93773d1d97a50aacb5a25ddb8a2ae3691738e4f4942c88d55dab406c3e810cac18b8929d20ee
 DIST tqdm-4.63.0.tar.gz 168556 BLAKE2B f4fa47290f580f0923fa4325e88b103c4175344c928844149bf4b4445816bb7e87bd176d666b93a94a5981b246541017f0a34d710becf082110caca68b9ee45d SHA512 939ac7e310204094cb0c6a935ba6a91af45cd63fa8fa83865b75d1bcea440d5ff21a4d3405f5bcce864b43159921d3ef7b92d9c390fe30902f24e4e724c7eaf9
+DIST tqdm-4.63.1.tar.gz 168619 BLAKE2B c5d282f07bd1042097ba24cfc7c5311ce53fa5b66e4f9d4b8504c5d102a4c380dfbc8bb59deee469c90d9726b7d36a34cf9c88ed07b412378f51819f789e8e9c SHA512 3d7dfb81ca6b8b72f26d6b3ef4309af19e1679d3ee805e3c1326e804df4204acc20de8d935394eac736a1598d9c5485165f3cbd2b83b746c2bbf202d3b1e4c5c
 EBUILD tqdm-4.62.3.ebuild 1133 BLAKE2B 9d2263838294e0c9e732aeebb2b7678e55b6648a11e5d926e85f4c1b6f500a34b54add9296822aece3611b088546b5ba21b2f90d9a82df4c152f31e84a294e10 SHA512 13d1199dec270b4f4621be8f290ef3b8f40480063e4779957842ef3c3679289a42295d56b2990e9622bcaf3bf59817d6a4924d7b869726bf4e67dab0bde39b9c
 EBUILD tqdm-4.63.0.ebuild 1035 BLAKE2B f0383d863cea778d6d99ef48b23abc0b0a18ce160feb5ab2e0599316f05e6f713f98f6b12598643c3fecd294cdf63ce2015caffe2d83b765fefa428f3d93889d SHA512 9efede6c14ec866dab9c29d8366ad0de0dae269d19380addbe196ca395d7bc0cb078fc2e492b7e60f29ea1be8f40017c0ff03498e5d53311c2a089b9d57c205c
+EBUILD tqdm-4.63.1.ebuild 1035 BLAKE2B f0383d863cea778d6d99ef48b23abc0b0a18ce160feb5ab2e0599316f05e6f713f98f6b12598643c3fecd294cdf63ce2015caffe2d83b765fefa428f3d93889d SHA512 9efede6c14ec866dab9c29d8366ad0de0dae269d19380addbe196ca395d7bc0cb078fc2e492b7e60f29ea1be8f40017c0ff03498e5d53311c2a089b9d57c205c
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.63.1.ebuild b/dev-python/tqdm/tqdm-4.63.1.ebuild
new file mode 100644
index 000000000000..e8dbfbed9a0d
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.63.1.ebuild
@@ -0,0 +1,46 @@
+# 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..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="
+	https://github.com/tqdm/tqdm/
+	https://pypi.org/project/tqdm/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Skip unpredictable performance tests
+	tests/tests_perf.py
+)
+
+python_install_all() {
+	doman tqdm/tqdm.1
+	newbashcomp tqdm/completion.sh tqdm
+	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/typeguard/Manifest b/dev-python/typeguard/Manifest
index 10a7c8541a65..b5c2c7f3c79c 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -3,5 +3,5 @@ DIST typeguard-2.13.2.gh.tar.gz 37142 BLAKE2B 0aa3f53bc0d1aa485d071cd52d2458ab83
 DIST typeguard-2.13.3.gh.tar.gz 37436 BLAKE2B a3cb616692119c64a9dc0d0bae25cc661b7974a0b6cf6632fa403f7c5430873570b1aaa310bc03843deee6f77a831c303ea9d9091db596eb565fce43980bbb13 SHA512 26c31ee9670650d1969320187a924d29d986894a38f1026af58f705b132b64be3b6e2ac34729f966f5d302d486334b5a5d9e65fb206245b82b0ff0852020b609
 EBUILD typeguard-2.13.0.ebuild 787 BLAKE2B 24994432b4544aa4a498917ab12f641451b99ba673714e437b3b203176345c0e557546c55de4bcb223e42a63cfa836cff510a2a9979d24e2c62aa578d5a139fd SHA512 44fad13c13e574b9ee8225400e58b1512828980650ed877d9497b20a07ea73d48cd8bd8e4cbd30ff8fcb6b1e10ba75c296b197c63c8f54226917ee4333963ba2
 EBUILD typeguard-2.13.2.ebuild 787 BLAKE2B 24994432b4544aa4a498917ab12f641451b99ba673714e437b3b203176345c0e557546c55de4bcb223e42a63cfa836cff510a2a9979d24e2c62aa578d5a139fd SHA512 44fad13c13e574b9ee8225400e58b1512828980650ed877d9497b20a07ea73d48cd8bd8e4cbd30ff8fcb6b1e10ba75c296b197c63c8f54226917ee4333963ba2
-EBUILD typeguard-2.13.3.ebuild 839 BLAKE2B 337aaa8d365badcb87659be2d7814745d6d52d3392b00274c8b9945f3179326a91a31506ee83d09e20920660350ac6f046b4ff8c1025109bbdab1111d2f8a461 SHA512 a5683d0202ffabba6caa45219231d8bb08d50913fca2356852b024f903957c1809ac6d4e8bf3369ba140c694c4fc7386c870463cc4f4ac4586ea801753b7c572
+EBUILD typeguard-2.13.3.ebuild 838 BLAKE2B 3d93f43841b0a44ef3bc8b587a079a7519878b72edcb7cba773f80b4d3a8ed6ee9ccc6cdd4a4a24640374d9a87fbecb6731cd12593c45d925267e081c794c08b SHA512 c9509952207ff428ac36a953d336c408fec47248534a297886c2d1330de42b8e6f03bdb77f84874911d9d06e1d0b6a9e21611f6a65abb4086850760d5c22f578
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
index 3d532a6883e7..8bd7fbfa6492 100644
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index cfcaeedcd59e..e73e27b77930 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,5 +1,7 @@
 DIST watchgod-0.7.gh.tar.gz 14362 BLAKE2B 0c16b7ef2a7e1d0ca2c9d27b1503a9710662364318d5021e916aabf90c8f917b0bf69559a545658f839953832edc579b0014a0736b3b155f097d1d29c2e4b4f7 SHA512 afa225b30cf796ce95861c61fbe8eb22ed72011522de53d53c41148311793db10e41b66e9eb1237c4372f142edaec992de79715c568e435ddb1695666be1cdd8
+DIST watchgod-0.8.1.gh.tar.gz 15414 BLAKE2B 237b03a08b053f6979b884a02818b8651ce7415dbd08a848c2d754361c3f9aaf315db2b352a8f159f6245f2db92ea2f5485daacfb8924edcc361049f307467bb SHA512 a30ac1093df1e26ce78bbc09f5b1155cd5a9becad13da54ab3009012a5630404bb94695474be05133ad3e57c1727743efc408235a19a25f276265d752f0624cc
 DIST watchgod-0.8.gh.tar.gz 15354 BLAKE2B 1325f452593e54e8cc40eca0fc9867aff0c93d89de767b9512508fee02efe94e43284b30c316b2cce31a15acc2ee9ff19ca7f9cc6fb46cfffdb0458e502d85ca SHA512 0e86d9dd3eba0cd3aaeccc009ebdba8528ba23d63ad19ff789dffda075b4a01c32be0dfabf38f15e7966bc09e7fb5ae3a94a9dd89a55358a95622aaf5cad0947
 EBUILD watchgod-0.7.ebuild 960 BLAKE2B df5acdbe3b1c759bc22af4451b872aa8a3b7f442350aa6e494768a7c55c5c874c335e4087b8b38078f6ccb8012b3f5f3e42d664def636f28f1a51e66a7afab90 SHA512 c0115f54f24d59c04829326d41a1ff09857609f308dfa99ef7c34fe4642fbb54d1d70c6cb96a739fd848461b1f9a8c26df2546980c82758a73dafc4f199917d8
+EBUILD watchgod-0.8.1.ebuild 1095 BLAKE2B 19f4f7c9f9e1f5f7fa78a93a1cd4dff651229f1f0cad3f31fd65b1f79f1521354d52c3c1973b77dcfd3366e74f7cecfe88f42d9e35c98889b8be71634623e8b2 SHA512 8ea7485d96888d5e1fbd6456cd068c74a0f4b084952606824cb31085e5cd65792cd648016f72004a9ed1f648500ec659fe6da1fb3e57c403a98ecb030b167f85
 EBUILD watchgod-0.8.ebuild 1063 BLAKE2B 333335738be460dcab637d582bf28558a46c72b783926308850ee8654629f57c226a917058be3f2775b4616b2009e649b2def7d6d8483b9c721f4aa92122c568 SHA512 a4c0e6143ef15c30415fb388735e9d050a786e4b237fa144de4d73ca46f9fb4f91a4bce376deaab341b435f5907111f3851cac7f5ef2b53aafc69e54a895b862
 MISC metadata.xml 351 BLAKE2B 07e1d5205c2ec59e8fe690449302a0cc7d75b6b3171669bdd4e0476e1c1e389b9af36a331d18f8d45b3b8486372e52558b2a6f48545b78a87eeca092c899837a SHA512 261367cd6511a897955e85335dfa158ee9441bb2e61592e2bbe964fc0f8219e271e764b7c65c659d3ed1dc4d87896dafab83abfc0708715c749e2fdf16a4c9ec
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
new file mode 100644
index 000000000000..d75856fbbcf3
--- /dev/null
+++ b/dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-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="Simple, modern file watching and code reload in Python"
+HOMEPAGE="
+	https://pypi.org/project/watchgod/
+	https://github.com/samuelcolvin/watchgod/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/watchgod/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/anyio-3*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
+	tests/test_watch.py::test_awatch_log
+)
+
+src_prepare() {
+	# increase timeout
+	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 8e9430bf07b3..e71fa35a7c1e 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,3 +1,3 @@
 DIST zstd-1.5.1.0.tar.gz 604039 BLAKE2B 5f3e2f2848d67d2455bab721d011946fa8138729566243046e2b294e51c1144a0a0576f9e64e15472c8da4b45514a052a751b2ac3d87f17301ab634f560bf19a SHA512 4775f9db3b924116272060fd46885a601ec5153b350974ef5fe41878f10aad0fee428f053ce71aaf881eb73bfc11ae1d89148f65447fc6febe3f53a50ffa0a63
-EBUILD zstd-1.5.1.0.ebuild 693 BLAKE2B 8c8ac34b4ef1d59286ef5fa94cad70e57dfb0f5f77d89f48b5293237a13d9e3708b9bd19c422977077ff5cc6fad5908dbbff84c5e43c39c3b6e5101fb0791fa2 SHA512 93c6f7f6439da4831f8d2306cadaf42eb21e3c14384493a59ab51ebceb1b952aeeb2603c110253f725679c6b51896155523a664cf9ee6d7576acba7550d6a688
+EBUILD zstd-1.5.1.0-r1.ebuild 704 BLAKE2B 38252eaecc49c7b3f2f74ff1a419135eca7f58857ae598af4a673e858553dfe1338e51d19ed721c53ea7c445b0f1c59421447146a1ab00ef62d9ff9ceda3eb21 SHA512 de3c26ccbaea54c28b11a393fbd8c5d80c5a67f5a7cec941a1d1604ba264e425708545b6bac257f52338ffe70a88cc97a8780e387a7a569a09ad0d3cd57ecfb2
 MISC metadata.xml 472 BLAKE2B a4d69b294f26714e9f5211408f01222174c8dd9b0e990840c4603f70a7080fd41a6f3ec74987e40b330a19967f0b90447446b6d5fdb1179ec3be0406592f6b3e SHA512 0cb6b445a84c48dc909eca438bf3908bdc08309f27314692fc2a3fa5a21b3cd1af92e06a593fb2a2cb32c3f0f70db56b7177abcc1fa4348c664e779f0e277cda
diff --git a/dev-python/zstd/zstd-1.5.1.0.ebuild b/dev-python/zstd/zstd-1.5.1.0-r1.ebuild
index 9cb69c5f2d41..a4b4dee4a1a5 100644
--- a/dev-python/zstd/zstd-1.5.1.0.ebuild
+++ b/dev-python/zstd/zstd-1.5.1.0-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	app-arch/zstd:=
 "
 RDEPEND="${DEPEND}
-	!dev-python/zstandard[${PYTHON_USEDEP}]
+	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
author	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
commit	401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree	c2bef4719f6787550f0916aeaa8f4f403a9296af /dev-python
parent	4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)